rpms/tzdata
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Switch back to using system zic

Browse Source
This commit is contained in:
Petr Machata 2012-11-05 21:25:39 +01:00
parent d0ea9fcb8d
commit 8bac75d575
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
tzdata.spec
View File

@ -3,7 +3,7 @@ Name: tzdata
Version: 2012h
%define tzdata_version 2012h
%define tzcode_version 2012h
Release: 1%{?dist}
Release: 2%{?dist}
License: Public Domain
Group: System Environment/Base
URL: https://www.iana.org/time-zones
@ -33,7 +33,6 @@ Patch101: javazic-exclusion-fix.patch
%description java
This package contains timezone information for use by Java runtimes.
%prep
%setup -q -c -a 1
@ -59,9 +58,14 @@ find . -type f -name '*.java' -print0 \
popd
%build
make TOPDIR=$RPM_BUILD_ROOT/usr \
TZDIR=$RPM_BUILD_ROOT/usr/share/zoneinfo \
all
FILES="africa antarctica asia australasia europe northamerica southamerica
pacificnew etcetera backward solar87 solar88 solar89"
mkdir zoneinfo/{,posix,right}
zic -y ./yearistype -d zoneinfo -L /dev/null -p America/New_York $FILES
zic -y ./yearistype -d zoneinfo/posix -L /dev/null $FILES
zic -y ./yearistype -d zoneinfo/right -L leapseconds $FILES
grep -v tz-art.htm tz-link.htm > tz-link.html
pushd javazic
@ -69,21 +73,15 @@ javac -source 1.5 -target 1.5 -classpath . `find . -name \*.java`
popd
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
-d javazi \
$FILES javazic/tzdata_jdk/gmt javazic/tzdata_jdk/jdk11_backward
%install
rm -fr $RPM_BUILD_ROOT
make TOPDIR=$RPM_BUILD_ROOT/usr \
TZDIR=$RPM_BUILD_ROOT/usr/share/zoneinfo \
install
mv $RPM_BUILD_ROOT/usr/share/zoneinfo-posix $RPM_BUILD_ROOT/usr/share/zoneinfo/posix
mv $RPM_BUILD_ROOT/usr/share/zoneinfo-leaps $RPM_BUILD_ROOT/usr/share/zoneinfo/right
rm -f $RPM_BUILD_ROOT/usr/share/zoneinfo/localtime
rm -Rf $RPM_BUILD_ROOT/usr/{etc,lib,man}
cp -pr zoneinfo/java $RPM_BUILD_ROOT%{_datadir}/javazi
install -d $RPM_BUILD_ROOT%{_datadir}
cp -pr zoneinfo $RPM_BUILD_ROOT%{_datadir}
install -p -m 644 -t $RPM_BUILD_ROOT%{_datadir}/zoneinfo zone.tab iso3166.tab
cp -pr javazi $RPM_BUILD_ROOT%{_datadir}/javazi
%clean
rm -rf $RPM_BUILD_ROOT
@ -100,6 +98,11 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/javazi
%changelog
* Mon Nov 5 2012 Petr Machata <pmachata@redhat.com> - 2012h-2
- Switch back to using system zic, ignore upstream Makefile at all.
We do so for java anyway.
- Drop Factory from distribution
* Wed Oct 31 2012 Petr Machata <pmachata@redhat.com> - 2012h-1
- Upstream 2012h
- Brazilian state Bahia no longer has DST.