do not own tzdata dir by two packages; refs 2141fdb

[packages/tzdata.git] / tzdata.spec

diff --git a/tzdata.spec b/tzdata.spec
index 117e8fc974bf043ed2a8c8a37858a3d374f202f5..9a252e3e6accbfe976a9bac25747b2dd8f5fd9c0 100644 (file)
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -9,13 +9,13 @@
 %endif
 %endif
 
-%define                tzcode_ver      2016a
-%define                tzdata_ver      2016a
+%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
@@ -27,10 +27,10 @@ Source0:    %{name}-base-0.tar.bz2
 # 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: 0d3123eb1b453ec0620822bd65be4c42
+# Source1-md5: 1e751e7e08f8b68530674f04619d894d
 #Source2Download: http://www.iana.org/time-zones/
 Source2:       ftp://ftp.iana.org/tz/releases/tzcode%{tzcode_ver}.tar.gz
-# Source2-md5: f5e0299925631da7cf82d8ce1205111d
+# Source2-md5: 2fe6986231db5182c61d565021a0cd7b
 Source3:       timezone.init
 Source4:       timezone.sysconfig
 Source5:       javazic.tar.gz
@@ -47,6 +47,7 @@ BuildRequires:        jpackage-utils
 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
@@ -73,11 +74,22 @@ This package contains timezone information for use by Java runtimes.
 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
@@ -207,7 +219,10 @@ 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
 
 %postun
@@ -242,14 +257,14 @@ fi
 
 %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
 %{systemdunitdir}/timezone.service
-
-%{_datadir}/zoneinfo
-%exclude %{_datadir}/zoneinfo/right
+%{_datadir}/zoneinfo/localtime
+%{_datadir}/zoneinfo/posixrules
+%{_datadir}/zoneinfo/posixtime
 
 %if %{with java}
 %files -n java-tzdata
@@ -257,6 +272,14 @@ fi
 %{_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