!2 remove link Macau to Macao

Merge pull request !2 from orange-snn/master

0001-gnome-initial-setup-remove-link-Macau-to-Macao.patch

@@ -0,0 +1,27 @@
+From bebd30ff25d6112a65cdfb7b01040e07920c7735 Mon Sep 17 00:00:00 2001
+Date: Mon, 16 Dec 2019 09:40:30 +0800
+Subject: [PATCH] gnome-initial-setup: remove link Macau to Macao
+
+reason:remove link Macau to Macao
+
+Change-Id: Ie4246622b4555b153449e42d9590be4675bebd79
+---
+ .../gnome-initial-setup/pages/timezone/backward                  | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/gnome-initial-setup/pages/timezone/backward b/gnome-initial-setup/pages/timezone/backward
+index f1f95a8..9bf41f3 100644
+--- a/gnome-initial-setup/pages/timezone/backward
++++ b/gnome-initial-setup/pages/timezone/backward
+@@ -29,7 +29,6 @@ Link	Asia/Chongqing		Asia/Chungking
+ Link	Asia/Dhaka		Asia/Dacca
+ Link	Asia/Kathmandu		Asia/Katmandu
+ Link	Asia/Kolkata		Asia/Calcutta
+-Link	Asia/Macau		Asia/Macao
+ Link	Asia/Jerusalem		Asia/Tel_Aviv
+ Link	Asia/Ho_Chi_Minh	Asia/Saigon
+ Link	Asia/Thimphu		Asia/Thimbu
+-- 
+2.19.1
+
+

gnome-initial-setup.spec

@@ -1,12 +1,13 @@
 Name:           gnome-initial-setup
 Version:        3.30.0
-Release:        2
+Release:        3
 Summary:        A easy way to prepare a new system
 License:        GPLv2+
 URL:            https://wiki.gnome.org/Design/OS/InitialSetup
 Source0:        https://download.gnome.org/sources/gnome-initial-setup/3.30/gnome-initial-setup-%{version}.tar.xz
 Source1:        vendor.conf
 Patch0000:      honor-firstboot-disabled.patch
+Patch9000:      0001-gnome-initial-setup-remove-link-Macau-to-Macao.patch
 
 BuildRequires:  krb5-devel desktop-file-utils intltool libpwquality-devel
 BuildRequires:  pkgconfig(libnm) >= 1.2 pkgconfig(gstreamer-1.0)
@@ -70,5 +71,11 @@ useradd -rM -d /run/gnome-initial-setup/ -s /sbin/nologin %{name} &>/dev/null ||
 %{_datadir}/gnome-initial-setup/vendor.conf
 
 %changelog
+* Tue Jan 21 2020 openEuler Buildteam <buildteam@openeuler.org> - 3.30.0-3
+- Type:bugfix
+- ID:NA
+- SUG:reboot
+- DESC:remove link Macau to Macao
+
 * Wed Dec 11 2019 openEuler Buildteam <buildteam@openeuler.org> - 3.30.0-2
 - Package init