From 535b1a3e0745c44e62ef980678063a7d57760189c9b534f6c63567a445a1154e Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Fri, 28 Dec 2018 23:09:37 +0000
Subject: [PATCH 1/4] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/apache-commons-logging?expand=0&rev=37

---
 apache-commons-logging.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec
index 2560c07..9119270 100644
--- a/apache-commons-logging.spec
+++ b/apache-commons-logging.spec
@@ -42,6 +42,7 @@ BuildRequires:  javapackages-tools
 BuildRequires:  junit
 BuildRequires:  log4j-mini >= 1.2
 BuildRequires:  servletapi5
+Requires:       apache-commons-parent
 Requires:       java >= 1.8
 Provides:       jakarta-%{short_name} = %{version}-%{release}
 Obsoletes:      jakarta-%{short_name} < %{version}

From 68e5779721b00410b1914b730f1693d80889c28d09396c3acf450eb02904b416 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Mon, 28 Jan 2019 12:47:02 +0000
Subject: [PATCH 2/4] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/apache-commons-logging?expand=0&rev=38

---
 apache-commons-logging.changes  |  7 ++++
 apache-commons-logging.spec     | 11 +++--
 commons-logging-manifests.patch | 73 +++++++++++++++++++++++++++++++++
 3 files changed, 87 insertions(+), 4 deletions(-)
 create mode 100644 commons-logging-manifests.patch

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 <fstrba@suse.com>
+
+- Added patch:
+  * commons-logging-manifests.patch
+    + Different Bundle-SymbolicName for different jars
+
 -------------------------------------------------------------------
 Fri Oct 19 20:35:40 UTC 2018 - Fridrich Strba <fstrba@suse.com>
 
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">
+     <tstamp/>
+     <copy  todir="${build.home}/conf" filtering="on">
+-      <fileset dir="${conf.home}" includes="*.MF"/>
+       <fileset dir="${conf.home}" includes="*.properties"/>
+     </copy>
++	<copy file="${conf.home}/MANIFEST.MF" toFile="${build.home}/conf/MANIFEST.MF" filtering="on">
++      <filterset>
++	    <filter token="bsn-extension" value=""/>
++      </filterset>
++	</copy>
++    <mkdir dir="${build.home}/conf/tests"/>
++	<copy file="${conf.home}/MANIFEST.MF" toFile="${build.home}/conf/tests/MANIFEST.MF" filtering="on">
++      <filterset>
++	    <filter token="bsn-extension" value=".tests"/>
++      </filterset>
++	</copy>
++    <mkdir dir="${build.home}/conf/api"/>
++	<copy file="${conf.home}/MANIFEST.MF" toFile="${build.home}/conf/api/MANIFEST.MF" filtering="on">
++      <filterset>
++	    <filter token="bsn-extension" value=".api"/>
++      </filterset>
++	</copy>
++    <mkdir dir="${build.home}/conf/adapters"/>
++	<copy file="${conf.home}/MANIFEST.MF" toFile="${build.home}/conf/adapters/MANIFEST.MF" filtering="on">
++      <filterset>
++	    <filter token="bsn-extension" value=".adapters"/>
++      </filterset>
++	</copy>
+   </target>
+ 
+   <target name="compile" depends="static,compile-only"
+@@ -478,7 +500,7 @@
+ 
+     <jar jarfile="${build.home}/${api.jar.name}"
+          basedir="${build.home}/classes"
+-         manifest="${build.home}/conf/MANIFEST.MF">
++         manifest="${build.home}/conf/api/MANIFEST.MF">
+       <include name="org/apache/commons/logging/*.class" />
+       <include name="org/apache/commons/logging/impl/LogFactoryImpl*.class" />
+       <include name="org/apache/commons/logging/impl/WeakHashtable*.class" />
+@@ -492,7 +514,7 @@
+ 
+     <jar jarfile="${build.home}/${adapters.jar.name}"
+          basedir="${build.home}/classes"
+-         manifest="${build.home}/conf/MANIFEST.MF">
++         manifest="${build.home}/conf/adapters/MANIFEST.MF">
+       <include name="org/apache/commons/logging/impl/**.class" />
+       <include name="META-INF/LICENSE.txt"/>
+       <include name="META-INF/NOTICE.txt"/>
+@@ -594,7 +616,7 @@
+     </copy>
+     <jar jarfile="${build.home}/commons-${component.name}-tests.jar"
+          basedir="${build.home}/tests"
+-        manifest="${build.home}/conf/MANIFEST.MF">
++        manifest="${build.home}/conf/tests/MANIFEST.MF">
+       <exclude name="org/apache/commons/logging/Wrapper.class"/>
+       <exclude name="org/apache/commons/logging/jdk14/TestHandler.class"
+                  if="jdk.1.4.present"/>
+--- 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

