diff --git a/apache-commons-logging.changes b/apache-commons-logging.changes index 6c992af..29f1579 100644 --- a/apache-commons-logging.changes +++ b/apache-commons-logging.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Jan 28 12:43:50 UTC 2019 - Fridrich Strba + +- Added patch: + * commons-logging-manifests.patch + + Different Bundle-SymbolicName for different jars + ------------------------------------------------------------------- Fri Oct 19 20:35:40 UTC 2018 - Fridrich Strba diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index 9119270..8c0ec09 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -1,7 +1,7 @@ # # spec file for package apache-commons-logging # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2000-2007, JPackage Project # # All modifications and additions to the file contributed by third parties @@ -25,7 +25,7 @@ Release: 0 Summary: Apache Commons Logging License: Apache-2.0 Group: Development/Libraries/Java -Url: http://commons.apache.org/%{base_name} +URL: http://commons.apache.org/%{base_name} 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 @@ -33,6 +33,7 @@ Source3: http://central.maven.org/maven2/%{short_name}/%{short_name}/%{ve 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 @@ -42,8 +43,8 @@ BuildRequires: javapackages-tools BuildRequires: junit BuildRequires: log4j-mini >= 1.2 BuildRequires: servletapi5 -Requires: apache-commons-parent 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} @@ -65,6 +66,7 @@ logging implementation. %setup -q -n %{short_name}-%{version}-src %patch0 -p1 %patch1 -p1 +%patch2 -p1 sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt @@ -108,7 +110,8 @@ install -pm 644 tmp.pom %{buildroot}/%{_mavenpomdir}/%{short_name}-adapters-%{ve %files %defattr(0644,root,root,0755) -%doc PROPOSAL.html LICENSE.txt RELEASE-NOTES.txt NOTICE.txt +%license LICENSE.txt +%doc PROPOSAL.html RELEASE-NOTES.txt NOTICE.txt %{_javadir}/* %{_mavenpomdir}/* %if %{defined _maven_repository} diff --git a/commons-logging-manifests.patch b/commons-logging-manifests.patch new file mode 100644 index 0000000..a7bda17 --- /dev/null +++ b/commons-logging-manifests.patch @@ -0,0 +1,73 @@ +--- commons-logging-1.2-src/build.xml 2014-07-05 20:11:36.000000000 +0200 ++++ commons-logging-1.2-src/build.xml 2019-01-28 13:41:46.362796232 +0100 +@@ -263,9 +263,31 @@ + description="Copy static files to build directory"> + + +- + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + ++ manifest="${build.home}/conf/api/MANIFEST.MF"> + + + +@@ -492,7 +514,7 @@ + + ++ manifest="${build.home}/conf/adapters/MANIFEST.MF"> + + + +@@ -594,7 +616,7 @@ + + ++ manifest="${build.home}/conf/tests/MANIFEST.MF"> + + +--- commons-logging-1.2-src/src/conf/MANIFEST.MF 2014-07-05 20:11:36.000000000 +0200 ++++ commons-logging-1.2-src/src/conf/MANIFEST.MF 2019-01-28 13:37:10.333359706 +0100 +@@ -6,7 +6,7 @@ + Implementation-Vendor-Id: org.apache + Specification-Title: Commons Logging + Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt +-Bundle-SymbolicName: org.apache.commons.logging ++Bundle-SymbolicName: org.apache.commons.logging@bsn-extension@ + X-Compile-Target-JDK: 1.2 + Implementation-Version: 1.2 + Specification-Vendor: The Apache Software Foundation