[eclipse-mylyn-commons] - Add patch for org.eclipse.mylyn.commons.xmlrpc to use Import-Package header instead of Bundle-Re

[jerboaa]

commit aed43e39c189150f1a60e418e9c980819eb9f9ab
Author: Severin Gehwolf <sgehwolf at redhat.com>
Date:   Fri Apr 15 16:54:36 2011 -0400

    - Add patch for org.eclipse.mylyn.commons.xmlrpc to use
      Import-Package header instead of Bundle-Require.

 ...ommons-xmlrpc-import-package-manifest-fix.patch |   25 ++++++++++++++++++++
 eclipse-mylyn-commons.spec                         |   12 ++++++++-
 2 files changed, 35 insertions(+), 2 deletions(-)
---
diff --git a/eclipse-mylyn-commons-xmlrpc-import-package-manifest-fix.patch b/eclipse-mylyn-commons-xmlrpc-import-package-manifest-fix.patch
new file mode 100644
index 0000000..15941cf
--- /dev/null
+++ b/eclipse-mylyn-commons-xmlrpc-import-package-manifest-fix.patch
@@ -0,0 +1,25 @@
+### Eclipse Workspace Patch 1.0
+#P org.eclipse.mylyn.commons.xmlrpc
+Index: META-INF/MANIFEST.MF
+===================================================================
+RCS file: /cvsroot/mylyn/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.xmlrpc/META-INF/MANIFEST.MF,v
+retrieving revision 1.2
+diff -u -r1.2 MANIFEST.MF
+--- org.eclipse.mylyn.commons.xmlrpc/META-INF/MANIFEST.MF	26 Jun 2010 07:37:23 -0000	1.2
++++ org.eclipse.mylyn.commons.xmlrpc/META-INF/MANIFEST.MF	15 Apr 2011 20:21:43 -0000
+@@ -6,9 +6,13 @@
+ Bundle-Vendor: %Bundle-Vendor
+ Require-Bundle: org.eclipse.core.runtime,
+  org.eclipse.mylyn.commons.core;bundle-version="[3.0.0,4.0.0)",
+- org.eclipse.mylyn.commons.net;bundle-version="[3.0.0,4.0.0)",
+- org.apache.xmlrpc;bundle-version="[3.0.0,4.0.0)"
++ org.eclipse.mylyn.commons.net;bundle-version="[3.0.0,4.0.0)"
+ Bundle-ActivationPolicy: lazy
+ Export-Package: org.eclipse.mylyn.internal.commons.xmlrpc;x-internal:=true
+ Bundle-RequiredExecutionEnvironment: J2SE-1.5
+ Bundle-Localization: plugin
++Import-Package: org.apache.xmlrpc,
++ org.apache.xmlrpc.client,
++ org.apache.xmlrpc.serializer,
++ org.apache.xmlrpc.common,
++ org.apache.xmlrpc.util
diff --git a/eclipse-mylyn-commons.spec b/eclipse-mylyn-commons.spec
index 4f941e0..007e75b 100644
--- a/eclipse-mylyn-commons.spec
+++ b/eclipse-mylyn-commons.spec
@@ -7,7 +7,7 @@
 Name: eclipse-mylyn-commons
 Summary: Common libraries for Eclipse Mylyn
 Version: 3.5.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: EPL and ASL 2.0
 URL: http://www.eclipse.org/mylyn
 
@@ -19,6 +19,10 @@ Source1: fetch-eclipse-mylyn-commons.sh
 # https://bugzilla.redhat.com/show_bug.cgi?id=497126
 # is resolved.
 Patch0: %{name}-nosoap.patch
+# Not sure if this would be suitable for upstream?
+# It changes the Bundle-Require header to
+# Import-Package
+Patch1: %{name}-xmlrpc-import-package-manifest-fix.patch
 
 BuildArch: noarch
 
@@ -71,6 +75,7 @@ ln -s %{_javadir}/jaxme/jaxmeapi.jar
 popd
 
 %patch0
+%patch1
 
 %build
 %{eclipse_base}/buildscripts/pdebuild -f org.eclipse.mylyn.commons \
@@ -114,8 +119,11 @@ popd
 %doc org.eclipse.mylyn.commons-feature/epl-v10.html
 
 %changelog
+* Fri Apr 15 2011 Severin Gehwolf <sgehwolf at redhat.com> 3.5.0-2
+- Add patch for org.eclipse.mylyn.commons.xmlrpc to use
+  Import-Package header instead of Bundle-Require.
+
 * Wed Apr 13 2011 Severin Gehwolf <sgehwolf at redhat.com> 3.5.0-1
 - Introduce eclipse-mylyn-commons, since eclipse-mylyn will be
   broken up into several source RPMs starting with Mylyn 3.5.0
   release.
-