X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=tzdata.spec;h=9d257b4e9f9a779a308c78adc967c74303c6e77c;hb=050dc002c2f7fcfb916d37e5a4641cc04dc55fe3;hp=cde264d11955a2c0265666e177e09f873d9edd46;hpb=892193c18b5d3cb686aa0e95b4a532e46b5f2084;p=packages%2Ftzdata.git diff --git a/tzdata.spec b/tzdata.spec index cde264d..9d257b4 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,41 +1,43 @@ # # Conditional build %bcond_without tests # make check -%bcond_with java # build java subpackage +%bcond_without java # build java subpackage + +%if "%{pld_release}" == "ac" +%ifnarch i586 i686 pentium3 pentium4 athlon %{x8664} +%undefine with_java +%endif +%endif -%define tzcode_ver 2010n -%define tzdata_ver 2010n Summary: Timezone data Summary(pl.UTF-8): Dane o strefach czasowych Name: tzdata -Version: %{tzdata_ver} -Release: 0.1 +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 -Source1: ftp://elsie.nci.nih.gov/pub/%{name}%{tzdata_ver}.tar.gz -# Source1-md5: b5eefb4986866895ab84f52220f1dfa6 -Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_ver}.tar.gz -# Source2-md5: a7a776a5713831993e814fe0c05f9fd5 +#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 Patch1: javazic-fixup.patch +Patch2: install.patch URL: http://www.twinsun.com/tz/tz-link.htm -BuildRequires: rpmbuild(macros) >= 1.300 +BuildRequires: rpm >= 4.4.9-56 +BuildRequires: rpmbuild(macros) >= 1.623 %if %{with java} +BuildRequires: jdk BuildRequires: jpackage-utils BuildRequires: rpm-javaprov %endif -Requires(post,preun): /sbin/chkconfig +Requires(post,preun,postun): systemd-units >= 38 +Requires: %{name}-zoneinfo = %{version}-%{release} Requires: /sbin/chkconfig -Requires: rc-scripts >= 0.4.1.4 +Requires: rc-scripts >= 0.4.3.0 +Requires: systemd-units >= 38 BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -47,23 +49,34 @@ around the world. Ten pakiet zawiera pliki z danymi na temat reguł stref czasowych na całym świecie. -%package java +%package -n java-tzdata Summary: Timezone data for Java Summary(pl.UTF-8): Dane stref czasowych dla Javy Group: Base -%description java +%description -n java-tzdata This package contains timezone information for use by Java runtimes. -%description java -l pl.UTF-8 +%description -n java-tzdata -l pl.UTF-8 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 @@ -90,19 +103,9 @@ Header file for timezone database. Plik nagłówkowy bazy danych stref czasowych. %prep -%setup -qc -mv tzdata/* . -%{__tar} xzf %{SOURCE1} -C tzdata -mkdir tzcode -%{__tar} xzf %{SOURCE2} -C tzcode - -sed -e " -s|@objpfx@|`pwd`/obj/| -s|@datadir@|%{_datadir}| -s|@install_root@|$RPM_BUILD_ROOT| -" 'Makeconfig.in' > Makeconfig +%setup -qn tzdb-%{version} -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 @@ -125,40 +128,53 @@ 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 solar87 solar88 solar89 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} -install -d $RPM_BUILD_ROOT%{_includedir} -install -d $RPM_BUILD_ROOT%{_mandir}/man5 - -%{__make} install +install -d $RPM_BUILD_ROOT{/etc/{sysconfig,rc.d/init.d},%{_mandir}/man5,%{_includedir},%{systemdunitdir}} +%{__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 : ====================TESTING========================= %{__make} check \ CC="%{__cc}" \ CFLAGS="%{rpmcflags} %{rpmldflags}" -TZDIR=$(pwd)/obj ./obj/test-tz -TZDIR=$(pwd)/obj ./obj/tst-timezone : ====================TESTING END===================== %endif -# glibc.spec didn't keep it. so won't here either. -rm -rf $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 @@ -167,11 +183,12 @@ ln -sf localtime $RPM_BUILD_ROOT%{_datadir}/zoneinfo/posixrules > $RPM_BUILD_ROOT/etc/localtime # header file -cp -a tzcode/tzfile.h $RPM_BUILD_ROOT%{_includedir}/tzfile.h -cp -a 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 -a %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/timezone +cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/timezone +ln -s /dev/null $RPM_BUILD_ROOT%{systemdunitdir}/timezone.service %if %{with java} cp -a zoneinfo/java $RPM_BUILD_ROOT%{_datadir}/javazi @@ -189,12 +206,16 @@ if [ "$1" = "0" ]; then /sbin/chkconfig --del timezone # save for postun - cp -f /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 if [ "$1" = "0" ]; then if [ ! -f /etc/localtime -a -f /etc/localtime.rpmsave ]; then + echo >&2 "Preserving /etc/localtime" mv -f /etc/localtime{.rpmsave,} fi fi @@ -217,28 +238,41 @@ if ! grep -q '^TIMEZONE=' /etc/sysconfig/timezone; then %service timezone restart fi +%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 - -%{_datadir}/zoneinfo -%exclude %{_datadir}/zoneinfo/right +%{systemdunitdir}/timezone.service +%{_datadir}/zoneinfo/localtime +%{_datadir}/zoneinfo/posixrules +%{_datadir}/zoneinfo/posixtime %if %{with java} -%files java +%files -n java-tzdata %defattr(644,root,root,755) %{_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*