[maven-plugin-bundle] Update to current packaging guidelines
Mikolaj Izdebski
mizdebsk at fedoraproject.org
Wed May 21 16:55:01 UTC 2014
commit 09fb1c51e33bc30ad9249f3d8c3ed21469492bad
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Wed May 21 18:52:21 2014 +0200
Update to current packaging guidelines
maven-plugin-bundle.spec | 87 +++++++++++-----------------------------------
1 files changed, 21 insertions(+), 66 deletions(-)
---
diff --git a/maven-plugin-bundle.spec b/maven-plugin-bundle.spec
index 2ed1adb..86aa444 100644
--- a/maven-plugin-bundle.spec
+++ b/maven-plugin-bundle.spec
@@ -2,56 +2,27 @@
Name: maven-plugin-bundle
Version: 2.3.7
-Release: 11%{?dist}
+Release: 12%{?dist}
Summary: Maven Bundle Plugin
-
-Group: Development/Tools
License: ASL 2.0
URL: http://felix.apache.org
+BuildArch: noarch
+
Source0: http://archive.apache.org/dist/felix/%{site_name}-%{version}-source-release.tar.gz
Patch0: %{site_name}-dependency.patch
Patch1: %{site_name}-unreported-exception.patch
-BuildRequires: aqute-bndlib >= 1.50.0
-BuildRequires: plexus-utils >= 1.4.5
-BuildRequires: felix-osgi-obr
-BuildRequires: kxml
-BuildRequires: maven-local
-BuildRequires: maven-shared-dependency-tree >= 1.1-3
-BuildRequires: maven-compiler-plugin
-BuildRequires: maven-install-plugin
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-javadoc-plugin
-BuildRequires: maven-plugin-plugin
-BuildRequires: maven-resources-plugin
-BuildRequires: maven-surefire-plugin >= 2.3
-BuildRequires: maven-surefire-provider-junit4 >= 2.3
-BuildRequires: maven-doxia-sitetools
-BuildRequires: maven-shared-osgi
-BuildRequires: maven-archiver
-BuildRequires: maven-plugin-testing-harness
-BuildRequires: mockito
-BuildRequires: plexus-archiver
-BuildRequires: plexus-containers-container-default
-BuildRequires: felix-parent
-BuildRequires: felix-bundlerepository
-
-Requires: aqute-bndlib >= 1.50.0
-Requires: plexus-utils >= 1.4.5
-Requires: felix-osgi-obr
-Requires: kxml
-Requires: maven
-Requires: maven-archiver
-Requires: maven-shared-dependency-tree
-Requires: maven-shared-osgi
-Requires: plexus-archiver
-Requires: plexus-containers-container-default
-Requires: felix-parent
-Requires: felix-bundlerepository
-
-BuildArch: noarch
-
+BuildRequires: maven-local
+BuildRequires: mvn(biz.aQute:bndlib)
+BuildRequires: mvn(net.sf.kxml:kxml2)
+BuildRequires: mvn(org.apache.felix:felix-parent:pom:)
+BuildRequires: mvn(org.apache.felix:org.apache.felix.bundlerepository)
+BuildRequires: mvn(org.apache.maven:maven-archiver)
+BuildRequires: mvn(org.apache.maven:maven-core)
+BuildRequires: mvn(org.apache.maven.shared:maven-dependency-tree)
+BuildRequires: mvn(org.apache.maven.shared:maven-plugin-testing-harness)
+BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
%description
Provides a maven plugin that supports creating an OSGi bundle
@@ -59,9 +30,7 @@ from the contents of the compilation classpath along with its
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}.
@@ -76,35 +45,21 @@ API documentation for %{name}.
#rm -rf src/main/java/org/apache/maven
%build
-mvn-rpmbuild install javadoc:aggregate
+%mvn_build
%install
-# jars
-install -d -m 0755 %{buildroot}%{_javadir}
-install -m 644 target/maven-bundle-plugin-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-
-# poms
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+%mvn_install
-# javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
-rm -rf target/site/api*
-
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-
-%files
+%files -f .mfiles
%doc LICENSE NOTICE DEPENDENCIES
-%{_javadir}/%{name}.jar
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
-%files javadoc
-%doc LICENSE
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
+%doc LICENSE NOTICE
%changelog
+* Wed May 21 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 2.3.7-12
+- Update to current packaging guidelines
+
* Thu Feb 20 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 2.3.7-11
- Remove unneeded R and BR: maven-wagon
More information about the scm-commits
mailing list