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 2024-09-25 21:55:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mchange-commons (Old)
and /work/SRC/openSUSE:Factory/.mchange-commons.new.29891 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mchange-commons"
Wed Sep 25 21:55:02 2024 rev:9 rq:1203396 version:0.2.20
Changes:
--------
--- /work/SRC/openSUSE:Factory/mchange-commons/mchange-commons.changes
2024-02-22 20:58:50.091863089 +0100
+++
/work/SRC/openSUSE:Factory/.mchange-commons.new.29891/mchange-commons.changes
2024-09-25 21:55:47.562524403 +0200
@@ -1,0 +2,7 @@
+Wed Sep 25 07:06:57 UTC 2024 - Fridrich Strba <[email protected]>
+
+- Use SOURCE_DATE_EPOCH for reproducible jar mtime
+- Remove the EL9 sections, since the %%add_maven_depmap macro
+ exist back in javapackages.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mchange-commons.spec ++++++
--- /var/tmp/diff_new_pack.uyXtRO/_old 2024-09-25 21:55:48.018543371 +0200
+++ /var/tmp/diff_new_pack.uyXtRO/_new 2024-09-25 21:55:48.022543537 +0200
@@ -28,14 +28,11 @@
Patch0: fix-javadoc-lint-errors.patch
BuildRequires: fdupes
BuildRequires: java-devel >= 1.8
-BuildRequires: javapackages-local
+BuildRequires: javapackages-local >= 6
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
@@ -59,27 +56,34 @@
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
-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
+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 .
+
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
@@ -87,21 +91,16 @@
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
