From a3939b64d9745cbae7aee0d2e161eb51cf22ee2d84ae75b146bbbacff927d26a Mon Sep 17 00:00:00 2001 From: Andreas Stieger Date: Tue, 16 Jan 2018 22:40:14 +0000 Subject: [PATCH] Accepting request 566506 from home:AndreasStieger:branches:Base:System timezone update 2018a OBS-URL: https://build.opensuse.org/request/show/566506 OBS-URL: https://build.opensuse.org/package/show/Base:System/timezone?expand=0&rev=219 --- timezone-2018a-fix-pacificnew.patch | 34 +++++++++++++++++++++++++++++ timezone-java.changes | 14 ++++++++++++ timezone-java.spec | 12 +++++----- timezone-java.spec.in | 8 +++---- timezone.changes | 14 ++++++++++++ timezone.spec | 6 +++-- tzcode2017c.tar.gz | 3 --- tzcode2017c.tar.gz.asc | 16 -------------- tzcode2018a.tar.gz | 3 +++ tzcode2018a.tar.gz.asc | 17 +++++++++++++++ tzdata2017c.tar.gz | 3 --- tzdata2017c.tar.gz.asc | 16 -------------- tzdata2018a.tar.gz | 3 +++ tzdata2018a.tar.gz.asc | 17 +++++++++++++++ 14 files changed, 117 insertions(+), 49 deletions(-) create mode 100644 timezone-2018a-fix-pacificnew.patch delete mode 100644 tzcode2017c.tar.gz delete mode 100644 tzcode2017c.tar.gz.asc create mode 100644 tzcode2018a.tar.gz create mode 100644 tzcode2018a.tar.gz.asc delete mode 100644 tzdata2017c.tar.gz delete mode 100644 tzdata2017c.tar.gz.asc create mode 100644 tzdata2018a.tar.gz create mode 100644 tzdata2018a.tar.gz.asc diff --git a/timezone-2018a-fix-pacificnew.patch b/timezone-2018a-fix-pacificnew.patch new file mode 100644 index 0000000..5f21394 --- /dev/null +++ b/timezone-2018a-fix-pacificnew.patch @@ -0,0 +1,34 @@ +From 270a7f2939caadd2d1ead2e4dd4b35c1676e188d Mon Sep 17 00:00:00 2001 +From: Andreas Stieger +Date: Tue, 16 Jan 2018 23:20:25 +0100 +Subject: [PATCH] Follow-up to 2edd825, version target shoult not depend on + pacificnew + +Signed-off-by: Andreas Stieger +--- + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index be4b264..06d863a 100644 +--- a/Makefile ++++ b/Makefile +@@ -479,13 +479,13 @@ ENCHILADA= $(COMMON) $(DOCS) $(SOURCES) $(DATA) $(MISC) $(TZS) tzdata.zi + VERSION_DEPS= \ + calendars CONTRIBUTING LICENSE Makefile NEWS README \ + africa antarctica asctime.c asia australasia \ +- backward backzone \ ++ $(BACKWARD) backzone \ + checklinks.awk checktab.awk \ + date.1 date.c difftime.c \ + etcetera europe factory iso3166.tab \ + leap-seconds.list leapseconds.awk localtime.c \ + newctime.3 newstrftime.3 newtzset.3 northamerica \ +- pacificnew private.h \ ++ private.h \ + southamerica strftime.c systemv theory.html \ + time2posix.3 tz-art.html tz-how-to.html tz-link.html \ + tzfile.5 tzfile.h tzselect.8 tzselect.ksh \ +-- +2.15.1 + diff --git a/timezone-java.changes b/timezone-java.changes index 08299af..42dad1f 100644 --- a/timezone-java.changes +++ b/timezone-java.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Tue Jan 16 22:29:22 UTC 2018 - astieger@suse.com + +- timezone update 2018a: + * São Tomé and Príncipe switched from +00 to +01 on 2018-01-01 + * Southern Brazil's DST will now start on November's first Sunday + (bsc#1073275) + * Ireland's standard time is now in the summer, not the winter + (bsc#1073299) + * New zic option -t to specify the time zone file if TZ is unset + * No longer creates the backward-compatibility link + US/Pacific-New which is no longer distributed. Add patch to + address related build issue timezone-2018a-fix-pacificnew.patch + ------------------------------------------------------------------- Mon Oct 23 15:26:15 UTC 2017 - astieger@suse.com diff --git a/timezone-java.spec b/timezone-java.spec index a6c3f68..253440c 100644 --- a/timezone-java.spec +++ b/timezone-java.spec @@ -1,7 +1,7 @@ # # spec file for package timezone-java # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,7 +25,7 @@ Summary: Time Zone Descriptions # COMMON-BEGIN License: BSD-3-Clause and SUSE-Public-Domain Group: System/Base -Version: 2017c +Version: 2018a Release: 0 Source: https://www.iana.org/time-zones/repository/releases/tzdata%{version}.tar.gz Source1: https://www.iana.org/time-zones/repository/releases/tzcode%{version}.tar.gz @@ -35,9 +35,10 @@ Source4: %{name}.keyring Source5: %{name}.changes Patch0: tzdata-china.diff Patch3: iso3166-uk.diff +Patch4: timezone-2018a-fix-pacificnew.patch # COMMON-END # COMMON-END -Url: http://www.gnu.org/software/libc/libc.html +Url: https://www.iana.org/time-zones Requires(pre): filesystem, coreutils BuildArch: noarch Provides: tzdata-java = %{version}-%{release} @@ -57,6 +58,7 @@ package is intended for Java Virtual Machine based on OpenJDK. # COMMON-PREP-BEGIN %patch0 -p1 %patch3 -p1 +%patch4 -p1 sed -ri 's@/usr/local/etc/zoneinfo@%{_datadir}/zoneinfo@g' *.[1358] # COMMON-PREP-END # COMMON-PREP-END @@ -67,14 +69,14 @@ echo "tzdata%{version}" >> VERSION # Java 6/7 data java -jar %{_javadir}/javazic.jar -V %{version} \ -d javazi \ - africa antarctica asia australasia europe northamerica pacificnew \ + africa antarctica asia australasia europe northamerica \ southamerica backward etcetera systemv \ %{_datadir}/javazic/tzdata_jdk/gmt \ %{_datadir}/javazic/tzdata_jdk/jdk11_backward # Java 8/9 data java -jar %{_javadir}/tzdb.jar \ -srcdir . -dstfile javazi/tzdb.dat \ - africa antarctica asia australasia europe northamerica pacificnew \ + africa antarctica asia australasia europe northamerica \ southamerica backward etcetera systemv \ %{_datadir}/tzdb/tzdata_jdk/gmt \ %{_datadir}/tzdb/tzdata_jdk/jdk11_backward diff --git a/timezone-java.spec.in b/timezone-java.spec.in index d302396..468f94d 100644 --- a/timezone-java.spec.in +++ b/timezone-java.spec.in @@ -1,7 +1,7 @@ # # spec file for package timezone-java # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,7 +25,7 @@ License: BSD-3-Clause and SUSE-Public-Domain Group: System/Base # COMMON-BEGIN # COMMON-END -Url: http://www.gnu.org/software/libc/libc.html +Url: https://www.iana.org/time-zones Requires(pre): filesystem, coreutils BuildArch: noarch Provides: tzdata-java = %{version}-%{release} @@ -50,14 +50,14 @@ echo "tzdata%{version}" >> VERSION # Java 6/7 data java -jar %{_javadir}/javazic.jar -V %{version} \ -d javazi \ - africa antarctica asia australasia europe northamerica pacificnew \ + africa antarctica asia australasia europe northamerica \ southamerica backward etcetera systemv \ %{_datadir}/javazic/tzdata_jdk/gmt \ %{_datadir}/javazic/tzdata_jdk/jdk11_backward # Java 8/9 data java -jar %{_javadir}/tzdb.jar \ -srcdir . -dstfile javazi/tzdb.dat \ - africa antarctica asia australasia europe northamerica pacificnew \ + africa antarctica asia australasia europe northamerica \ southamerica backward etcetera systemv \ %{_datadir}/tzdb/tzdata_jdk/gmt \ %{_datadir}/tzdb/tzdata_jdk/jdk11_backward diff --git a/timezone.changes b/timezone.changes index 08299af..42dad1f 100644 --- a/timezone.changes +++ b/timezone.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Tue Jan 16 22:29:22 UTC 2018 - astieger@suse.com + +- timezone update 2018a: + * São Tomé and Príncipe switched from +00 to +01 on 2018-01-01 + * Southern Brazil's DST will now start on November's first Sunday + (bsc#1073275) + * Ireland's standard time is now in the summer, not the winter + (bsc#1073299) + * New zic option -t to specify the time zone file if TZ is unset + * No longer creates the backward-compatibility link + US/Pacific-New which is no longer distributed. Add patch to + address related build issue timezone-2018a-fix-pacificnew.patch + ------------------------------------------------------------------- Mon Oct 23 15:26:15 UTC 2017 - astieger@suse.com diff --git a/timezone.spec b/timezone.spec index c29a039..b622216 100644 --- a/timezone.spec +++ b/timezone.spec @@ -1,7 +1,7 @@ # # spec file for package timezone # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,7 +23,7 @@ Group: System/Base Url: http://www.iana.org/time-zones PreReq: filesystem, coreutils # COMMON-BEGIN -Version: 2017c +Version: 2018a Release: 0 Source: https://www.iana.org/time-zones/repository/releases/tzdata%{version}.tar.gz Source1: https://www.iana.org/time-zones/repository/releases/tzcode%{version}.tar.gz @@ -33,6 +33,7 @@ Source4: %{name}.keyring Source5: %{name}.changes Patch0: tzdata-china.diff Patch3: iso3166-uk.diff +Patch4: timezone-2018a-fix-pacificnew.patch # COMMON-END BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -50,6 +51,7 @@ can select an appropriate time zone for your system with YaST. # COMMON-PREP-BEGIN %patch0 -p1 %patch3 -p1 +%patch4 -p1 sed -ri 's@/usr/local/etc/zoneinfo@%{_datadir}/zoneinfo@g' *.[1358] # COMMON-PREP-END diff --git a/tzcode2017c.tar.gz b/tzcode2017c.tar.gz deleted file mode 100644 index 370b56e..0000000 --- a/tzcode2017c.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:81e8b4bc23e60906640c266bbff3789661e22f0fa29fe61b96ec7c2816c079b7 -size 219346 diff --git a/tzcode2017c.tar.gz.asc b/tzcode2017c.tar.gz.asc deleted file mode 100644 index 26e5943..0000000 --- a/tzcode2017c.tar.gz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIcBAABAgAGBQJZ6nFEAAoJEO2X6Q5iqn40JnoP/i8JCoxp5Vb+oxD2F8hz85+S -ikzzi0+l5vMifyI9+/kxU/V+W1YvLC3zbUMLN6moE65WryjRnXCJXfTzNyFUON0H -Dg7a1al0mNcq5D4YIvR6C/O5SJdRNW6VNW0A0owXV8ZafAzUbe5ICoUKQ69DC3ps -jKXjO9qsyxne7rqjaqCyJAGVRHdx82p7XRvr5JCtU5vEGoclCDglWN4cUP09019q -azA1eYfqkqS+uf3KzPVc8e/0slAdXOqOib7NNFY/Y90wFUlKuhgHdOXVy9bIvdeP -PQmNlXNi1TC/gYNtqdxoeCsWSnOCMW9f/v9vBZTB8Oh8Ycm6U+YSAKZxlaVP5zUa -VEnyMxDjKOD6YcqGHqx035TFxaAfaDDvDRACcA98SdTcBr7TgY4Ubxv0kCQ007Vr -BYesKUcVpE8/wsh6dDHbaZzK01bJkJYGr44UZBwOwAbbkyCG+HDv3J6eg4UphQq0 -HITxJLsaiJcJnR/l8YVSrzSHXIftwRIhGbab3BFuPAN7nDEZFrhUkZdMwac4B6E8 -gsVxLYK3SJyFz9Jx7D4oDBN+Nxt+54O3/GXYVtAF0k2hiytd6UFaIr1WsmdSVLzA -kmBQNiyqJ9jOPJ75B/r4x15JRZfNFDKJZ7AMqo6QthKZrurK93uuR20OKZmklnLr -Vwcz+6pYTUf9bRrRfyXg -=drdL ------END PGP SIGNATURE----- diff --git a/tzcode2018a.tar.gz b/tzcode2018a.tar.gz new file mode 100644 index 0000000..0cd3ab7 --- /dev/null +++ b/tzcode2018a.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f74b4a2f8ad325dbf94c8d375853ae34a318a9433ec4b486f8e8a5a25f89410c +size 223350 diff --git a/tzcode2018a.tar.gz.asc b/tzcode2018a.tar.gz.asc new file mode 100644 index 0000000..2d94dc0 --- /dev/null +++ b/tzcode2018a.tar.gz.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQIcBAABAgAGBQJaWamJAAoJEO2X6Q5iqn40YwcQAISEeIZSDY9bIp5Ny7WwG0pL +BuyLdxJNboGDFWpN5GRIm2ojvoNECJQH1FulC3aJgcEA0cEwRWNYXBY589mQVtMQ +CmsNv2najgZ4olmHs2SzordcfjxICvbEXUt7OZ4O66TcBvDFTjqr/g4WcFK9bv+P +Qi76JspN/B2T3YDmZNKXjsXFcc5i4ZiHdNmNZ20w2zQU70w0avrxPo4G+s/YJ5R9 +NGPQI3rYkttMasBHgQIb+rqsUz9Hrqlm/8etDYYrEDUO8RZh9jeNHmQE7vLGiF7d +InI1E7wa/UkhQOlM1dqW+0surFw3iD8DIKNasDTJQKWb3Ez3JDRUOGaiA9hEXa57 +Rwvahn0MJbQZCGk+8gDqTawtScN90+gztrkXEjravXh44E6IoOksB7tkGxHn2XMH +vLJC1CFdNSIYmH2mtHZMj6kwHnC5wfX0fK88ZQHV/jJgALqcZHuxEnfiKo+DeHAS +uDdyP1fJ85m9nI9kPsmPqh23kAGBnkFmtwHbYcya3lcBLyGmm/Il8gwsHjraIhyc +9KhkjpL6342o26711sSNEuuIsS0NwGqNVh+HqF+loEBPWc8yt8DMxQc3oecKZxvO +Adl7X3eThv5b49sbsUwk6Y7s+LTchvZXk8IuM5nunXH6fDzwbD2JZoQCG+rqdSs8 +Vy03v9p54AzACfgPqOjM +=ecbv +-----END PGP SIGNATURE----- diff --git a/tzdata2017c.tar.gz b/tzdata2017c.tar.gz deleted file mode 100644 index 275473f..0000000 --- a/tzdata2017c.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d6543f92a929826318e2f44ff3a7611ce5f565a43e10250b42599d0ba4cbd90b -size 335571 diff --git a/tzdata2017c.tar.gz.asc b/tzdata2017c.tar.gz.asc deleted file mode 100644 index aa22fa9..0000000 --- a/tzdata2017c.tar.gz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIcBAABAgAGBQJZ6nFvAAoJEO2X6Q5iqn40dFwP/31AK4shXM+vRKf28szHxBwk -gTHTka+WMvQdhRtkgQvRXDQo1q9QiI/t4l3x0TpxkkuZATA6Yf1AhV7ugFFfl8Ia -0bc+8uXnv8XnpZ3Qbk57B6J6LEsaMOeaXv1vIZ6x8E/oaDECAV4o2+dpDl5kdNTr -O6hcUZwY1Rd8CcJCvOPSFfRV1kNcPXCaKQPh0Z5uohqC7DLmxhtagsiMeUmzInV/ -Q1bPOJXF4sD9X7A6hKqk4oyFQvJrYjv/JeM5eoreHIXdSLqvvwhhqCSMx6A76NDA -1/rKFZxqBLojlLmG07SXsCMC9OmD2m709sHKPx0foixhlmB9QJjDm62EjPPwfXd9 -AH/3jxolQQq8DCC4XyqLblzPORfFNwZ4vWC3QpTNsQOdqBdkKpfNYXIZTxGL/8Ti -6GtCwmp2E5+gXoV1uTHY51nLNjuI47XdUReh+eBWAWh95gJiKspStHebWLFsbUhg -/YM9K9efhu5UaA3BxJn3SpXR43zeNDSUOmyIB+kyRQZDXSK/K0ukwgZPMzq8QuR8 -aFB7K0YztC8P6SXIGOgMsWuVp06Cx4QQAdnvy9pcx0iDUUNoh/n+isvwfBCvvUvq -ETDnuGYxsUTjlDvORG1VHg14sr4AdyTl3PH12cOscVP4fq5JV91cE4FBHwjD3jSx -Lp4Yb/wfGxGLgqPmpY/I -=C3sx ------END PGP SIGNATURE----- diff --git a/tzdata2018a.tar.gz b/tzdata2018a.tar.gz new file mode 100644 index 0000000..9b6e96c --- /dev/null +++ b/tzdata2018a.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d2ea23a06783603a42c1a2665392e65958b0c8a341b2f2e7342d43343d7080dc +size 339626 diff --git a/tzdata2018a.tar.gz.asc b/tzdata2018a.tar.gz.asc new file mode 100644 index 0000000..49a5763 --- /dev/null +++ b/tzdata2018a.tar.gz.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQIcBAABAgAGBQJaWamJAAoJEO2X6Q5iqn40x/sP/2omHGTriV5AE7BnTuF/Gzcl +QdFEDGXkHKf9dDEZy9D6Kuos+euzfRzbxLwDkrNmmotOAgPQnSOoKvkrLb5vsrQc +TDrKLfC8ZKytwhRI9DK3f1oRWr1jhMfQ3sbNWYXpT3l8At14iUZqXfgcL0h2c0Py +zZrJUtpvU2UbD17Sz1a9urhbLFWJwBTiIYF2/eAN30cmCot2AnI5Dvs+yyuzG9Eq +stZ++zdKg+bvykPSIFCmsyiBosDraH4oAemwNTPnxbx8Y4UVsL2pFKReLqRtEBpv +R6QHneaYJ58yE/y5pi64tjN0qlJ9uaz39pQdef27UJdOzm8cXedrY4gqNBtnnhPS +VEgp2liq4Drik/zZsENAM+WkDLrrCABeFD3nlLyzjzxi+zKF+AMzpEkjWSt5emzY +lAgOog4qnQfgR3QcIWWyQx7tsNwfJ3kty4fWKOmf2em8XflcXY2W7cmtbsMeVLqO +ZwbE0v66C5YZHDj/zLpSxrB9Lw8HnXN0eL9sG+9VYwlrafL5yS889DH6+5n2r2MR +tKPHxLYaCIcUbB1ijHq04o32/if9ib5wsO8EwZd8bBJFdO2pTp2sqskGzEJQedxa +KmKDn2OyOUX12c+0GYhuGvXfBXPaYdlfM4Q2yGZuwilGZALU2HQEzaJXTu6EaMtx +mOeCARMtgOsecp8hsrDu +=rEGu +-----END PGP SIGNATURE-----