up to 2016f

[packages/tzdata.git] / tzdata.spec

diff --git a/tzdata.spec b/tzdata.spec
index 8154e22138e3c894db6e912d583417307a17847a..746bc10d9640e2ebcb6e328244bc1f3e7613957c 100644 (file)
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -9,13 +9,13 @@
 %endif
 %endif
 
-%define                tzcode_ver      2012a
-%define                tzdata_ver      2012a
+%define                tzcode_ver      2016f
+%define                tzdata_ver      2016f
 Summary:       Timezone data
 Summary(pl.UTF-8):     Dane o strefach czasowych
 Name:          tzdata
 Version:       %{tzdata_ver}
-Release:       2
+Release:       1
 License:       Public Domain (database), BSD/LGPL v2.1+ (code/test suite)
 Group:         Base
 # The tzdata-base-0.tar.bz2 is a simple building infrastructure and
@@ -26,30 +26,30 @@ Source0:    %{name}-base-0.tar.bz2
 # Source0-md5: e36d2f742c22f8c8dbf0686ac9769b55
 # ftp://elsie.nci.nih.gov/pub/ has been shut down because of lawsuit
 #Source1Download: http://www.iana.org/time-zones/
-Source1:       http://www.iana.org/time-zones/repository/releases/%{name}%{tzdata_ver}.tar.gz
-# Source1-md5: cc43867f4768e5c2e8315d9b3cac62ed
+Source1:       ftp://ftp.iana.org/tz/releases/%{name}%{tzdata_ver}.tar.gz
+# Source1-md5: b20b3c1618db1984aac685e763de001d
 #Source2Download: http://www.iana.org/time-zones/
-Source2:       http://www.iana.org/time-zones/repository/releases/tzcode%{tzcode_ver}.tar.gz
-# Source2-md5: a72bb8c29893ee3bfd1101aca29d4064
+Source2:       ftp://ftp.iana.org/tz/releases/tzcode%{tzcode_ver}.tar.gz
+# Source2-md5: b93618bb84e38dee102e0e41ec9d13e2
 Source3:       timezone.init
 Source4:       timezone.sysconfig
 Source5:       javazic.tar.gz
 # Source5-md5: 6a3392cd5f1594d13c12c1a836ac8d91
-Source6:       timezone.upstart
-Source7:       timezone.service
-Source8:       timezone.sh
+Patch0:                %{name}-test-update.patch
 Patch1:                javazic-fixup.patch
 Patch2:                install.patch
 URL:           http://www.twinsun.com/tz/tz-link.htm
 BuildRequires: rpm >= 4.4.9-56
-BuildRequires: rpmbuild(macros) >= 1.300
+BuildRequires: rpmbuild(macros) >= 1.623
 %if %{with java}
 BuildRequires: jdk
 BuildRequires: jpackage-utils
 BuildRequires: rpm-javaprov
 %endif
+Requires(post,preun,postun):   systemd-units >= 38
 Requires:      /sbin/chkconfig
 Requires:      rc-scripts >= 0.4.3.0
+Requires:      systemd-units >= 38
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -106,7 +106,12 @@ Plik nagłówkowy bazy danych stref czasowych.
 %prep
 %setup -qc
 mv tzdata/* .
+%patch0 -p1
+
 %{__tar} xzf %{SOURCE1} -C tzdata
+# don't override Makefile from base tar
+%{__mv} tzdata/Makefile{,.tzdata}
+
 install -d tzcode
 %{__tar} xzf %{SOURCE2} -C tzcode
 %patch2 -p1
@@ -149,7 +154,7 @@ cd ../tzdata
 %java -classpath ../javazic/ rht.tools.javazic.Main -V %{version} \
        -d ../zoneinfo/java \
        africa antarctica asia australasia europe northamerica pacificnew \
-       southamerica backward etcetera solar87 solar88 solar89 systemv \
+       southamerica backward etcetera factory systemv \
        ../javazic/tzdata_jdk/gmt ../javazic/tzdata_jdk/jdk11_backward
 cd ..
 %endif
@@ -169,7 +174,7 @@ install -d $RPM_BUILD_ROOT{/etc/{sysconfig,rc.d/init.d},%{_mandir}/man5,%{_inclu
 %endif
 
 # glibc.spec didn't keep it. so won't here either.
-rm -rf $RPM_BUILD_ROOT%{_datadir}/zoneinfo/posix
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/zoneinfo/posix
 # behave more like glibc.spec
 ln -sf %{_sysconfdir}/localtime        $RPM_BUILD_ROOT%{_datadir}/zoneinfo/localtime
 ln -sf localtime $RPM_BUILD_ROOT%{_datadir}/zoneinfo/posixtime
@@ -184,11 +189,7 @@ cp -p tzcode/tzfile.5 $RPM_BUILD_ROOT%{_mandir}/man5
 install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/timezone
 cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/timezone
 
-install -d $RPM_BUILD_ROOT/etc/init
-cp -p %{SOURCE6} $RPM_BUILD_ROOT/etc/init/timezone.conf
-
-install -p %{SOURCE7} $RPM_BUILD_ROOT%{systemdunitdir}/timezone.service
-install -p %{SOURCE8} $RPM_BUILD_ROOT/lib/systemd/pld-timezone
+ln -s /dev/null $RPM_BUILD_ROOT%{systemdunitdir}/timezone.service
 
 %if %{with java}
 cp -a zoneinfo/java $RPM_BUILD_ROOT%{_datadir}/javazi
@@ -200,16 +201,17 @@ rm -rf $RPM_BUILD_ROOT
 %post
 /sbin/chkconfig --add timezone
 %service timezone restart
-%systemd_post timezone.service
 
 %preun
 if [ "$1" = "0" ]; then
        /sbin/chkconfig --del timezone
 
        # save for postun
-       cp -af /etc/localtime /etc/localtime.rpmsave
+       localtime=$(readlink -f /etc/localtime)
+       # cp has no dereference target option, so remove link first
+       test -L /etc/localtime.rpmsave && rm -f /etc/localtime.rpmsave
+       cp -pf $localtime /etc/localtime.rpmsave
 fi
-%systemd_preun timezone.service
 
 %postun
 if [ "$1" = "0" ]; then
@@ -218,7 +220,6 @@ if [ "$1" = "0" ]; then
                mv -f /etc/localtime{.rpmsave,}
        fi
 fi
-%systemd_reload
 
 %triggerpostun -- rc-scripts < 0.4.1.4
 /sbin/chkconfig --add timezone
@@ -238,8 +239,9 @@ if ! grep -q '^TIMEZONE=' /etc/sysconfig/timezone; then
        %service timezone restart
 fi
 
-%triggerpostun -- tzdata < 2012a-2
-%systemd_trigger timezone.service
+%triggerpostun -- tzdata < 2015f-2
+%systemd_service_disable timezone.service
+%systemd_service_stop timezone.service
 
 %files
 %defattr(644,root,root,755)
@@ -247,9 +249,7 @@ fi
 %ghost /etc/localtime
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/timezone
 %attr(754,root,root) /etc/rc.d/init.d/timezone
-%config(noreplace) %verify(not md5 mtime size) /etc/init/timezone.conf
 %{systemdunitdir}/timezone.service
-%attr(755,root,root) /lib/systemd/pld-timezone
 
 %{_datadir}/zoneinfo
 %exclude %{_datadir}/zoneinfo/right