commit 95794526ddefc931532dd4bf9c783a7d21823b17
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Wed Dec 15 21:25:33 2010 +0200
- BR/R felix-parent.
maven-plugin-bundle.spec | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/maven-plugin-bundle.spec b/maven-plugin-bundle.spec
index bc8ef14..13070c0 100644
--- a/maven-plugin-bundle.spec
+++ b/maven-plugin-bundle.spec
@@ -1,13 +1,12 @@
Name: maven-plugin-bundle
Version: 2.0.0
-Release: 5%{?dist}
+Release: 7 %{?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
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: aqute-bndlib >= 0.0.363
BuildRequires: plexus-utils >= 1.4.5
BuildRequires: felix-osgi-obr
@@ -23,6 +22,7 @@ BuildRequires: maven-resources-plugin
BuildRequires: maven-surefire-plugin >= 2.3
BuildRequires: maven-surefire-provider-junit >= 2.3
BuildRequires: maven-doxia-sitetools
+BuildRequires: felix-parent
Requires: aqute-bndlib >= 0.0.363
Requires: plexus-utils >= 1.4.5
Requires: felix-osgi-obr
@@ -33,6 +33,7 @@ Requires: maven-shared-dependency-tree
Requires: maven-wagon
Requires: plexus-archiver
Requires: plexus-containers-container-default
+Requires: felix-parent
BuildArch: noarch
@@ -45,6 +46,7 @@ resources and dependencies. Plus a zillion other features.
%package javadoc
Group: Documentation
Summary: Javadoc for %{name}
+Requires: jpackage-utils
%description javadoc
API documentation for %{name}.
@@ -66,8 +68,7 @@ rm -rf %{buildroot}
# jars
install -d -m 0755 %{buildroot}%{_javadir}
install -m 644 target/maven-bundle-plugin-%{version}.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+ $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
%add_to_maven_depmap org.apache.felix maven-bundle-plugin %{version} JPP %{name}
@@ -78,8 +79,7 @@ install -pm 644 pom.xml \
# javadoc
install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
-ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
rm -rf target/site/api*
%post
@@ -88,9 +88,6 @@ rm -rf target/site/api*
%postun
%update_maven_depmap
-%clean
-%{__rm} -rf %{buildroot}
-
%files
%defattr(-,root,root,-)
%{_javadir}/*
@@ -103,6 +100,9 @@ rm -rf target/site/api*
%{_javadocdir}/%{name}
%changelog
+* Wed Dec 15 2010 Alexander Kurtakov <akurtako(a)redhat.com> 2.0.0-7
+- BR/R felix-parent.
+
* Thu Sep 9 2010 Alexander Kurtakov <akurtako(a)redhat.com> 2.0.0-5
- Fix BuildRequires.