From 2e60db3ac7c50f614a495a5364397bd5f90d0572 Mon Sep 17 00:00:00 2001
From: chengzihan2 <chengzihan1111@163.com>
Date: Tue, 1 Sep 2020 11:49:57 +0800
Subject: [PATCH] package init

---
 xmlrpc-client-addosgimanifest.patch | 28 +++++++++++++++++++++-------
 xmlrpc-common-addosgimanifest.patch | 18 ++++++++++++++++--
 xmlrpc-server-addosgimanifest.patch | 26 ++++++++++++++++++++------
 xmlrpc.spec                         | 12 +++---------
 4 files changed, 60 insertions(+), 24 deletions(-)

diff --git a/xmlrpc-client-addosgimanifest.patch b/xmlrpc-client-addosgimanifest.patch
index 437d78f..561dcf7 100644
--- a/xmlrpc-client-addosgimanifest.patch
+++ b/xmlrpc-client-addosgimanifest.patch
@@ -1,5 +1,16 @@
---- pom.xml.sav	2010-02-06 17:44:57.000000000 +0200
-+++ pom.xml	2010-09-29 09:27:06.194857352 +0300
+From 8c7892d2dbbe16f86d0ae34c585af60dab799336 Mon Sep 17 00:00:00 2001
+From: chengzihan2 <chengzihan1111@163.com>
+Date: Tue, 1 Sep 2020 11:29:54 +0800
+Subject: [PATCH] xmlrpm client addosgimanifest
+
+---
+ client/pom.xml | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/client/pom.xml b/client/pom.xml
+index e588657..cd1a13c 100644
+--- a/client/pom.xml
++++ b/client/pom.xml
 @@ -48,6 +48,17 @@
                <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
                <Implementation-Vendor>Apache Software Foundation</Implementation-Vendor>
@@ -10,11 +21,14 @@
 +              <Bundle-SymbolicName>org.apache.xmlrpc</Bundle-SymbolicName>
 +              <Bundle-Version>${project.version}</Bundle-Version>
 +              <Require-Bundle>org.apache.xmlrpc.common</Require-Bundle>
-+	      <Export-Package>org.apache.xmlrpc, org.apache.xmlrpc.client, org.apache.xmlrpc.client.util</Export-Package>
-+	      <Import-Package>javax.xml.namespace, javax.xml.parsers, org.apache.commons.httpclient, org.apache.commons.httpclient.auth, org.apache.commons.httpclient.methods, org.apache.commons.httpclient.params, org.apache.commons.logging, org.apache.ws.commons.serialize, org.apache.ws.commons.util, org.w3c.dom, org.xml.sax, org.xml.sax.helpers</Import-Package>
-+	      <Bundle-RequiredExecutionEnvironment>J2SE-1.4, CDC-1.0/Foundation-1.0, J2SE-1.3</Bundle-RequiredExecutionEnvironment>
-+	      <Eclipse-BuddyPolicy>dependent</Eclipse-BuddyPolicy>
-+	      <Bundle-Vendor>%Bundle-Vendor.0</Bundle-Vendor>
++              <Export-Package>org.apache.xmlrpc, org.apache.xmlrpc.client, org.apache.xmlrpc.client.util</Export-Package>
++              <Import-Package>javax.xml.namespace, javax.xml.parsers, org.apache.commons.httpclient, org.apache.commons.httpclient.auth, org.apache.commons.httpclient.methods, org.apache.commons.httpclient.params, org.apache.commons.logging, org.apache.ws.commons.serialize, org.apache.ws.commons.util, org.w3c.dom, org.xml.sax, org.xml.sax.helpers</Import-Package>
++              <Bundle-RequiredExecutionEnvironment>J2SE-1.4, CDC-1.0/Foundation-1.0, J2SE-1.3</Bundle-RequiredExecutionEnvironment>
++              <Eclipse-BuddyPolicy>dependent</Eclipse-BuddyPolicy>
++              <Bundle-Vendor>%Bundle-Vendor.0</Bundle-Vendor>
              </manifestEntries>
            </archive>
          </configuration>
