From 55c5ace9b9a181f4cd2c81845fd701a43b6f92a51c830dc970ec0b6de10b18db Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Tue, 6 Dec 2011 18:08:30 +0000 Subject: [PATCH 1/4] Updating link to change in openSUSE:Factory/timezone revision 58.0 OBS-URL: https://build.opensuse.org/package/show/Base:System/timezone?expand=0&rev=17d90ea297a9da0e24a97bcd5b2f96ef --- timezone-java.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/timezone-java.spec b/timezone-java.spec index a213a2e..bda4b37 100644 --- a/timezone-java.spec +++ b/timezone-java.spec @@ -20,7 +20,7 @@ Name: timezone-java BuildRequires: fastjar gcc-gij javazic -License: Public Domain, Freeware +License: SUSE-Public-Domain Summary: Timezone Descriptions Group: System/Base # COMMON-BEGIN From 40457bfcb807277cdb9c95005a8d415b18a943a0e1c04effc4abb13c7c2f842f Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Sat, 3 Mar 2012 10:48:01 +0000 Subject: [PATCH 2/4] - update to 2012b (bnc#748550): * Cuba has delayed start of DST by 3 weeks (now starts April 1 rather than March 11 * Chile 2011/2012 and 2012/2013 summer time date adjustments. * Falkland Islands onto permanent summer time (we're assuming for the foreseeable future, though 2012 is all we're fairly certain of.) * Armenia has abolished Summer Time. * Tokelau jumped the International Date Line back last December (just the same as their near neighbour, Samoa). * America/Creston is a new zone for a small area of British Columbia * There will be a leapsecod 2012-06-30 23:59:60 UTC. - update to 2012b (bnc#748550): * Cuba has delayed start of DST by 3 weeks (now starts April 1 rather than March 11 * Chile 2011/2012 and 2012/2013 summer time date adjustments. * Falkland Islands onto permanent summer time (we're assuming for the foreseeable future, though 2012 is all we're fairly certain of.) * Armenia has abolished Summer Time. * Tokelau jumped the International Date Line back last December (just the same as their near neighbour, Samoa). * America/Creston is a new zone for a small area of British Columbia * There will be a leapsecod 2012-06-30 23:59:60 UTC. OBS-URL: https://build.opensuse.org/package/show/Base:System/timezone?expand=0&rev=72 --- timezone-java.changes | 15 +++++++++++++++ timezone-java.spec | 16 ++++++++-------- timezone.changes | 15 +++++++++++++++ timezone.spec | 12 +++++------- tzcode2011i.tar.gz | 3 --- tzcode2012b.tar.gz | 3 +++ tzdata2011n.tar.gz | 3 --- tzdata2012b.tar.gz | 3 +++ 8 files changed, 49 insertions(+), 21 deletions(-) delete mode 100644 tzcode2011i.tar.gz create mode 100644 tzcode2012b.tar.gz delete mode 100644 tzdata2011n.tar.gz create mode 100644 tzdata2012b.tar.gz diff --git a/timezone-java.changes b/timezone-java.changes index 5062f83..b1567b4 100644 --- a/timezone-java.changes +++ b/timezone-java.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Sat Mar 3 11:33:38 CET 2012 - dmueller@suse.de + +- update to 2012b (bnc#748550): + * Cuba has delayed start of DST by 3 weeks + (now starts April 1 rather than March 11 + * Chile 2011/2012 and 2012/2013 summer time date adjustments. + * Falkland Islands onto permanent summer time (we're assuming for the + foreseeable future, though 2012 is all we're fairly certain of.) + * Armenia has abolished Summer Time. + * Tokelau jumped the International Date Line back last December + (just the same as their near neighbour, Samoa). + * America/Creston is a new zone for a small area of British Columbia + * There will be a leapsecod 2012-06-30 23:59:60 UTC. + ------------------------------------------------------------------- Sat Nov 5 13:58:36 CET 2011 - dmueller@suse.de diff --git a/timezone-java.spec b/timezone-java.spec index bda4b37..ec7f7ca 100644 --- a/timezone-java.spec +++ b/timezone-java.spec @@ -1,7 +1,7 @@ # # spec file for package timezone-java # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,20 +15,20 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: timezone-java -BuildRequires: fastjar gcc-gij javazic -License: SUSE-Public-Domain +BuildRequires: fastjar +BuildRequires: gcc-gij +BuildRequires: javazic Summary: Timezone Descriptions +License: SUSE-Public-Domain Group: System/Base # COMMON-BEGIN # COMMON-BEGIN -Version: 2011n -Release: 1 +Version: 2012b +Release: 0 Source: ftp://munnari.oz.au/pub/tzdata%{version}.tar.gz -Source1: ftp://munnari.oz.au/pub/tzcode2011i.tar.gz +Source1: ftp://munnari.oz.au/pub/tzcode2012b.tar.gz Patch0: tzdata-china.diff Patch1: tzcode-zic.diff Patch2: tzcode-ksh.diff diff --git a/timezone.changes b/timezone.changes index 5062f83..b1567b4 100644 --- a/timezone.changes +++ b/timezone.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Sat Mar 3 11:33:38 CET 2012 - dmueller@suse.de + +- update to 2012b (bnc#748550): + * Cuba has delayed start of DST by 3 weeks + (now starts April 1 rather than March 11 + * Chile 2011/2012 and 2012/2013 summer time date adjustments. + * Falkland Islands onto permanent summer time (we're assuming for the + foreseeable future, though 2012 is all we're fairly certain of.) + * Armenia has abolished Summer Time. + * Tokelau jumped the International Date Line back last December + (just the same as their near neighbour, Samoa). + * America/Creston is a new zone for a small area of British Columbia + * There will be a leapsecod 2012-06-30 23:59:60 UTC. + ------------------------------------------------------------------- Sat Nov 5 13:58:36 CET 2011 - dmueller@suse.de diff --git a/timezone.spec b/timezone.spec index d732b00..239d034 100644 --- a/timezone.spec +++ b/timezone.spec @@ -1,7 +1,7 @@ # # spec file for package timezone # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,20 +15,18 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: timezone -License: PERMISSIVE-OSI-COMPLIANT(BSD-like ; public domain) Summary: Timezone Descriptions +License: PERMISSIVE-OSI-COMPLIANT(BSD-like ; public domain) Group: System/Base Url: http://www.gnu.org/software/libc/libc.html PreReq: filesystem, coreutils # COMMON-BEGIN -Version: 2011n -Release: 1 +Version: 2012b +Release: 0 Source: ftp://munnari.oz.au/pub/tzdata%{version}.tar.gz -Source1: ftp://munnari.oz.au/pub/tzcode2011i.tar.gz +Source1: ftp://munnari.oz.au/pub/tzcode2012b.tar.gz Patch0: tzdata-china.diff Patch1: tzcode-zic.diff Patch2: tzcode-ksh.diff diff --git a/tzcode2011i.tar.gz b/tzcode2011i.tar.gz deleted file mode 100644 index 87b292f..0000000 --- a/tzcode2011i.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f0dd991de3f8d6c599c104e294377c9befa1ef40aa5a1d09e2e295a453f3c1ec -size 135022 diff --git a/tzcode2012b.tar.gz b/tzcode2012b.tar.gz new file mode 100644 index 0000000..2bcffdb --- /dev/null +++ b/tzcode2012b.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4345a2de239a7b6e5ab286052cc269eb07d63798ae14ba715eb4c6bdfa0f3350 +size 135075 diff --git a/tzdata2011n.tar.gz b/tzdata2011n.tar.gz deleted file mode 100644 index d806e37..0000000 --- a/tzdata2011n.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a343e542486b2b8ebdeca474eed79f1c04f69420ca943c2b9bdea1d2385e38cd -size 204684 diff --git a/tzdata2012b.tar.gz b/tzdata2012b.tar.gz new file mode 100644 index 0000000..5d39279 --- /dev/null +++ b/tzdata2012b.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2f9f8e2d1ae087be5917f60c3946e8dc3fe1068d7738c3395f2125135309e745 +size 207782 From a9ae35fb6b7c8b56aa3addbf0ab6c8c8cd04594c70726433068a84fd55bdff73 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 29 Mar 2012 12:56:55 +0000 Subject: [PATCH 3/4] - adjust license to spdx.org format (bnc#752642) - adjust license to spdx.org format (bnc#752642) OBS-URL: https://build.opensuse.org/package/show/Base:System/timezone?expand=0&rev=73 --- timezone-java.changes | 5 +++++ timezone-java.spec.in | 2 +- timezone.changes | 5 +++++ timezone.spec | 2 +- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/timezone-java.changes b/timezone-java.changes index b1567b4..7aa3c87 100644 --- a/timezone-java.changes +++ b/timezone-java.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Mar 29 14:56:30 CEST 2012 - dmueller@suse.de + +- adjust license to spdx.org format (bnc#752642) + ------------------------------------------------------------------- Sat Mar 3 11:33:38 CET 2012 - dmueller@suse.de diff --git a/timezone-java.spec.in b/timezone-java.spec.in index e065bf3..2f808bc 100644 --- a/timezone-java.spec.in +++ b/timezone-java.spec.in @@ -20,7 +20,7 @@ Name: timezone-java BuildRequires: fastjar gcc-gij javazic -License: Public Domain, Freeware +License: BSD-3-Clause Summary: Timezone Descriptions Group: System/Base # COMMON-BEGIN diff --git a/timezone.changes b/timezone.changes index b1567b4..7aa3c87 100644 --- a/timezone.changes +++ b/timezone.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Mar 29 14:56:30 CEST 2012 - dmueller@suse.de + +- adjust license to spdx.org format (bnc#752642) + ------------------------------------------------------------------- Sat Mar 3 11:33:38 CET 2012 - dmueller@suse.de diff --git a/timezone.spec b/timezone.spec index 239d034..117f417 100644 --- a/timezone.spec +++ b/timezone.spec @@ -18,7 +18,7 @@ Name: timezone Summary: Timezone Descriptions -License: PERMISSIVE-OSI-COMPLIANT(BSD-like ; public domain) +License: BSD-3-Clause ; SUSE-Public-Domain Group: System/Base Url: http://www.gnu.org/software/libc/libc.html PreReq: filesystem, coreutils From 4775d05d0ea73cae38a26d732a6f8785d33355b73d755044923ecaf4233395af Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 2 Apr 2012 14:20:52 +0000 Subject: [PATCH 4/4] fix it OBS-URL: https://build.opensuse.org/package/show/Base:System/timezone?expand=0&rev=74 --- timezone-java.changes | 8 ++++++++ timezone-java.spec | 4 ++-- timezone-java.spec.in | 2 +- timezone.changes | 8 ++++++++ timezone.spec | 4 ++-- tzdata2012b.tar.gz | 3 --- tzdata2012c.tar.gz | 3 +++ 7 files changed, 24 insertions(+), 8 deletions(-) delete mode 100644 tzdata2012b.tar.gz create mode 100644 tzdata2012c.tar.gz diff --git a/timezone-java.changes b/timezone-java.changes index 7aa3c87..eaca3a7 100644 --- a/timezone-java.changes +++ b/timezone-java.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Apr 2 16:19:16 CEST 2012 - dmueller@suse.de + +- update to 2012c: + * Morocco DST starts late April 2012 + * Changes for Gaza, Hebron and Syria (for 2012) + * Haiti now follows US/Canada rules regarding DST + ------------------------------------------------------------------- Thu Mar 29 14:56:30 CEST 2012 - dmueller@suse.de diff --git a/timezone-java.spec b/timezone-java.spec index ec7f7ca..23e9b67 100644 --- a/timezone-java.spec +++ b/timezone-java.spec @@ -21,11 +21,11 @@ BuildRequires: fastjar BuildRequires: gcc-gij BuildRequires: javazic Summary: Timezone Descriptions -License: SUSE-Public-Domain +License: BSD-3-Clause and SUSE-Public-Domain Group: System/Base # COMMON-BEGIN # COMMON-BEGIN -Version: 2012b +Version: 2012c Release: 0 Source: ftp://munnari.oz.au/pub/tzdata%{version}.tar.gz Source1: ftp://munnari.oz.au/pub/tzcode2012b.tar.gz diff --git a/timezone-java.spec.in b/timezone-java.spec.in index 2f808bc..ca63d65 100644 --- a/timezone-java.spec.in +++ b/timezone-java.spec.in @@ -20,7 +20,7 @@ Name: timezone-java BuildRequires: fastjar gcc-gij javazic -License: BSD-3-Clause +License: BSD-3-Clause and SUSE-Public-Domain Summary: Timezone Descriptions Group: System/Base # COMMON-BEGIN diff --git a/timezone.changes b/timezone.changes index 7aa3c87..eaca3a7 100644 --- a/timezone.changes +++ b/timezone.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Apr 2 16:19:16 CEST 2012 - dmueller@suse.de + +- update to 2012c: + * Morocco DST starts late April 2012 + * Changes for Gaza, Hebron and Syria (for 2012) + * Haiti now follows US/Canada rules regarding DST + ------------------------------------------------------------------- Thu Mar 29 14:56:30 CEST 2012 - dmueller@suse.de diff --git a/timezone.spec b/timezone.spec index 117f417..9165c3c 100644 --- a/timezone.spec +++ b/timezone.spec @@ -18,12 +18,12 @@ Name: timezone Summary: Timezone Descriptions -License: BSD-3-Clause ; SUSE-Public-Domain +License: BSD-3-Clause and SUSE-Public-Domain Group: System/Base Url: http://www.gnu.org/software/libc/libc.html PreReq: filesystem, coreutils # COMMON-BEGIN -Version: 2012b +Version: 2012c Release: 0 Source: ftp://munnari.oz.au/pub/tzdata%{version}.tar.gz Source1: ftp://munnari.oz.au/pub/tzcode2012b.tar.gz diff --git a/tzdata2012b.tar.gz b/tzdata2012b.tar.gz deleted file mode 100644 index 5d39279..0000000 --- a/tzdata2012b.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2f9f8e2d1ae087be5917f60c3946e8dc3fe1068d7738c3395f2125135309e745 -size 207782 diff --git a/tzdata2012c.tar.gz b/tzdata2012c.tar.gz new file mode 100644 index 0000000..b0bbf01 --- /dev/null +++ b/tzdata2012c.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:33e19e1dd27bda5239812587d72971509a15b59baff7abd692b77ff66f168a82 +size 206206