diff --git a/SPECS/tzdata.spec b/SPECS/tzdata.spec index 04840c4f..f0741bb5 100644 --- a/SPECS/tzdata.spec +++ b/SPECS/tzdata.spec @@ -9,41 +9,38 @@ Group: System Environment/Base URL: https://www.iana.org/time-zones Source0: ftp://ftp.iana.org/tz/releases/tzdata%{tzdata_version}.tar.gz Source1: ftp://ftp.iana.org/tz/releases/tzcode%{tzcode_version}.tar.gz - Patch002: 0002-Fix-have-snprintf.patch Patch003: 0003-continue-to-ship-posixrules.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gawk, glibc, perl BuildRequires: glibc-common >= 2.5.90-7 -BuildRequires: java-devel - +#BuildRequires: java-devel Conflicts: glibc-common <= 2.3.2-63 BuildArchitectures: noarch + %description This package contains data files with rules for various timezones around the world. -%package java -Summary: Timezone data for Java -Group: System Environment/Base -Source3: javazic.tar.gz -Source4: http://omajid.fedorapeople.org/javazic-1.8-37392f2f5d59.tar.xz -Patch100: javazic-fixup.patch -Patch101: rebase-01.patch -Patch102: rebase-02.patch -Patch103: 7090844.patch -Patch104: 7133138.patch -Patch105: 8051641.patch +#%package java +#Summary: Timezone data for Java +#Group: System Environment/Base +#Source3: javazic.tar.gz +#Source4: http://omajid.fedorapeople.org/javazic-1.8-37392f2f5d59.tar.xz +#Patch100: javazic-fixup.patch +#Patch101: rebase-01.patch +#Patch102: rebase-02.patch +#Patch103: 7090844.patch +#Patch104: 7133138.patch +#Patch105: 8051641.patch +#%description java +#This package contains timezone information for use by Java runtimes. -%description java -This package contains timezone information for use by Java runtimes. %prep %setup -q -c -a 1 - %patch002 -p1 %patch003 -p1 @@ -66,14 +63,14 @@ tar zxf tzdata%{version}-rearguard.tar.gz rm tzdata.zi make VERSION=%{version} DATAFORM=rearguard tzdata.zi -mkdir javazic -tar zxf %{SOURCE3} -C javazic -pushd javazic -%patch100 -%patch101 -%patch102 -%patch103 -%patch104 +#mkdir javazic +#tar zxf %{SOURCE3} -C javazic +#pushd javazic +#%patch100 +#%patch101 +#%patch102 +#%patch103 +#%patch104 # Hack alert! sun.tools may be defined and installed in the # VM. In order to guarantee that we are using IcedTea/OpenJDK @@ -81,14 +78,14 @@ pushd javazic # from "sun." to "rht.". Unfortunately, gcj does not support # any of the -Xclasspath options, so we must go this route # to ensure the greatest compatibility. -mv sun rht -find . -type f -name '*.java' -print0 \ - | xargs -0 -- sed -i -e 's:sun\.tools\.:rht.tools.:g' \ - -e 's:sun\.util\.:rht.util.:g' -popd +#mv sun rht +#find . -type f -name '*.java' -print0 \ +# | xargs -0 -- sed -i -e 's:sun\.tools\.:rht.tools.:g' \ +# -e 's:sun\.util\.:rht.util.:g' +#popd -tar xf %{SOURCE4} -%patch105 +#tar xf %{SOURCE4} +#%patch105 echo "%{name}%{tzdata_version}" >> VERSION @@ -103,35 +100,35 @@ 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 - +# # Java 6/7 tzdata -pushd javazic -javac -source 1.5 -target 1.5 -classpath . `find . -name \*.java` -popd - -java -classpath javazic/ rht.tools.javazic.Main -V %{version} \ - -d javazi \ - $FILES javazic/tzdata_jdk/gmt javazic/tzdata_jdk/jdk11_backward +#pushd javazic +#javac -source 1.5 -target 1.5 -classpath . `find . -name \*.java` +#popd +# +#java -classpath javazic/ rht.tools.javazic.Main -V %{version} \ +# -d javazi \ +# $FILES javazic/tzdata_jdk/gmt javazic/tzdata_jdk/jdk11_backward # Java 8 tzdata -pushd javazic-1.8 -javac -source 1.7 -target 1.7 -classpath . `find . -name \*.java` -popd - -java -classpath javazic-1.8 build.tools.tzdb.TzdbZoneRulesCompiler \ - -srcdir . -dstfile tzdb.dat \ - -verbose \ - $FILES javazic-1.8/tzdata_jdk/gmt javazic-1.8/tzdata_jdk/jdk11_backward +#pushd javazic-1.8 +#javac -source 1.7 -target 1.7 -classpath . `find . -name \*.java` +#popd +# +#java -classpath javazic-1.8 build.tools.tzdb.TzdbZoneRulesCompiler \ +# -srcdir . -dstfile tzdb.dat \ +# -verbose \ +# $FILES javazic-1.8/tzdata_jdk/gmt javazic-1.8/tzdata_jdk/jdk11_backward %install rm -fr $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{_datadir} cp -prd zoneinfo $RPM_BUILD_ROOT%{_datadir} install -p -m 644 zone.tab zone1970.tab iso3166.tab leapseconds tzdata.zi $RPM_BUILD_ROOT%{_datadir}/zoneinfo -cp -prd javazi $RPM_BUILD_ROOT%{_datadir}/javazi +#cp -prd javazi $RPM_BUILD_ROOT%{_datadir}/javazi -mkdir -p $RPM_BUILD_ROOT%{_datadir}/javazi-1.8 -install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ +#mkdir -p $RPM_BUILD_ROOT%{_datadir}/javazi-1.8 +#install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %clean rm -rf $RPM_BUILD_ROOT @@ -144,10 +141,10 @@ rm -rf $RPM_BUILD_ROOT %doc tz-link.html %doc tz-art.html -%files java -%defattr(-,root,root) -%{_datadir}/javazi -%{_datadir}/javazi-1.8 +#%files java +#%defattr(-,root,root) +#%{_datadir}/javazi +#%{_datadir}/javazi-1.8 %changelog * Sun Jan 24 2021 Patsy Griffin - 2021a-1