Update to build without base-0

NOTE: the overlapping readme/license files from tzdata/tzcode are identical

Also, note the GMT files are now 0 byte:

  2020a.old/usr/share/zoneinfo/Greenwich
  2020a.new/usr/share/zoneinfo/Greenwich

But as zdump behaves identical, the change is probably okay:

$ zdump -v 2020a.old/Greenwich
2020a.old/Greenwich  -9223372036854775808 = NULL
2020a.old/Greenwich  -9223372036854689408 = NULL
2020a.old/Greenwich  9223372036854689407 = NULL
2020a.old/Greenwich  9223372036854775807 = NULL

$ zdump -v 2020a.new/Greenwich
2020a.new/Greenwich  -9223372036854775808 = NULL
2020a.new/Greenwich  -9223372036854689408 = NULL
2020a.new/Greenwich  9223372036854689407 = NULL
2020a.new/Greenwich  9223372036854775807 = NULL

diff --git a/tzdata-test-update.patch b/tzdata-test-update.patch
deleted file mode 100644 (file)
index 15ea3c7..0000000
--- a/tzdata-test-update.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- tzdata-2017c/src/tst-timezone.c.orig       2006-02-09 14:14:05.000000000 +0100
-+++ tzdata-2017c/src/tst-timezone.c    2014-09-01 16:24:15.469740453 +0200
-@@ -39,7 +39,7 @@
-   { "Europe/Berlin", 1, -3600, { "CET", "CEST" }},
-   { "Europe/London", 1, 0, { "GMT", "BST" }},
-   { "Universal", 0, 0, {"UTC", "UTC" }},
--  { "Australia/Melbourne", 1, -36000, { "EST", "EST" }},
--  { "America/Sao_Paulo", 1, 10800, {"BRT", "BRST" }},
-+  { "Australia/Melbourne", 1, -36000, { "AEST", "AEDT" }},
-+  { "America/Sao_Paulo", 1, 10800, {"-03", "-02" }},
-   { "America/Chicago", 1, 21600, {"CST", "CDT" }},
-   { "America/Indiana/Indianapolis", 1, 18000, {"EST", "EDT" }},

diff --git a/tzdata.spec b/tzdata.spec
index 50e4eced5ba03a1ddc65181e159699ca5afde400..288cc23f805bf7cbb4a84b4ff8a3be3a6b5b9237 100644 (file)
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -18,12 +18,6 @@ Version:     %{tzdata_ver}
 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
@@ -35,7 +29,6 @@ Source3:      timezone.init
 Source4:       timezone.sysconfig
 Source5:       javazic.tar.gz
 # Source5-md5: 6a3392cd5f1594d13c12c1a836ac8d91
-Patch0:                %{name}-test-update.patch
 Patch1:                javazic-fixup.patch
 Patch2:                install.patch
 URL:           http://www.twinsun.com/tz/tz-link.htm
@@ -116,25 +109,9 @@ Header file for timezone database.
 Plik nagłówkowy bazy danych stref czasowych.
 
 %prep
-%setup -qc
-mv tzdata/* .
-%patch0 -p1
+%setup -qcT -a1 -a2
 
-%{__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
-
-%{__sed} -e "
-s|@objpfx@|`pwd`/obj/|
-s|@datadir@|%{_datadir}|
-s|@install_root@|$RPM_BUILD_ROOT|
-" 'Makeconfig.in' > Makeconfig
-
-sed -i -e '/tz-art.html/d' tzcode/tz-link.html
+sed -i -e '/tz-art.html/d' tz-link.html
 
 %if %{with java}
 install -d javazic
@@ -157,24 +134,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 \
+cd ..
+
+%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 ..
+       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
@@ -185,8 +181,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
@@ -195,12 +189,11 @@ 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
-
 ln -s /dev/null $RPM_BUILD_ROOT%{systemdunitdir}/timezone.service
 
 %if %{with java}
@@ -257,7 +250,7 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc tzcode/README 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
@@ -286,6 +279,6 @@ fi
 
 %files devel
 %defattr(644,root,root,755)
-%doc tzcode/tzfile.5.txt
+%doc tzfile.5.txt
 %{_includedir}/tzfile.h
 %{_mandir}/man5/tzfile.5*