[maven-wagon-ahc] Use modern rpm maven macros to tidy up spec
Gerard Ryan
galileo at fedoraproject.org
Sat Mar 15 15:24:33 UTC 2014
commit eef60b66f7fa7b1eaab08a883cc0597a6ca1911e
Author: Gerard Ryan <gerard at ryan.lt>
Date: Sat Mar 15 15:24:07 2014 +0000
Use modern rpm maven macros to tidy up spec
maven-wagon-ahc.spec | 30 ++++++------------------------
1 files changed, 6 insertions(+), 24 deletions(-)
---
diff --git a/maven-wagon-ahc.spec b/maven-wagon-ahc.spec
index 3c441a8..1dff043 100644
--- a/maven-wagon-ahc.spec
+++ b/maven-wagon-ahc.spec
@@ -3,7 +3,6 @@ Version: 1.2.1
Release: 10%{?dist}
Summary: A wagon provider for HTTP transfers
-Group: Development/Libraries
License: EPL
URL: http://www.sonatype.com
@@ -31,12 +30,6 @@ BuildRequires: maven-wagon
BuildRequires: plexus-containers-container-default
BuildRequires: plexus-utils
-Requires: async-http-client
-Requires: java-headless
-Requires: maven-wagon
-Requires: plexus-utils
-
-
%description
A wagon provider for HTTP transfers based on the async-http-client.
@@ -65,34 +58,23 @@ cp %{SOURCE1} .
%build
# we don't have all test deps, so tests fail
-mvn-rpmbuild package javadoc:aggregate -Dmaven.test.skip=true
+%mvn_build --skip-tests
%install
+%mvn_install
-install -d -m 0755 $RPM_BUILD_ROOT%{_javadir}
-cp -p target/wagon-ahc-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-
-install -d -m 0755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-# POMs
-install -d -m 0755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -p -m 0644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-
-%files
-%{_javadir}/*
+%files -f .mfiles
+%dir %{_javadir}/%{name}
%doc epl-v10.html
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-%files javadoc
+%files javadoc -f .mfiles-javadoc
%{_javadocdir}/%{name}
%changelog
* Sat Mar 15 2014 Gerard Ryan <galileo at fedoraproject.org> - 1.2.1-10
- RHBZ-1068402: Switch to java-headless requires
+- Use modern rpm maven macros to tidy up spec
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.1-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
More information about the scm-commits
mailing list