%endif
%endif
-%define tzcode_ver 2015a
-%define tzdata_ver 2015a
+%define tzcode_ver 2017c
+%define tzdata_ver 2017c
Summary: Timezone data
Summary(pl.UTF-8): Dane o strefach czasowych
Name: tzdata
Version: %{tzdata_ver}
-Release: 1
+Release: 2
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
# ftp://elsie.nci.nih.gov/pub/ has been shut down because of lawsuit
#Source1Download: http://www.iana.org/time-zones/
Source1: ftp://ftp.iana.org/tz/releases/%{name}%{tzdata_ver}.tar.gz
-# Source1-md5: 4ed11c894a74a5ea64201b1c6dbb8831
+# Source1-md5: 1e751e7e08f8b68530674f04619d894d
#Source2Download: http://www.iana.org/time-zones/
Source2: ftp://ftp.iana.org/tz/releases/tzcode%{tzcode_ver}.tar.gz
-# Source2-md5: 8f375ede46ae137fbac047ac431bda37
+# Source2-md5: 2fe6986231db5182c61d565021a0cd7b
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
BuildRequires: rpm-javaprov
%endif
Requires(post,preun,postun): systemd-units >= 38
+Requires: %{name}-zoneinfo = %{version}-%{release}
Requires: /sbin/chkconfig
Requires: rc-scripts >= 0.4.3.0
Requires: systemd-units >= 38
Ten pakiet zawiera informacje o strefach czasowych przeznaczone dla
programów w Javie.
+%package zoneinfo
+Summary: Timezone data
+Summary(pl.UTF-8): Dane stref czasowych
+Group: Base
+
+%description zoneinfo
+Timezone data.
+
+%description zoneinfo -l pl.UTF-8
+Dane stref czasowych.
+
%package zoneinfo_right
Summary: Non-POSIX (real) time zones
Summary(es.UTF-8): Zonas de tiempo reales (no de POSIX)
Summary(pl.UTF-8): Nie-POSIX-owe (prawdziwe) strefy czasowe
-Group: Libraries
+Group: Base
Obsoletes: glibc-zoneinfo_right
%description zoneinfo_right
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
%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
mv -f /etc/localtime{.rpmsave,}
fi
fi
-%systemd_reload
%triggerpostun -- rc-scripts < 0.4.1.4
/sbin/chkconfig --add timezone
%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)
-%doc tzcode/README tzcode/Theory tzcode/tz-link.html
+%doc tzcode/README tzcode/tz-link.html
%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
+%{_datadir}/zoneinfo/localtime
+%{_datadir}/zoneinfo/posixrules
+%{_datadir}/zoneinfo/posixtime
%if %{with java}
%files -n java-tzdata
%{_datadir}/javazi
%endif
+%files zoneinfo
+%defattr(644,root,root,755)
+%{_datadir}/zoneinfo
+%exclude %{_datadir}/zoneinfo/right
+%exclude %{_datadir}/zoneinfo/localtime
+%exclude %{_datadir}/zoneinfo/posixrules
+%exclude %{_datadir}/zoneinfo/posixtime
+
%files zoneinfo_right
%defattr(644,root,root,755)
%{_datadir}/zoneinfo/right