Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package apache-commons-collections for
openSUSE:Factory checked in at 2022-05-05 23:07:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/apache-commons-collections (Old)
and /work/SRC/openSUSE:Factory/.apache-commons-collections.new.1538 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apache-commons-collections"
Thu May 5 23:07:36 2022 rev:15 rq:975242 version:3.2.2
Changes:
--------
---
/work/SRC/openSUSE:Factory/apache-commons-collections/apache-commons-collections.changes
2019-03-28 22:45:07.443088895 +0100
+++
/work/SRC/openSUSE:Factory/.apache-commons-collections.new.1538/apache-commons-collections.changes
2022-05-05 23:08:22.417705616 +0200
@@ -1,0 +2,7 @@
+Thu May 5 16:22:53 UTC 2022 - Fridrich Strba <[email protected]>
+
+- Do not use a dummy pom that only declares dependencies for the
+ testframework artifact
+- Clean up the spec file
+
+-------------------------------------------------------------------
Old:
----
commons-collections-testframework.pom
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ apache-commons-collections.spec ++++++
--- /var/tmp/diff_new_pack.b8pfs4/_old 2022-05-05 23:08:22.865706175 +0200
+++ /var/tmp/diff_new_pack.b8pfs4/_new 2022-05-05 23:08:22.869706180 +0200
@@ -1,7 +1,7 @@
#
# spec file for package apache-commons-collections
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -26,7 +26,6 @@
Group: Development/Libraries/Java
URL: http://commons.apache.org/commons-collections/
Source0:
http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
-Source1: commons-collections-testframework.pom
Patch0: jakarta-commons-collections-javadoc-nonet.patch
Patch1: commons-collections-3.2-build_xml.patch
# PATCH-FIX-UPSTREAM build with jdk8
@@ -69,7 +68,6 @@
%package testframework
Summary: Test framework for %{name}
Group: Development/Libraries/Java
-Requires: %{name} = %{version}-%{release}
%description testframework
%{summary}.
@@ -98,10 +96,6 @@
%patch4 -p1
%patch5 -p1
-# Substitute version into testframework pom
-cp -p %{SOURCE1} pom-testframework.xml
-sed -i 's/@VERSION@/%{version}/' pom-testframework.xml
-
%pom_remove_parent .
%build
@@ -114,15 +108,16 @@
%install
# jars
install -d -m 755 %{buildroot}%{_javadir}
-install -m 644 build/%{short_name}-%{version}.jar
%{buildroot}%{_javadir}/%{name}.jar
-install -m 644 build/%{short_name}-testframework-%{version}.jar
%{buildroot}%{_javadir}/%{name}-testframework.jar
-(cd %{buildroot}%{_javadir} && for jar in *; do ln -sf ${jar} `echo $jar| sed
"s|apache-||g"`; done)
+install -m 644 build/%{short_name}-%{version}.jar
%{buildroot}%{_javadir}/%{short_name}.jar
+ln -sf %{short_name}.jar %{buildroot}%{_javadir}/%{name}.jar
+install -m 644 build/%{short_name}-testframework-%{version}.jar
%{buildroot}%{_javadir}/%{short_name}-testframework.jar
+ln -sf %{short_name}-testframework.jar
%{buildroot}%{_javadir}/%{name}-testframework.jar
# poms
-install -Dpm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom
-install -Dpm 644 pom-testframework.xml
%{buildroot}%{_mavenpomdir}/JPP-%{short_name}-testframework.pom
-%add_maven_depmap JPP-%{short_name}.pom %{short_name}.jar -a
"org.apache.commons:%{short_name}"
-%add_maven_depmap JPP-%{short_name}-testframework.pom
%{short_name}-testframework.jar -f "testframework" -a
"org.apache.commons:%{short_name}-testframework"
+install -d -m 0755 %{buildroot}%{_mavenpomdir}
+install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}.pom
+%add_maven_depmap %{short_name}.pom %{short_name}.jar -a
"org.apache.commons:%{short_name}"
+%add_maven_depmap %{short_name}:%{short_name}-testframework:%{version}
%{short_name}-testframework.jar -f "testframework" -a
"org.apache.commons:%{short_name}-testframework"
# javadoc
install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
