[httpcomponents-project] Build with xmvn

Michal Srb msrb at fedoraproject.org
Fri Jan 25 10:10:19 UTC 2013


commit 2ff1c810efd40531e40e848142699c6bdc06379c
Author: Michal Srb <msrb at redhat.com>
Date:   Wed Jan 23 15:01:34 2013 +0100

    Build with xmvn

 httpcomponents-project.spec |   29 ++++++++++++-----------------
 1 files changed, 12 insertions(+), 17 deletions(-)
---
diff --git a/httpcomponents-project.spec b/httpcomponents-project.spec
index 7cda56f..55087f3 100644
--- a/httpcomponents-project.spec
+++ b/httpcomponents-project.spec
@@ -1,7 +1,7 @@
 Name:              httpcomponents-project
 Summary:           Common POM file for HttpComponents
 Version:           6
-Release:           1%{?dist}
+Release:           2%{?dist}
 Group:             Development/Libraries
 License:           ASL 2.0
 URL:               http://hc.apache.org/
@@ -10,17 +10,8 @@ URL:               http://hc.apache.org/
 Source:            %{name}-%{version}.tar.xz
 BuildArch:         noarch
 
-BuildRequires:     jpackage-utils
+BuildRequires:     xmvn
 
-# Requires are dependencies from pom.xml. This project should only be required for building with maven.
-Requires:          java >= 1:1.6.0
-Requires:          jpackage-utils
-Requires:          maven
-Requires:          maven-compiler-plugin
-Requires:          maven-gpg-plugin
-Requires:          maven-jar-plugin
-Requires:          maven-project-info-reports-plugin
-Requires:          maven-site-plugin
 
 %description
 Common Maven POM  file for HttpComponents. This project should be
@@ -34,18 +25,22 @@ use it as runtime requirement.
 %pom_remove_plugin :docbkx-maven-plugin
 %pom_remove_plugin :maven-clover2-plugin
 %pom_remove_plugin :maven-notice-plugin
+%pom_xpath_remove pom:modules
+
+%build
+%mvn_file  : %{name}
+%mvn_build
 
 %install
-install -dm 755 %{buildroot}/%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}/%{_mavenpomdir}/JPP.%{name}.pom
-%add_maven_depmap JPP.%{name}.pom
+%mvn_install
 
-%files
+%files -f .mfiles
 %doc LICENSE.txt NOTICE.txt
-%{_mavendepmapfragdir}/%{name}
-%{_mavenpomdir}/JPP.%{name}.pom
 
 %changelog
+* Thu Jan 17 2013 Michal Srb <msrb at redhat.com> - 6-2
+- Build with xmvn
+
 * Mon Aug  6 2012 Mikolaj Izdebski <mizdebsk at redhat.com> - 6-1
 - Update to upstream version 6
 


More information about the scm-commits mailing list