X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=tzdata.spec;h=9d257b4e9f9a779a308c78adc967c74303c6e77c;hb=050dc002c2f7fcfb916d37e5a4641cc04dc55fe3;hp=28819f233c6e3dbae011b97e16eb3d464d5043ff;hpb=b10cca7f56a5cf88f8d595a4fef45b7d3c5f84d9;p=packages%2Ftzdata.git

diff --git a/tzdata.spec b/tzdata.spec
index 28819f2..9d257b4 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -9,36 +9,20 @@
 %endif
 %endif
 
-%define		tzcode_ver	2015f
-%define		tzdata_ver	2015f
 Summary:	Timezone data
 Summary(pl.UTF-8):	Dane o strefach czasowych
 Name:		tzdata
-Version:	%{tzdata_ver}
+Version:	2020d
 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
-# a test suite. It is occasionally updated from glibc sources, and as
-# such is under LGPL v2+, but none of this ever gets to be part of
-# final zoneinfo files.
-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:	ftp://ftp.iana.org/tz/releases/%{name}%{tzdata_ver}.tar.gz
-# Source1-md5:	e3b82732d20e973e48af1c6f13df9a1d
-#Source2Download: http://www.iana.org/time-zones/
-Source2:	ftp://ftp.iana.org/tz/releases/tzcode%{tzcode_ver}.tar.gz
-# Source2-md5:	19578d432ba8b92f73406a17a9bc268d
+#Source0Download: https://www.iana.org/time-zones
+Source0:	https://www.iana.org/time-zones/repository/releases/tzdb-%{version}.tar.lz
+# Source0-md5:	06e1ef95398506c87d3224abfc6f59ff
 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
@@ -50,6 +34,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
@@ -76,11 +61,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
@@ -107,25 +103,9 @@ Header file for timezone database.
 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
+%setup -qn tzdb-%{version}
 
-%{__sed} -e "
-s|@objpfx@|`pwd`/obj/|
-s|@datadir@|%{_datadir}|
-s|@install_root@|$RPM_BUILD_ROOT|
-" 'Makeconfig.in' > Makeconfig
-
-grep -v tz-art.htm tzcode/tz-link.htm > tzcode/tz-link.html
+sed -i -e '/tz-art.html/d' tz-link.html
 
 %if %{with java}
 install -d javazic
@@ -148,24 +128,43 @@ cd -
 %endif
 
 %build
-%{__make}
+%{__make} \
+	CFLAGS="%{rpmcflags}" \
+	LDFLAGS="%{rpmldflags}" \
+	cc="%{__cc}"
 
 %if %{with java}
 cd javazic
 %javac -source 1.5 -target 1.5 -classpath . $(find -name '*.java')
-cd ../tzdata
-%java -classpath ../javazic/ rht.tools.javazic.Main -V %{version} \
-	-d ../zoneinfo/java \
-	africa antarctica asia australasia europe northamerica pacificnew \
-	southamerica backward etcetera factory systemv \
-	../javazic/tzdata_jdk/gmt ../javazic/tzdata_jdk/jdk11_backward
 cd ..
+
+%java -classpath javazic/ rht.tools.javazic.Main -V %{version} \
+	-d zoneinfo/java \
+	africa antarctica asia australasia europe northamerica \
+	southamerica backward etcetera factory \
+	javazic/tzdata_jdk/gmt javazic/tzdata_jdk/jdk11_backward
 %endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{/etc/{sysconfig,rc.d/init.d},%{_mandir}/man5,%{_includedir},%{systemdunitdir}}
-%{__make} install
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
+
+rm $RPM_BUILD_ROOT%{_bindir}/tzselect
+rm $RPM_BUILD_ROOT%{_bindir}/zdump
+rm $RPM_BUILD_ROOT%{_sbindir}/zic
+rm $RPM_BUILD_ROOT%{_mandir}/man3/newctime.3*
+rm $RPM_BUILD_ROOT%{_mandir}/man3/newtzset.3*
+rm $RPM_BUILD_ROOT%{_mandir}/man8/tzselect.8*
+rm $RPM_BUILD_ROOT%{_mandir}/man8/zdump.8*
+rm $RPM_BUILD_ROOT%{_mandir}/man8/zic.8*
+rm $RPM_BUILD_ROOT%{_prefix}/lib/libtz.a
+rm $RPM_BUILD_ROOT%{_datadir}/zoneinfo-posix
+rm $RPM_BUILD_ROOT%{_datadir}/zoneinfo/leapseconds
+rm $RPM_BUILD_ROOT%{_datadir}/zoneinfo/tzdata.zi
+rm $RPM_BUILD_ROOT%{_datadir}/zoneinfo/zone1970.tab
+mv $RPM_BUILD_ROOT%{_datadir}/zoneinfo-leaps $RPM_BUILD_ROOT%{_datadir}/zoneinfo/right
 
 %if %{with tests}
 # test needs to be ran after "make install", as it uses installed files
@@ -176,8 +175,6 @@ install -d $RPM_BUILD_ROOT{/etc/{sysconfig,rc.d/init.d},%{_mandir}/man5,%{_inclu
 : ====================TESTING END=====================
 %endif
 
-# glibc.spec didn't keep it. so won't here either.
-%{__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
@@ -186,17 +183,12 @@ ln -sf localtime $RPM_BUILD_ROOT%{_datadir}/zoneinfo/posixrules
 > $RPM_BUILD_ROOT/etc/localtime
 
 # header file
-cp -p tzcode/tzfile.h $RPM_BUILD_ROOT%{_includedir}/tzfile.h
-cp -p tzcode/tzfile.5 $RPM_BUILD_ROOT%{_mandir}/man5
+cp -p tzfile.h $RPM_BUILD_ROOT%{_includedir}/tzfile.h
+cp -p 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
@@ -208,16 +200,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
@@ -226,7 +219,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
@@ -246,21 +238,20 @@ 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)
-%doc tzcode/README tzcode/Theory tzcode/tz-link.html
+%doc README 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
@@ -268,12 +259,20 @@ 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
 
 %files devel
 %defattr(644,root,root,755)
-%doc tzcode/tzfile.5.txt
+%doc tzfile.5.txt
 %{_includedir}/tzfile.h
 %{_mandir}/man5/tzfile.5*