From fafb4f9338c4ec01be864d031b6ca77c977e109b961ca5563375a736ef607d0e Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Tue, 5 Feb 2019 12:33:17 +0000
Subject: [PATCH 3/4] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/apache-commons-logging?expand=0&rev=39

---
 apache-commons-logging.spec | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec
index 8c0ec09..a02a896 100644
--- a/apache-commons-logging.spec
+++ b/apache-commons-logging.spec
@@ -108,16 +108,9 @@ install -pm 644 tmp.pom %{buildroot}/%{_mavenpomdir}/%{short_name}-adapters-%{ve
 %add_maven_depmap %{short_name}-api-%{version}.pom %{short_name}-api.jar -a "org.apache.commons:%{short_name}-api","apache:%{short_name}-api"
 %add_maven_depmap %{short_name}-adapters-%{version}.pom %{short_name}-adapters.jar -a "org.apache.commons:%{short_name}-adapters","apache:%{short_name}-adapters"
 
-%files
-%defattr(0644,root,root,0755)
+%files -f .mfiles
+%{_javadir}/%{name}*.jar
 %license LICENSE.txt
 %doc PROPOSAL.html RELEASE-NOTES.txt NOTICE.txt
-%{_javadir}/*
-%{_mavenpomdir}/*
-%if %{defined _maven_repository}
-%{_mavendepmapfragdir}/%{name}
-%else
-%{_datadir}/maven-metadata/%{name}.xml*
-%endif
 
 %changelog

From 9c37da507f68b619215385b12275b51261f7dad04bb765b0f9fb29d9044b01e4 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Wed, 6 Feb 2019 06:47:27 +0000
Subject: [PATCH 4/4] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/apache-commons-logging?expand=0&rev=40

---
 apache-commons-logging.changes | 5 +++++
 apache-commons-logging.spec    | 9 +++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/apache-commons-logging.changes b/apache-commons-logging.changes
index 29f1579..e6a06ff 100644
--- a/apache-commons-logging.changes
+++ b/apache-commons-logging.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Feb  6 06:47:05 UTC 2019 - Fridrich Strba <fstrba@suse.com>
+
+- Build against glassfish-servlet-api
+
 -------------------------------------------------------------------
 Mon Jan 28 12:43:50 UTC 2019 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec
index a02a896..08b4582 100644
--- a/apache-commons-logging.spec
+++ b/apache-commons-logging.spec
@@ -37,12 +37,11 @@ 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:  javapackages-tools
 BuildRequires:  junit
 BuildRequires:  log4j-mini >= 1.2
-BuildRequires:  servletapi5
 Requires:       java >= 1.8
 Requires:       mvn(org.apache.commons:commons-parent:pom:)
 Provides:       jakarta-%{short_name} = %{version}-%{release}
@@ -81,8 +80,10 @@ export CLASSPATH=$(build-classpath \
                    plexus/ \
                    junit \
                   ):target/classes:target/test-classes
-ant -Dmaven.mode.offline=true -Dlog4j12.jar=%{_javadir}/log4j.jar dist \
-    -lib %{_javadir}
+ant \
+  -Dmaven.mode.offline=true -lib %{_javadir} \
+  -Dlog4j12.jar=%{_javadir}/log4j.jar -Dservletapi.jar=%{_javadir}/glassfish-servlet-api.jar \
+  dist
 
 %install
 # jars