From 62bbf7a0d30c749bed0308013c40598e9dccc1fc Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 8 Apr 2015 22:03:58 +0200 Subject: [PATCH] Update to current packaging guidelines --- plexus-build-api.spec | 66 +++++++++++-------------------------------- 1 file changed, 16 insertions(+), 50 deletions(-) diff --git a/plexus-build-api.spec b/plexus-build-api.spec index fdf2595..214b9c7 100644 --- a/plexus-build-api.spec +++ b/plexus-build-api.spec @@ -1,11 +1,11 @@ Name: plexus-build-api Version: 0.0.7 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Plexus Build API - -Group: Development/Libraries License: ASL 2.0 URL: https://github.com/sonatype/sisu-build-api +BuildArch: noarch + #Fetched from https://github.com/sonatype/sisu-build-api/tarball/plexus-build-api-0.0.7 Source0: sonatype-sisu-build-api-plexus-build-api-0.0.7-0-g883ea67.tar.gz Source1: http://www.apache.org/licenses/LICENSE-2.0.txt @@ -13,41 +13,17 @@ Source1: http://www.apache.org/licenses/LICENSE-2.0.txt # Forwarded upstream: https://github.com/sonatype/sisu-build-api/pull/2 Patch0: %{name}-migration-to-component-metadata.patch -BuildArch: noarch - -BuildRequires: java-devel >= 1:1.6.0 -BuildRequires: maven-local -BuildRequires: maven-plugin-plugin -BuildRequires: maven-resources-plugin -BuildRequires: maven-jar-plugin -BuildRequires: maven-install-plugin -BuildRequires: maven-compiler-plugin -BuildRequires: maven-javadoc-plugin -BuildRequires: maven-surefire-plugin -BuildRequires: maven-surefire-provider-junit -BuildRequires: maven-doxia-sitetools -BuildRequires: plexus-containers-container-default -BuildRequires: plexus-utils -BuildRequires: forge-parent -BuildRequires: spice-parent -BuildRequires: junit -BuildRequires: plexus-containers-component-metadata -BuildRequires: maven-shared-reporting-impl -BuildRequires: plexus-digest - -Requires: plexus-containers-container-default -Requires: plexus-utils -Requires: jpackage-utils -Requires: spice-parent -Requires: java-headless +BuildRequires: maven-local +BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) +BuildRequires: mvn(org.codehaus.plexus:plexus-container-default) +BuildRequires: mvn(org.codehaus.plexus:plexus-utils) +BuildRequires: mvn(org.sonatype.spice:spice-parent:pom:) %description Plexus Build API %package javadoc -Group: Documentation Summary: Javadoc for %{name} -Requires: jpackage-utils %description javadoc API documentation for %{name}. @@ -58,34 +34,24 @@ cp -p %{SOURCE1} . %patch0 -p1 +%mvn_file : plexus/%{name} + %build -mvn-rpmbuild install javadoc:javadoc +%mvn_build %install -# jars -install -d -m 0755 %{buildroot}%{_javadir}/plexus -install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/plexus/%{name}.jar - -# poms -install -d -m 755 %{buildroot}%{_mavenpomdir} -install -pm 644 pom.xml \ - %{buildroot}%{_mavenpomdir}/JPP.plexus-%{name}.pom - -%add_maven_depmap JPP.plexus-%{name}.pom plexus/%{name}.jar - -# javadoc -install -d -m 0755 %{buildroot}%{_javadocdir}/plexus/%{name} -cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/plexus/%{name}/ +%mvn_install %files -f .mfiles %doc LICENSE-2.0.txt -%{_javadir}/plexus/* -%files javadoc +%files javadoc -f .mfiles-javadoc %doc LICENSE-2.0.txt -%{_javadocdir}/plexus/%{name} %changelog +* Wed Apr 8 2015 Mikolaj Izdebski - 0.0.7-14 +- Update to current packaging guidelines + * Sat Jun 07 2014 Fedora Release Engineering - 0.0.7-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild