Accepting request 811896 from Base:System

- timezone modifies a file below /usr/share (boo#1172521)

- zdump --version reported "unknown" (boo#1172055)

  * Brazil no longer observes DST. 
  * Metlakatla "fell back" to rejoin Alaska Time on 2019-01-20 at 
- timezone modifies a file below /usr/share (boo#1172521)

- zdump --version reported "unknown" (boo#1172055)

OBS-URL: https://build.opensuse.org/request/show/811896
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/timezone?expand=0&rev=128

timezone-java.changes

@@ -1,5 +1,15 @@
 -------------------------------------------------------------------
-Fri Apr 24 08:02:45 UTC 2020 - Marketa Calabkova <mcalabkova@suse.com>
+Fri Jun  5 10:19:46 UTC 2020 - Marketa Calabkova <mcalabkova@suse.com>
+
+- timezone modifies a file below /usr/share (boo#1172521)
+
+-------------------------------------------------------------------
+Mon May 25 12:26:47 UTC 2020 - Marketa Calabkova <mcalabkova@suse.com>
+
+- zdump --version reported "unknown" (boo#1172055)
+
+-------------------------------------------------------------------
+Fri Apr 24 08:01:01 UTC 2020 - Marketa Calabkova <mcalabkova@suse.com>
 
 - timezone update 2020a (bsc#1169582)
   * Morocco springs forward on 2020-05-31, not 2020-05-24.
@@ -8,27 +18,27 @@ Fri Apr 24 08:02:45 UTC 2020 - Marketa Calabkova <mcalabkova@suse.com>
   * zic now supports expiration dates for leap second lists.
 
 -------------------------------------------------------------------
-Thu Sep 12 07:01:00 UTC 2019 - Marketa Calabkova <mcalabkova@suse.com>
+Thu Sep 12 06:58:19 UTC 2019 - Marketa Calabkova <mcalabkova@suse.com>
 
 - timezone update 2019c (bsc#1150451)
   * Fiji observes DST from 2019-11-10 to 2020-01-12.
   * Norfolk Island starts observing Australian-style DST.
 
 -------------------------------------------------------------------
-Tue Jul  2 07:53:08 UTC 2019 - Marketa Calabkova <mcalabkova@suse.com>
+Tue Jul  2 07:49:42 UTC 2019 - Marketa Calabkova <mcalabkova@suse.com>
 
 - timezone update 2019b (bsc#1140016):
-  * Brazil no longer observes DST.
+  * Brazil no longer observes DST. 
   * 'zic -b slim' outputs smaller TZif files.
   * Palestine's 2019 spring-forward transition was on 03-29, not 03-30.
   * Add info about the Crimea situation in zone1970.tab and zone.tab.
 
 -------------------------------------------------------------------
-Tue Mar 26 11:32:44 UTC 2019 - Marketa Calabkova <mcalabkova@suse.com>
+Tue Mar 26 11:27:21 UTC 2019 - Marketa Calabkova <mcalabkova@suse.com>
 
 - timezone update 2019a:
   * Palestine "springs forward" on 2019-03-30 instead of 2019-03-23
-  * Metlakatla "fell back" to rejoin Alaska Time on 2019-01-20 at
+  * Metlakatla "fell back" to rejoin Alaska Time on 2019-01-20 at 
     02:00
   * Israel observed DST in 1980 (08-02/09-13) and 1984 (05-05/08-25)
   * zic now has an -r option to limit the time range of output data

timezone.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Jun  5 10:19:46 UTC 2020 - Marketa Calabkova <mcalabkova@suse.com>
+
+- timezone modifies a file below /usr/share (boo#1172521)
+
+-------------------------------------------------------------------
+Mon May 25 12:26:47 UTC 2020 - Marketa Calabkova <mcalabkova@suse.com>
+
+- zdump --version reported "unknown" (boo#1172055)
+
 -------------------------------------------------------------------
 Fri Apr 24 08:01:01 UTC 2020 - Marketa Calabkova <mcalabkova@suse.com>
 

timezone.spec

@@ -21,7 +21,6 @@ Summary:        Time Zone Descriptions
 License:        BSD-3-Clause AND SUSE-Public-Domain
 Group:          System/Base
 URL:            http://www.iana.org/time-zones
-PreReq:         filesystem, coreutils
 # COMMON-BEGIN
 Version:        2020a
 Release:        0
@@ -55,6 +54,8 @@ can select an appropriate time zone for your system with YaST.
 sed -ri 's@/usr/local/etc/zoneinfo@%{_datadir}/zoneinfo@g' *.[1358]
 # COMMON-PREP-END
 
+touch version
+
 %build
 unset ${!LC_*}
 LANG=POSIX
@@ -62,7 +63,7 @@ LC_ALL=POSIX
 AREA=%{AREA}
 ZONE=%{ZONE}
 export AREA LANG LC_ALL ZONE
-make %{?_smp_mflags} TZDIR=%{_datadir}/zoneinfo CFLAGS="%{optflags} -DHAVE_GETTEXT=1 -DTZDEFAULT='\"/etc/localtime\"' -DTM_GMTOFF=tm_gmtoff -DTM_ZONE=tm_zone -Dlint" AWK=awk
+make %{?_smp_mflags} TZDIR=%{_datadir}/zoneinfo CFLAGS="%{optflags} -DHAVE_GETTEXT=1 -DTZDEFAULT='\"/etc/localtime\"' -DTM_GMTOFF=tm_gmtoff -DTM_ZONE=tm_zone -Dlint" AWK=awk BUGEMAIL="opensuse-support@opensuse.org"
 make %{?_smp_mflags} TZDIR=zoneinfo AWK=awk zones
 # Generate posixrules
 ./zic -y ./yearistype -d zoneinfo -p %{AREA}/%{ZONE}
@@ -88,19 +89,9 @@ install -D -m 755 tzselect %{buildroot}%{_bindir}/tzselect
 install -D -m 755 zdump    %{buildroot}%{_sbindir}/zdump
 install -D -m 755 zic      %{buildroot}%{_sbindir}/zic
 
-%post
-if [ ! -L /usr/share/zoneinfo/posixrules ]; then
-   rm -f /usr/share/zoneinfo/posixrules
-   ln -sf /etc/localtime /usr/share/zoneinfo/posixrules
-fi
-if [ -e /usr/share/zoneinfo/posixrules.rpmnew ]; then
-   rm -f /usr/share/zoneinfo/posixrules.rpmnew
-fi
-
 %files
 %defattr(-,root,root)
 %verify(not link md5 size mtime) %config(missingok,noreplace) /etc/localtime
-%verify(not link md5 size mtime) %{_datadir}/zoneinfo/posixrules
 %{_datadir}/zoneinfo
 %{_bindir}/tzselect
 %{_sbindir}/zdump