[aqute-bnd] Resurrection of bundled non-class files
by Jaromír Cápík
commit 2487622ca31e46353ca576f7ef3c8259dfde7a88
Author: Jaromir Capik <jcapik(a)redhat.com>
Date: Wed Oct 12 15:46:06 2011 +0200
Resurrection of bundled non-class files
aqute-bnd.spec | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/aqute-bnd.spec b/aqute-bnd.spec
index f8f729c..c8094db 100644
--- a/aqute-bnd.spec
+++ b/aqute-bnd.spec
@@ -30,7 +30,7 @@
Name: aqute-bnd
Version: 0.0.363
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: BND Tool
License: ASL 2.0
Group: Development/Tools
@@ -88,7 +88,9 @@ sed -i "s|import aQute.lib.filter.*;||g" src/main/java/aQute/bnd/make/ComponentD
sed -i "s|import aQute.lib.filter.*;||g" src/main/java/aQute/bnd/make/ServiceComponent.java
# remove bundled stuff
-rm -rf aQute
+for f in $(find aQute/ -type f -name "*.class"); do
+ rm -f $f
+done
# Convert CR+LF to LF
sed -i "s|\r||g" LICENSE
@@ -159,6 +161,9 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
%{_javadocdir}/%{name}
%changelog
+* Thu Sep 22 2011 Jaromir Capik <jcapik(a)redhat.com> - 0.0.363-3
+- Resurrection of bundled non-class files
+
* Thu Sep 22 2011 Jaromir Capik <jcapik(a)redhat.com> - 0.0.363-2
- Bundled classes removed
- jpackage-utils dependency added to the javadoc subpackage
12 years, 7 months
[maven-plugin-bundle] aqute-bndlib renamed to aqute-bnd
by Jaromír Cápík
commit 524865597f3108df3f6fff23ef1952490b4d7425
Author: Jaromir Capik <jcapik(a)redhat.com>
Date: Tue Oct 11 17:05:45 2011 +0200
aqute-bndlib renamed to aqute-bnd
maven-plugin-bundle.spec | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
---
diff --git a/maven-plugin-bundle.spec b/maven-plugin-bundle.spec
index 2ec3e9d..906b33a 100644
--- a/maven-plugin-bundle.spec
+++ b/maven-plugin-bundle.spec
@@ -1,13 +1,13 @@
Name: maven-plugin-bundle
Version: 2.0.0
-Release: 10%{?dist}
+Release: 11%{?dist}
Summary: Maven Bundle Plugin
Group: Development/Tools
License: ASL 2.0
URL: http://felix.apache.org
Source0: http://www.apache.org/dist/felix/maven-bundle-plugin-2.0.0-project.tar.gz
-BuildRequires: aqute-bndlib >= 0.0.363
+BuildRequires: aqute-bnd >= 0.0.363
BuildRequires: plexus-utils >= 1.4.5
BuildRequires: felix-osgi-obr
BuildRequires: kxml
@@ -24,7 +24,7 @@ BuildRequires: maven-surefire-plugin >= 2.3
BuildRequires: maven-surefire-provider-junit4 >= 2.3
BuildRequires: maven-doxia-sitetools
BuildRequires: felix-parent
-Requires: aqute-bndlib >= 0.0.363
+Requires: aqute-bnd >= 0.0.363
Requires: plexus-utils >= 1.4.5
Requires: felix-osgi-obr
Requires: kxml
@@ -55,6 +55,8 @@ API documentation for %{name}.
%prep
%setup -q -n maven-bundle-plugin-%{version}
+sed -i 's/<artifactId>bndlib/<artifactId>bnd/g' pom.xml
+
%build
mvn-rpmbuild install javadoc:javadoc
@@ -76,12 +78,6 @@ install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
rm -rf target/site/api*
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
%files
%{_javadir}/*
%{_mavenpomdir}/*
@@ -91,6 +87,9 @@ rm -rf target/site/api*
%{_javadocdir}/%{name}
%changelog
+* Tue Oct 17 2011 Jaromir Capik <jcapik(a)redhat.com> 2.0.0-11
+- aqute-bndlib renamed to aqute-bnd
+
* Fri Jun 17 2011 Alexander Kurtakov <akurtako(a)redhat.com> 2.0.0-10
- Do not depend on maven2.
12 years, 7 months