From a046e04f7e490a37f5179102d760d57a5914ee52 Mon Sep 17 00:00:00 2001
From: Jaromir Capik <jcapik@redhat.com>
Date: Thu, 19 Jan 2012 18:45:13 +0100
Subject: [PATCH] Bundled maven sources readded (they seem to change the
 behaviour)

---
 ...n-bundle-plugin-manageArtifactSystemPath.patch | 15 +++++++++++++++
 maven-plugin-bundle.spec                          | 13 +++++++++----
 2 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100644 maven-bundle-plugin-manageArtifactSystemPath.patch

diff --git a/maven-bundle-plugin-manageArtifactSystemPath.patch b/maven-bundle-plugin-manageArtifactSystemPath.patch
new file mode 100644
index 0000000..dffbe71
--- /dev/null
+++ b/maven-bundle-plugin-manageArtifactSystemPath.patch
@@ -0,0 +1,15 @@
+diff -Naur maven-bundle-plugin-2.3.6.orig/src/main/java/org/apache/maven/shared/dependency/tree/DependencyTreeResolutionListener.java maven-bundle-plugin-2.3.6/src/main/java/org/apache/maven/shared/dependency/tree/DependencyTreeResolutionListener.java
+--- maven-bundle-plugin-2.3.6.orig/src/main/java/org/apache/maven/shared/dependency/tree/DependencyTreeResolutionListener.java	2011-11-28 18:19:31.000000000 +0100
++++ maven-bundle-plugin-2.3.6/src/main/java/org/apache/maven/shared/dependency/tree/DependencyTreeResolutionListener.java	2012-01-19 18:25:28.684576614 +0100
+@@ -575,4 +575,11 @@
+     {
+         return artifact.getDependencyConflictId() + ":" + artifact.getVersionRange();
+     }
++
++
++    public void manageArtifactSystemPath( Artifact artifact, Artifact replacement )
++    {
++        throw new UnsupportedOperationException();
++    }
++
+ }
diff --git a/maven-plugin-bundle.spec b/maven-plugin-bundle.spec
index a582ee9..d88b4ce 100644
--- a/maven-plugin-bundle.spec
+++ b/maven-plugin-bundle.spec
@@ -2,7 +2,7 @@
 
 Name:           maven-plugin-bundle
 Version:        2.3.6
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Maven Bundle Plugin
 
 Group:          Development/Tools
@@ -10,8 +10,9 @@ License:        ASL 2.0
 URL:            http://felix.apache.org
 Source0:        http://apache.tradebit.com/pub/felix/%{site_name}-%{version}-source-release.tar.gz
 
-Patch0:         %{site_name}-unbundling.patch
+#Patch0:         %{site_name}-unbundling.patch
 Patch1:         %{site_name}-unreported-exception.patch
+Patch2:         %{site_name}-manageArtifactSystemPath.patch
 
 BuildRequires: aqute-bndlib >= 1.50.0
 BuildRequires: plexus-utils >= 1.4.5
@@ -66,11 +67,12 @@ API documentation for %{name}.
 %prep
 %setup -q -n %{site_name}-%{version}
 
-%patch0 -p1
+#%%patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 # remove bundled stuff
-rm -rf src/main/java/org/apache/maven
+#rm -rf src/main/java/org/apache/maven
 
 %build
 # tests can't be built (seems like a MavenProjectStub incompatibility with MavenProject)
@@ -103,6 +105,9 @@ rm -rf target/site/api*
 %{_javadocdir}/%{name}
 
 %changelog
+* Thu Jan 19 2012 Jaromir Capik <jcapik@redhat.com> 2.3.6-3
+- Bundled maven sources readded (they seem to change the behaviour)
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild