Hello community, here is the log from the commit of package timezone for openSUSE:12.1 checked in at 2011-10-25 17:14:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1/timezone (Old) and /work/SRC/openSUSE:12.1/.timezone.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "timezone", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:12.1/timezone/timezone-java.changes 2011-10-24 13:29:30.000000000 +0200 +++ /work/SRC/openSUSE:12.1/.timezone.new/timezone-java.changes 2011-10-25 17:14:16.000000000 +0200 @@ -1,0 +2,15 @@ +Tue Oct 25 14:48:15 CEST 2011 - [email protected] + +- apply patches also for timezone-java +- add patch to fix Tiraspol split + +------------------------------------------------------------------- +Mon Oct 24 19:19:45 CEST 2011 - [email protected] + +- 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 + +------------------------------------------------------------------- timezone.changes: same change Old: ---- tzdata2011l.tar.gz New: ---- chisinau-split-fix.diff tzdata2011m.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ timezone-java.spec ++++++ --- /var/tmp/diff_new_pack.TUzrE7/_old 2011-10-25 17:14:24.000000000 +0200 +++ /var/tmp/diff_new_pack.TUzrE7/_new 2011-10-25 17:14:24.000000000 +0200 @@ -25,10 +25,16 @@ 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 @@ %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} \ ++++++ timezone.spec ++++++ --- /var/tmp/diff_new_pack.TUzrE7/_old 2011-10-25 17:14:24.000000000 +0200 +++ /var/tmp/diff_new_pack.TUzrE7/_new 2011-10-25 17:14:24.000000000 +0200 @@ -25,16 +25,17 @@ 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 @@ %prep %setup -c -a 1 +# COMMON-PREP-BEGIN %patch0 %patch1 %patch2 %patch3 %patch4 +%patch5 -p1 +# COMMON-PREP-END %build unset ${!LC_*} ++++++ chisinau-split-fix.diff ++++++ --- 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 ++++++ pre_checkin.sh ++++++ --- /var/tmp/diff_new_pack.TUzrE7/_old 2011-10-25 17:14:24.000000000 +0200 +++ /var/tmp/diff_new_pack.TUzrE7/_new 2011-10-25 17:14:24.000000000 +0200 @@ -6,5 +6,7 @@ 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 ++++++ timezone-java.spec.in ++++++ --- /var/tmp/diff_new_pack.TUzrE7/_old 2011-10-25 17:14:24.000000000 +0200 +++ /var/tmp/diff_new_pack.TUzrE7/_new 2011-10-25 17:14:24.000000000 +0200 @@ -39,6 +39,8 @@ %prep %setup -c +# COMMON-PREP-BEGIN +# COMMON-PREP-END %build gij -jar %{_javadir}/javazic.jar -V %{version} \ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