+-- 
+2.23.0
+
diff --git a/xmlrpc-common-addosgimanifest.patch b/xmlrpc-common-addosgimanifest.patch
index 4d4aeca..9eebdb3 100644
--- a/xmlrpc-common-addosgimanifest.patch
+++ b/xmlrpc-common-addosgimanifest.patch
@@ -1,5 +1,16 @@
---- pom.xml.sav	2010-02-06 17:44:50.000000000 +0200
-+++ pom.xml	2010-09-29 09:30:38.857857644 +0300
+From c027d18eca72401496a418f225adffe6fa122554 Mon Sep 17 00:00:00 2001
+From: chengzihan2 <chengzihan1111@163.com>
+Date: Tue, 1 Sep 2020 11:42:50 +0800
+Subject: [PATCH] xmlrpc common addosgimanifest
+
+---
+ common/pom.xml | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/common/pom.xml b/common/pom.xml
+index 5058d50..9587af7 100644
+--- a/common/pom.xml
++++ b/common/pom.xml
 @@ -48,6 +48,16 @@
                <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
                <Implementation-Vendor>Apache Software Foundation</Implementation-Vendor>
@@ -17,3 +28,6 @@
              </manifestEntries>
            </archive>
          </configuration>
+-- 
+2.23.0
+
diff --git a/xmlrpc-server-addosgimanifest.patch b/xmlrpc-server-addosgimanifest.patch
index af54e20..fa4bd7c 100644
--- a/xmlrpc-server-addosgimanifest.patch
+++ b/xmlrpc-server-addosgimanifest.patch
@@ -1,15 +1,29 @@
---- pom.xml	2014-07-07 11:24:52.668887604 -0400
-+++ pom.xml.sav	2014-07-07 11:25:06.174916380 -0400
+From a10847e2a25cb8a11bbf9e1bdeba2fa887fa4b5c Mon Sep 17 00:00:00 2001
+From: chengzihan2 <chengzihan1111@163.com>
+Date: Tue, 1 Sep 2020 11:36:01 +0800
+Subject: [PATCH] xmlrpc server addosgimanifest
+
+---
+ server/pom.xml | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/server/pom.xml b/server/pom.xml
+index 01288c8..05a6230 100644
+--- a/server/pom.xml
++++ b/server/pom.xml
 @@ -48,6 +48,12 @@
                <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
                <Implementation-Vendor>Apache Software Foundation</Implementation-Vendor>
                <Implementation-Version>${project.version}</Implementation-Version>
-+	      <Bundle-ManifestVersion>1</Bundle-ManifestVersion>
++              <Bundle-ManifestVersion>1</Bundle-ManifestVersion>
 +              <Bundle-Name>%Bundle-Name</Bundle-Name>
 +              <Bundle-SymbolicName>org.apache.xmlrpc.server</Bundle-SymbolicName>
-+	      <Bundle-Version>${project.version}</Bundle-Version>
-+	      <Require-Bundle>org.apache.xmlrpc.common</Require-Bundle>
-+	      <Export-Package>org.apache.xmlrpc.server,org.apache.xmlrpc.webserver</Export-Package>
++              <Bundle-Version>${project.version}</Bundle-Version>
++              <Require-Bundle>org.apache.xmlrpc.common</Require-Bundle>
++              <Export-Package>org.apache.xmlrpc.server,org.apache.xmlrpc.webserver</Export-Package>
              </manifestEntries>
            </archive>
          </configuration>
+-- 
+2.23.0
+
diff --git a/xmlrpc.spec b/xmlrpc.spec
index b407c6e..c26b5b0 100644
--- a/xmlrpc.spec
+++ b/xmlrpc.spec
@@ -58,15 +58,9 @@ Provides:            %{name}3-server = 3.1.3-13
 %prep
 %setup -q -n apache-%{name}-%{version}-src
 %patch2 -p1
-pushd client
-%patch0 -b .sav
-popd
-pushd common
-%patch1 -b .sav
-popd
-pushd server
-%patch3 -b .sav
-popd
+%patch0 -p1
+%patch1 -p1
+%patch3 -p1
 %patch4 -p1
 %patch5 -p1
 sed -i 's/\r//' LICENSE.txt