[apache-parent] Migrate away from mvn-rpmbuild

Mikolaj Izdebski mizdebsk at fedoraproject.org
Wed Aug 28 12:42:46 UTC 2013


commit 963b741361f139c54e3acd7614af480d2b68ff36
Author: Michal Srb <msrb at redhat.com>
Date:   Mon Aug 26 18:22:52 2013 +0200

    Migrate away from mvn-rpmbuild

 apache-parent.spec |   24 +++++++-----------------
 1 files changed, 7 insertions(+), 17 deletions(-)
---
diff --git a/apache-parent.spec b/apache-parent.spec
index 8f78a81..4f55942 100644
--- a/apache-parent.spec
+++ b/apache-parent.spec
@@ -1,6 +1,6 @@
 Name:           apache-parent
 Version:        10
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Parent pom file for Apache projects
 Group:          Development/Libraries
 License:        ASL 2.0
@@ -14,10 +14,6 @@ BuildRequires:  jpackage-utils
 BuildRequires:  apache-resource-bundles
 BuildRequires:  maven-remote-resources-plugin
 
-Requires:       jpackage-utils
-Requires:       apache-resource-bundles
-Requires:       maven-remote-resources-plugin
-
 %description
 This package contains the parent pom file for apache projects.
 
@@ -33,24 +29,18 @@ sed -i 's:<target>1.4</target>:<target>1.5</target>:' pom.xml
 cp %{SOURCE1} LICENSE
 
 %build
-
+%mvn_build
 
 %install
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 pom.xml \
-        $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
-
-%add_maven_depmap JPP-%{name}.pom
+%mvn_install
 
-%check
-mvn-rpmbuild verify
-
-%files
+%files -f .mfiles
 %doc LICENSE
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
 
 %changelog
+* Mon Aug 26 2013 Michal Srb <msrb at redhat.com> - 10-12
+- Migrate away from mvn-rpmbuild
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 10-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 


More information about the scm-commits mailing list