Hello community,
here is the log from the commit of package apache-commons-logging for
openSUSE:Factory checked in at 2019-03-28 22:45:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/apache-commons-logging (Old)
and /work/SRC/openSUSE:Factory/.apache-commons-logging.new.25356 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apache-commons-logging"
Thu Mar 28 22:45:24 2019 rev:20 rq:689052 version:1.2
Changes:
--------
---
/work/SRC/openSUSE:Factory/apache-commons-logging/apache-commons-logging.changes
2019-02-06 15:47:56.159240353 +0100
+++
/work/SRC/openSUSE:Factory/.apache-commons-logging.new.25356/apache-commons-logging.changes
2019-03-28 22:45:27.739086123 +0100
@@ -1,0 +2,8 @@
+Mon Mar 25 17:45:27 UTC 2019 - Fridrich Strba <[email protected]>
+
+- Remove pom parent, since we don't use it when not building with
+ maven
+- Use the pom.xml distributed with the package instead of
+ downloading the same file as a separate source
+
+-------------------------------------------------------------------
Old:
----
commons-logging-1.2.pom
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ apache-commons-logging.spec ++++++
--- /var/tmp/diff_new_pack.XFgkzw/_old 2019-03-28 22:45:28.327086034 +0100
+++ /var/tmp/diff_new_pack.XFgkzw/_new 2019-03-28 22:45:28.331086034 +0100
@@ -29,21 +29,18 @@
Source0:
http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
Source1:
http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz.asc
Source2: apache-commons-logging.keyring
-Source3:
http://central.maven.org/maven2/%{short_name}/%{short_name}/%{version}/%{short_name}-%{version}.pom
Source4:
http://central.maven.org/maven2/%{short_name}/%{short_name}-api/1.1/%{short_name}-api-1.1.pom
Patch0: commons-logging-1.1.3-src-junit.diff
Patch1: commons-logging-1.2-sourcetarget.patch
Patch2: commons-logging-manifests.patch
BuildRequires: ant
BuildRequires: ant-junit
-BuildRequires: apache-commons-parent
BuildRequires: glassfish-servlet-api
BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local
BuildRequires: junit
BuildRequires: log4j-mini >= 1.2
Requires: java >= 1.8
-Requires: mvn(org.apache.commons:commons-parent:pom:)
Provides: jakarta-%{short_name} = %{version}-%{release}
Obsoletes: jakarta-%{short_name} < %{version}
Provides: %{short_name} = %{version}-%{release}
@@ -72,6 +69,8 @@
#FIXME
rm ./src/test/java/org/apache/commons/logging/servlet/BasicServletTestCase.java
+%pom_remove_parent .
+
%build
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mkdir -p $MAVEN_REPO_LOCAL
@@ -100,7 +99,7 @@
# pom
install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 %{SOURCE3}
%{buildroot}/%{_mavenpomdir}/%{short_name}-%{version}.pom
+install -pm 644 pom.xml
%{buildroot}/%{_mavenpomdir}/%{short_name}-%{version}.pom
sed 's#<version>1.1</version>#<version>1.2</version>#g' < %{SOURCE4} > tmp.pom
install -pm 644 tmp.pom
%{buildroot}/%{_mavenpomdir}/%{short_name}-api-%{version}.pom
sed -e 's#<version>1.1</version>#<version>1.2</version>#g' -e
"s#%{short_name}-api#%{short_name}-adapters#g" < %{SOURCE4} > tmp.pom
