Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package mchange-commons for openSUSE:Factory
checked in at 2022-04-20 16:54:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mchange-commons (Old)
and /work/SRC/openSUSE:Factory/.mchange-commons.new.1941 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mchange-commons"
Wed Apr 20 16:54:48 2022 rev:6 rq:970689 version:0.2.20
Changes:
--------
--- /work/SRC/openSUSE:Factory/mchange-commons/mchange-commons.changes
2022-03-29 19:45:38.456136953 +0200
+++
/work/SRC/openSUSE:Factory/.mchange-commons.new.1941/mchange-commons.changes
2022-04-20 16:54:52.070485052 +0200
@@ -1,0 +2,5 @@
+Thu Apr 14 13:32:58 UTC 2022 - Stefan Bluhm <stefan.bl...@clacee.eu>
+
+- Added EL9 build.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mchange-commons.spec ++++++
--- /var/tmp/diff_new_pack.tfzpIZ/_old 2022-04-20 16:54:52.658485601 +0200
+++ /var/tmp/diff_new_pack.tfzpIZ/_new 2022-04-20 16:54:52.662485605 +0200
@@ -32,6 +32,9 @@
BuildRequires: log4j >= 2.0
BuildRequires: slf4j
BuildRequires: typesafe-config >= 1.3.0
+%if 0%{?rhel} >= 9
+BuildRequires: xmvn-tools
+%endif
BuildArch: noarch
%description
@@ -62,17 +65,21 @@
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 \
-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
@@ -80,16 +87,21 @@
install -d -m 755 %{buildroot}%{_mavenpomdir}/%{name}
install -pm 644 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
