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

fix-javadoc-lint-errors.patch

@@ -0,0 +1,16 @@
+Index: mchange-commons-java-0.2.20/src/main/java/com/mchange/util/ByteArrayComparator.java
+===================================================================
+--- mchange-commons-java-0.2.20.orig/src/main/java/com/mchange/util/ByteArrayComparator.java
++++ mchange-commons-java-0.2.20/src/main/java/com/mchange/util/ByteArrayComparator.java
+@@ -39,9 +39,9 @@ public interface ByteArrayComparator
+ {
+   /**
+    * Must return a value<PRE>
+-   *     less than 0    iff left < right
++   *     less than 0    iff left &lt; right
+    *     equal to 0     iff left = right
+-   *     greater than 0 iff left > right
++   *     greater than 0 iff left &gt; right
+    * </PRE>
+    */
+   public int compare(byte[] left, byte[] right);

mchange-commons.changes

@@ -1,3 +1,30 @@
+-------------------------------------------------------------------
+Wed Feb 21 21:49:56 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Use %patch -P N instead of deprecated %patchN.
+
+-------------------------------------------------------------------
+Thu Oct 26 06:17:48 UTC 2023 - Fridrich Strba <fstrba@suse.com>
+
+- Build with source and target levels 8
+
+-------------------------------------------------------------------
+Thu Apr 14 13:32:58 UTC 2022 - Stefan Bluhm <stefan.bluhm@clacee.eu>
+
+- Added EL9 build.
+
+-------------------------------------------------------------------
+Tue Mar 29 14:48:55 UTC 2022 - Michael Calmer <mc@suse.com>
+
+- Added patch:
+  * fix-javadoc-lint-errors.patch
+    + fix javadoc lint errors
+
+-------------------------------------------------------------------
+Tue Jul 27 15:53:36 UTC 2021 - Fridrich Strba <fstrba@suse.com>
+
+- Require log4j >= 2 for build
+
 -------------------------------------------------------------------
 Fri Apr 16 20:28:29 UTC 2021 - Ferdinand Thiessen <rpm@fthiessen.de>
 

mchange-commons.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package mchange-commons
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -21,17 +21,21 @@ Name:           mchange-commons
 Version:        0.2.20
 Release:        0
 Summary:        A collection of general purpose utilities for c3p0
-License:        LGPL-2.0-only OR EPL-1.0
+License:        EPL-1.0 OR LGPL-2.0-only
 Group:          Development/Libraries/Java
 URL:            https://github.com/swaldman/mchange-commons-java
 Source0:        %{URL}/archive/refs/tags/v%{version}.tar.gz#/%{git_tag}.tar.gz
+Patch0:         fix-javadoc-lint-errors.patch
 BuildRequires:  fdupes
-BuildRequires:  java-devel
+BuildRequires:  java-devel >= 1.8
 BuildRequires:  javapackages-local
-BuildRequires:  log4j
+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
@@ -46,6 +50,7 @@ Group:          Documentation/HTML
 
 %prep
 %setup -q -n %{git_tag}
+%patch -P 0 -p1
 
 find -name '*.class' -delete
 find -name '*.jar' -delete
@@ -54,41 +59,50 @@ 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 \
-  -source 7 -target 7 \
+  -source 8 -target 8 \
   -cp  "$CLASS_PATH" \
   $(find src/main/java -name \*.java | xargs)
 
 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 7 \
-  -cp  "$CLASS_PATH" \
-  -Xdoclint:none \
+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
 # pom
 install -d -m 755 %{buildroot}%{_mavenpomdir}/%{name}
-install -pm 644 target/%{git_tag}.pom %{buildroot}%{_mavenpomdir}/%{name}/mchange-commons-java.pom
+%{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