Accepting request 89287 from Base:System

- apply patches also for timezone-java - add patch to fix Tiraspol split - update to 2011m (bnc#726162): * All Ukrainian timezones are going back to winter time on Oct 30th, 2011 * Adding Tiraspol to the zone.tab * America/Bahia switched to DST on Oct 16th, 2011 - apply patches also for timezone-java - add patch to fix Tiraspol split - update to 2011m (bnc#726162): * All Ukrainian timezones are going back to winter time on Oct 30th, 2011 * Adding Tiraspol to the zone.tab * America/Bahia switched to DST on Oct 16th, 2011 OBS-URL: https://build.opensuse.org/request/show/89287 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/timezone?expand=0&rev=55
2011-10-25 15:14:10 +00:00 · 2011-10-25 15:14:10 +00:00 · e385998e70
commit e385998e70
parent e416278579 862d9cb81b
9 changed files with 76 additions and 11 deletions
--- a/chisinau-split-fix.diff
+++ b/chisinau-split-fix.diff
@ -0,0 +1,11 @@
+--- a/zone.tab
+++ b/zone.tab
+@@ -257,7 +257,7 @@
+ LY	+3254+01311	Africa/Tripoli
+ MA	+3339-00735	Africa/Casablanca
+ MC	+4342+00723	Europe/Monaco
+-MD	+4700+02850	Europe/Chisinau
+MD	+4700+02850	Europe/Chisinau	most locations
+ MD	+4651+02938	Europe/Tiraspol	Pridnestrovie
+ ME	+4226+01916	Europe/Podgorica
+ MF	+1804-06305	America/Marigot
--- a/pre_checkin.sh
+++ b/pre_checkin.sh
@ -6,5 +6,7 @@ ln -f timezone.changes timezone-java.changes
 for spec in timezone-java.spec; do
 { sed -n -e '1,/COMMON-BEGIN/p' $spec.in
  sed -n -e '/COMMON-BEGIN/,/COMMON-END/p' timezone.spec
-  sed -n -e '/COMMON-END/,$p' $spec.in; } > $spec.tmp && mv $spec.tmp $spec
+  sed -n -e '/COMMON-END/,/COMMON-PREP-BEGIN/p' $spec.in
+  sed -n -e '/COMMON-PREP-BEGIN/,/COMMON-PREP-END/p' timezone.spec
+  sed -n -e '/COMMON-PREP-END/,$p' $spec.in; } > $spec.tmp && mv $spec.tmp $spec
 done
--- a/timezone-java.changes
+++ b/timezone-java.changes
@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Tue Oct 25 14:48:15 CEST 2011 - dmueller@suse.de
+
+- apply patches also for timezone-java
+- add patch to fix Tiraspol split
+
+-------------------------------------------------------------------
+Mon Oct 24 19:19:45 CEST 2011 - dmueller@suse.de
+
+- update to 2011m (bnc#726162):
+  * All Ukrainian timezones are going back to winter time
+    on Oct 30th, 2011
+  * Adding Tiraspol to the zone.tab
+  * America/Bahia switched to DST on Oct 16th, 2011
+
 -------------------------------------------------------------------
 Fri Oct 14 10:41:30 CEST 2011 - dmueller@suse.de

--- a/timezone-java.spec
+++ b/timezone-java.spec
@ -25,10 +25,16 @@ Summary:        Timezone Descriptions
 Group:          System/Base
 # COMMON-BEGIN
 # COMMON-BEGIN
-Version:        2011l
+Version:        2011m
 Release:        1
-Source:         ftp://elsie.nci.nih.gov/pub/tzdata%{version}.tar.gz
-Source1:        ftp://elsie.nci.nih.gov/pub/tzcode2011i.tar.gz
+Source:         ftp://munnari.oz.au/pub/tzdata%{version}.tar.gz
+Source1:        ftp://munnari.oz.au/pub/tzcode2011i.tar.gz
+Patch0:         tzdata-china.diff
+Patch1:         tzcode-zic.diff
+Patch2:         tzcode-ksh.diff
+Patch3:         iso3166-uk.diff
+Patch4:         tzcode-link.diff
+Patch5:         chisinau-split-fix.diff
 # COMMON-END
 # COMMON-END
 Url:            http://www.gnu.org/software/libc/libc.html
@ -45,6 +51,16 @@ package is intended for Java Virtual Machine based on OpenJDK.

 %prep
 %setup -c
+# COMMON-PREP-BEGIN
+# COMMON-PREP-BEGIN
+%patch0
+%patch1
+%patch2
+%patch3
+%patch4
+%patch5 -p1
+# COMMON-PREP-END
+# COMMON-PREP-END

 %build
 gij -jar %{_javadir}/javazic.jar -V %{version} \
--- a/timezone-java.spec.in
+++ b/timezone-java.spec.in
@ -39,6 +39,8 @@ package is intended for Java Virtual Machine based on OpenJDK.

 %prep
 %setup -c
+# COMMON-PREP-BEGIN
+# COMMON-PREP-END

 %build
 gij -jar %{_javadir}/javazic.jar -V %{version} \
--- a/timezone.changes
+++ b/timezone.changes
@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Tue Oct 25 14:48:15 CEST 2011 - dmueller@suse.de
+
+- apply patches also for timezone-java
+- add patch to fix Tiraspol split
+
+-------------------------------------------------------------------
+Mon Oct 24 19:19:45 CEST 2011 - dmueller@suse.de
+
+- update to 2011m (bnc#726162):
+  * All Ukrainian timezones are going back to winter time
+    on Oct 30th, 2011
+  * Adding Tiraspol to the zone.tab
+  * America/Bahia switched to DST on Oct 16th, 2011
+
 -------------------------------------------------------------------
 Fri Oct 14 10:41:30 CEST 2011 - dmueller@suse.de

--- a/timezone.spec
+++ b/timezone.spec
@ -25,16 +25,17 @@ Group:          System/Base
 Url:            http://www.gnu.org/software/libc/libc.html
 PreReq:         filesystem, coreutils
 # COMMON-BEGIN
-Version:        2011l
+Version:        2011m
 Release:        1
-Source:         ftp://elsie.nci.nih.gov/pub/tzdata%{version}.tar.gz
-Source1:        ftp://elsie.nci.nih.gov/pub/tzcode2011i.tar.gz
-# COMMON-END
+Source:         ftp://munnari.oz.au/pub/tzdata%{version}.tar.gz
+Source1:        ftp://munnari.oz.au/pub/tzcode2011i.tar.gz
 Patch0:         tzdata-china.diff
 Patch1:         tzcode-zic.diff
 Patch2:         tzcode-ksh.diff
 Patch3:         iso3166-uk.diff
 Patch4:         tzcode-link.diff
+Patch5:         chisinau-split-fix.diff
+# COMMON-END
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %global AREA    Etc
 %global ZONE    UTC
@ -47,11 +48,14 @@ can select an appropriate time zone for your system with YaST.

 %prep
 %setup -c -a 1
+# COMMON-PREP-BEGIN
 %patch0
 %patch1
 %patch2
 %patch3
 %patch4
+%patch5 -p1
+# COMMON-PREP-END

 %build
 unset ${!LC_*}
--- a/tzdata2011l.tar.gz
+++ b/tzdata2011l.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cb9fec68a19c9c3b900bb71f3ca20d0051a863f765387b52fc2d144a5bbb0c7d
-size 203374
--- a/tzdata2011m.tar.gz
+++ b/tzdata2011m.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c8e01f5b4a3cd8b8aee84b4befb4b671cef34353e5af022ed22071f5b86ef5f4
+size 204214