Accepting request 1148898 from Java:packages

rpm 4.20 compat

OBS-URL: https://build.opensuse.org/request/show/1148898
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mchange-commons?expand=0&rev=8

mchange-commons.changes

@@ -1,10 +1,3 @@
--------------------------------------------------------------------
-Wed Sep 25 07:06:57 UTC 2024 - Fridrich Strba <fstrba@suse.com>
-
-- Use SOURCE_DATE_EPOCH for reproducible jar mtime
-- Remove the EL9 sections, since the %%add_maven_depmap macro
-  exist back in javapackages.
-
 -------------------------------------------------------------------
 Wed Feb 21 21:49:56 UTC 2024 - Fridrich Strba <fstrba@suse.com>
 

mchange-commons.spec

@@ -28,11 +28,14 @@ Source0:        %{URL}/archive/refs/tags/v%{version}.tar.gz#/%{git_tag}.tar.gz
 Patch0:         fix-javadoc-lint-errors.patch
 BuildRequires:  fdupes
 BuildRequires:  java-devel >= 1.8
-BuildRequires:  javapackages-local >= 6
+BuildRequires:  javapackages-local
 BuildRequires:  log4j >= 2.0
 BuildRequires:  slf4j
 BuildRequires:  typesafe-config >= 1.3.0
 BuildArch:      noarch
+%if 0%{?rhel} >= 9
+BuildRequires:  xmvn-tools
+%endif
 
 %description
 Originally part of c3p0, mchange-commons is a set of general purpose
@@ -56,34 +59,27 @@ find -name '*.jar' -delete
 export CLASS_PATH=$(build-classpath log4j log4j/log4j-{api,core} slf4j/slf4j-api typesafe-config)
 mkdir -p target/classes
 javac -d target/classes \
-%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
-    --release 8 \
-%else
-    -source 8 -target 8 \
-%endif
+  -source 8 -target 8 \
   -cp  "$CLASS_PATH" \
   $(find src/main/java -name \*.java | xargs)
 
-jar --create \
-%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 17}%{!?pkg_vcmp:0}
-    --date="$(date -u -d @${SOURCE_DATE_EPOCH:-$(date +%%s)} +%%Y-%%m-%%dT%%H:%%M:%%SZ)" \
-%endif
-    --file=target/%{git_tag}.jar -C target/classes .
-jar --update \
-%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 17}%{!?pkg_vcmp:0}
-    --date="$(date -u -d @${SOURCE_DATE_EPOCH:-$(date +%%s)} +%%Y-%%m-%%dT%%H:%%M:%%SZ)" \
-%endif
-    --file=target/%{git_tag}.jar -C src/main/resources .
-
+jar cf target/%{git_tag}.jar -C target/classes .
+jar uf target/%{git_tag}.jar -C src/main/resources .
+%if ! 0%{?rhel} >= 9
 mkdir -p target/api
 javadoc -d target/api -source 8 \
   -classpath "$CLASS_PATH" \
   -notimestamp \
   $(find src/main/java -name \*.java | xargs)
+%endif
 sed "s/@mchange-commons-java.version.maven@/%{version}/g" \
   src/main/maven/pom.xml > target/%{git_tag}.pom
+%{mvn_artifact} target/%{git_tag}.pom target/%{git_tag}.jar
 
 %install
+%if 0%{?rhel}
+%mvn_install
+%else
 # jar
 install -d -m 755 %{buildroot}%{_javadir}/%{name}
 install -pm 644 target/%{git_tag}.jar %{buildroot}%{_javadir}/%{name}/mchange-commons-java.jar
@@ -91,17 +87,22 @@ install -pm 644 target/%{git_tag}.jar %{buildroot}%{_javadir}/%{name}/mchange-co
 install -d -m 755 %{buildroot}%{_mavenpomdir}/%{name}
 %{mvn_install_pom} target/%{git_tag}.pom %{buildroot}%{_mavenpomdir}/%{name}/mchange-commons-java.pom
 %add_maven_depmap %{name}/mchange-commons-java.pom %{name}/mchange-commons-java.jar
+%endif
 
+%if ! 0%{?rhel} >= 9
 # javadoc
 mkdir -p %{buildroot}%{_javadocdir}
 cp -a target/api %{buildroot}%{_javadocdir}/%{name}
 %fdupes -s %{buildroot}%{_javadocdir}
+%endif
 
 %files -f .mfiles
 %license LICENSE*
 
+%if ! 0%{?rhel} >= 9
 %files javadoc
 %license LICENSE*
 %{_javadocdir}/%{name}
+%endif
 
 %changelog