[maven-shared] aqute-bndlib renamed to aqute-bnd (fixing name conflict)

[Jaromír Cápík]

commit 5e0612465d9f680391ccb6bb1b9d26e767b07d1f
Author: Jaromir Capik <jcapik at redhat.com>
Date:   Wed Oct 12 18:55:56 2011 +0200

    aqute-bndlib renamed to aqute-bnd (fixing name conflict)

 maven-shared.spec |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/maven-shared.spec b/maven-shared.spec
index 4276fba..41a387a 100644
--- a/maven-shared.spec
+++ b/maven-shared.spec
@@ -66,7 +66,7 @@ Summary:        Maven Shared Components
 URL:            http://maven.apache.org/shared/
 Name:           maven-shared
 Version:        15
-Release:        18%{?dist}
+Release:        19%{?dist}
 License:        ASL 2.0
 Group:          Development/Libraries
 
@@ -114,7 +114,7 @@ BuildRequires:  modello
 BuildRequires:  easymock2
 BuildRequires:  objectweb-asm
 BuildRequires:  dom4j
-BuildRequires:  aqute-bndlib
+BuildRequires:  aqute-bnd
 BuildRequires:  maven-wagon
 BuildRequires:  maven-artifact-manager
 BuildRequires:  maven-project
@@ -133,7 +133,7 @@ Requires:       plexus-utils
 Requires:       plexus-digest
 Requires:       objectweb-asm
 Requires:       dom4j
-Requires:       aqute-bndlib
+Requires:       aqute-bnd
 Requires:       maven-wagon
 
 BuildArch:      noarch
@@ -160,7 +160,7 @@ Summary:        Maven OSGi
 Group:          Development/Libraries
 Version:        %{osgi_version}
 Requires:  %{name} = 0:%{shared_components_version}-%{release}
-Requires:  aqute-bndlib
+Requires:  aqute-bnd
 Requires:  maven-project
 
 %description osgi
@@ -395,6 +395,9 @@ chmod -R go=u-w *
 %patch2 -p1
 %patch3 -p1
 
+# Fix aqute-bnd dependency
+sed -i "s|<artifactId>bndlib|<artifactId>bnd|g" maven-osgi/pom.xml
+
 # need namespace for new version modello
 sed -i "s|<model>|<model xmlns=\"http://modello.codehaus.org/MODELLO/1.3.0\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://modello.codehaus.org/MODELLO/1.3.0 http://modello.codehaus.org/xsd/modello-1.3.0.xsd\" xml.namespace=\"..\" xml.schemaLocation=\"..\" xsd.namespace=\"..\" xsd.targetNamespace=\"..\">|" file-management/src/main/mdo/fileset.mdo
 
@@ -623,6 +626,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 %{_javadocdir}/%{name}
 
 %changelog
+* Wed Oct 12 2011 Jaromir Capik <jcapik at redhat.com> - 15-19
+- aqute-bndlib renamed to aqute-bnd (fixing name conflict)
+
 * Wed Aug 31 2011 Stanislav Ochotnicky <sochotnicky at redhat.com> - 15-18
 - Remove filtering subpackage (separate package now)