From ae445a7d0dbcd6632c843faec95105c4b35bca61 Mon Sep 17 00:00:00 2001
From: Automatic Build System <autodist@mambasoft.it>
Date: Fri, 5 Jan 2024 18:45:45 +0100
Subject: [PATCH] automatic version update by autodist [release
 2021e-1mamba;Sat Dec 25 2021]

---
 tzdata.spec | 57 +++++++++++++++++++++++++++--------------------------
 1 file changed, 29 insertions(+), 28 deletions(-)

diff --git a/tzdata.spec b/tzdata.spec
index c4bd56e..282893c 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,25 +1,15 @@
-%define        tzcode_version %{version}
-%define        with_openjdk   0
-%if %with_openjdk
 %define        javahome    %{_jvmdir}/jdk
-%define        buildopts   -source 1.5 -target 1.5
-%else
-%define        javahome    %{java_home}
-%define        buildopts   %{nil}
-%endif
 
 Name:          tzdata
-Version:       2020a
+Version:       2021e
 Release:       1mamba
 Summary:       timezone data
 Group:         System/Internationalization
 Vendor:        openmamba
 Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
-URL:           ftp://elsie.nci.nih.gov/pub/
-# wget ftp://distfiles.pld-linux.org/distfiles/by-md5/9/0/906a4c98cc5240f416524a256b039c42/tzdata-base-0.tar.bz2
+URL:           https://www.iana.org/time-zones
 Source0:       http://www.iana.org/time-zones/repository/releases/tzdata%{version}.tar.gz
-#Source1:       http://www.iana.org/time-zones/repository/releases/tzcode%{tzcode_version}.tar.gz
 # the sources are inside the package OpenJDK
 Source3:       javazic.tar.gz
 Patch0:        javazic-fixup.patch
@@ -33,13 +23,13 @@ BuildRequires: glibc
 BuildRequires: perl
 BuildRequires: timezone
 %if "%{stage1}" != "1"
-%if %with_openjdk
-BuildRequires: java-openjdk
-%else
-BuildRequires: java-gcj-compat
+BuildRequires: javapackages
 %endif
+%ifarch arm
+# Workaround for tzdata-java required by openjdk8 but package not built
+Provides:      tzdata-java
+Obsoletes:     tzdata-java < 2021e
 %endif
-BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 
 %description
 This package contains data files with rules for various timezones around the world.
@@ -73,36 +63,39 @@ find . -type f -name '*.java' -print0 \
 
 %build
 %if "%{stage1}" != "1"
+%ifnarch arm
 cd javazic
-%ifarch arm
-export LD_PRELOAD=%{_libdir}/libatomic.so.1
-%endif
+#%ifarch arm
+#export LD_PRELOAD=%{_libdir}/libatomic.so.1
+#%endif
 
-%{javahome}/bin/javac %{buildopts} -classpath . `find . -name \*.java`
+%{javahome}/bin/javac -classpath . `find . -name \*.java`
 cd ..
 %{javahome}/bin/java -classpath javazic/ rht.tools.javazic.Main -V %{version} \
   -d zoneinfo/java \
   africa antarctica asia australasia backward etcetera europe \
-  northamerica pacificnew southamerica systemv \
+  northamerica southamerica \
   javazic/tzdata_jdk/gmt javazic/tzdata_jdk/jdk11_backward
 %endif
+%endif
 
 %install
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 timezones=('africa' 'antarctica' 'asia' 'australasia'
            'europe' 'northamerica' 'southamerica'
-           'pacificnew' 'etcetera' 'backward'
-           'systemv' 'factory')
+           'etcetera' 'backward' 'factory')
 
-%{_sbindir}/zic -y ./yearistype -d %{buildroot}%{_datadir}/zoneinfo ${timezones[@]}
-%{_sbindir}/zic -y ./yearistype -d %{buildroot}%{_datadir}/zoneinfo/posix ${timezones[@]}
-%{_sbindir}/zic -y ./yearistype -d %{buildroot}%{_datadir}/zoneinfo/right -L leapseconds ${timezones[@]}
-%{_sbindir}/zic -y ./yearistype -d %{buildroot}%{_datadir}/zoneinfo -p America/New_York
+zic -y ./yearistype -d %{buildroot}%{_datadir}/zoneinfo ${timezones[@]}
+zic -y ./yearistype -d %{buildroot}%{_datadir}/zoneinfo/posix ${timezones[@]}
+zic -y ./yearistype -d %{buildroot}%{_datadir}/zoneinfo/right -L leapseconds ${timezones[@]}
+zic -y ./yearistype -d %{buildroot}%{_datadir}/zoneinfo -p America/New_York
 install -m444 -t %{buildroot}%{_datadir}/zoneinfo iso3166.tab zone.tab
 
 %if "%{stage1}" != "1"
+%ifnarch arm
 cp -pr zoneinfo/java %{buildroot}%{_datadir}/javazi
 %endif
+%endif
 
 # FIXME
 # *** Timezone: Asia/Tokyo, daylight is: 0 but should be: 1
@@ -116,12 +109,20 @@ cp -pr zoneinfo/java %{buildroot}%{_datadir}/javazi
 %{_datadir}/zoneinfo
 
 %if "%{stage1}" != "1"
+%ifnarch arm
 %files java
 %defattr(-,root,root)
 %{_datadir}/javazi
 %endif
+%endif
 
 %changelog
+* Sat Dec 25 2021 Automatic Build System <autodist@mambasoft.it> 2021e-1mamba
+- automatic version update by autodist
+
+* Sat May 15 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 2021a-1mamba
+- update to 2021a
+
 * Sun Apr 26 2020 Automatic Build System <autodist@mambasoft.it> 2020a-1mamba
 - automatic version update by autodist