- versioned Obsoletes

[packages/tzdata.git] / tzdata.spec

diff --git a/tzdata.spec b/tzdata.spec
index 6c6235e002158e4fd7b855bb0ebdc9ac0c8674dd..e74973503dea76341b8a7852222d3896451a39c2 100644 (file)
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -15,16 +15,20 @@
 %endif
 %endif
 
+%if %{with java}
+%{?use_default_jdk}
+%endif
+
 Summary:       Timezone data
 Summary(pl.UTF-8):     Dane o strefach czasowych
 Name:          tzdata
-Version:       2022f
+Version:       2024a
 Release:       1
 License:       Public Domain (database), BSD/LGPL v2.1+ (code/test suite)
 Group:         Base
 #Source0Download: https://www.iana.org/time-zones
 Source0:       https://www.iana.org/time-zones/repository/releases/tzdb-%{version}.tar.lz
-# Source0-md5: 3d5a27bdd7e2807460c17accae585f1a
+# Source0-md5: 8e21c859fffa2839f5f8cdec3000b64e
 Source3:       timezone.init
 Source4:       timezone.sysconfig
 Source5:       javazic.tar.gz
@@ -35,9 +39,9 @@ Patch2:               install.patch
 URL:           http://www.twinsun.com/tz/tz-link.htm
 BuildRequires: lzip
 BuildRequires: rpm >= 4.4.9-56
-BuildRequires: rpmbuild(macros) >= 1.623
+BuildRequires: rpmbuild(macros) >= 2.021
 %if %{with java}
-BuildRequires: jdk
+%buildrequires_jdk
 BuildRequires: jpackage-utils
 BuildRequires: rpm-javaprov
 %endif
@@ -85,7 +89,7 @@ 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:         Base
-Obsoletes:     glibc-zoneinfo_right
+Obsoletes:     glibc-zoneinfo_right < 6:2.3.6-6
 
 %description zoneinfo_right
 You don't want this. Details at:
@@ -143,11 +147,11 @@ cd -
        CFLAGS="%{rpmcflags}" \
        LDFLAGS="%{rpmldflags}" \
        ZFLAGS="-b fat" \
-       cc="%{__cc}"
+       CC="%{__cc}"
 
 %if %{with java}
 cd javazic
-%javac -source 1.6 -target 1.6 -classpath . $(find -name '*.java')
+%javac -source 1.7 -target 1.7 -classpath . $(find -name '*.java')
 cd ..
 
 %java -classpath javazic/ rht.tools.javazic.Main -V %{version} \
@@ -176,7 +180,6 @@ install -d $RPM_BUILD_ROOT{/etc/{sysconfig,rc.d/init.d},%{_mandir}/man5,%{_inclu
 %{__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