[jetty-build-support] Update to latest packaging guidelines

Stanislav Ochotnicky sochotni at fedoraproject.org
Mon Aug 5 08:56:21 UTC 2013


commit f4264edc14f8560523e67d1de724c6982beba569
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Mon Aug 5 10:52:46 2013 +0200

    Update to latest packaging guidelines

 jetty-build-support.spec |   29 ++++++++---------------------
 1 files changed, 8 insertions(+), 21 deletions(-)
---
diff --git a/jetty-build-support.spec b/jetty-build-support.spec
index 59a9d99..fae4eab 100644
--- a/jetty-build-support.spec
+++ b/jetty-build-support.spec
@@ -1,6 +1,6 @@
 Name:           jetty-build-support
 Version:        1.1
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Jetty build support files
 
 Group:          Development/Libraries
@@ -49,35 +49,22 @@ Requires:       jpackage-utils
 
 %build
 pushd %{name}
-mvn-rpmbuild install javadoc:aggregate
+%mvn_build
 
 %install
-# poms
-install -d -m 755 %{buildroot}%{_mavenpomdir}
 pushd %{name}
-install -pm 644 pom.xml \
-    %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-install -Dp -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
+%mvn_install
 
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-
-# javadoc
-install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-popd
-
-
-%files
+%files -f %{name}/.mfiles
 %doc jetty-distribution-remote-resources/src/main/resources/*
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_javadir}/%{name}.jar
-%{_mavendepmapfragdir}/%{name}
 
-%files javadoc
+%files javadoc -f %{name}/.mfiles-javadoc
 %doc jetty-distribution-remote-resources/src/main/resources/*
-%doc %{_javadocdir}/%{name}
 
 %changelog
+* Mon Aug 05 2013 Stanislav Ochotnicky <sochotnicky at redhat.com> - 1.1-8
+- Update to latest packaging guidelines
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 


More information about the scm-commits mailing list