[apache-resource-bundles] Build with xmvn
Michal Srb
msrb at fedoraproject.org
Fri Jan 25 09:45:51 UTC 2013
commit 2ca28ca21f7b2b95b0389432a0b4429b771cff37
Author: Michal Srb <msrb at redhat.com>
Date: Wed Jan 23 13:01:24 2013 +0100
Build with xmvn
apache-resource-bundles.spec | 64 +++++++----------------------------------
1 files changed, 11 insertions(+), 53 deletions(-)
---
diff --git a/apache-resource-bundles.spec b/apache-resource-bundles.spec
index 88ee050..e110894 100644
--- a/apache-resource-bundles.spec
+++ b/apache-resource-bundles.spec
@@ -4,7 +4,7 @@
Name: apache-resource-bundles
Version: 2
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: Apache Resource Bundles
Group: Development/Libraries
@@ -18,7 +18,7 @@ Source4: http://repo1.maven.org/maven2/org/apache/apache-license-header-resource
Source5: http://repo1.maven.org/maven2/org/apache/apache-incubator-disclaimer-resource-bundle/%{id_version}/apache-incubator-disclaimer-resource-bundle-%{id_version}-sources.jar
Source6: http://repo1.maven.org/maven2/org/apache/apache-incubator-disclaimer-resource-bundle/%{id_version}/apache-incubator-disclaimer-resource-bundle-%{id_version}.pom
-BuildRequires: maven
+BuildRequires: xmvn >= 0.2.3
BuildRequires: maven-compiler-plugin
BuildRequires: maven-install-plugin
BuildRequires: maven-jar-plugin
@@ -27,12 +27,6 @@ BuildRequires: maven-resources-plugin
BuildRequires: maven-surefire-plugin
BuildRequires: maven-site-plugin
-# Requirements from the POMs
-Requires: maven-remote-resources-plugin
-
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
-
BuildArch: noarch
%description
@@ -72,56 +66,20 @@ popd
%build
-mvn-rpmbuild install
+%mvn_file :apache-jar-resource-bundle apache-resource-bundles/jar
+%mvn_file :apache-license-header-resource-bundle apache-resource-bundles/license-header
+%mvn_file :apache-incubator-disclaimer-resource-bundle apache-resource-bundles/incubator-disclaimer
+%mvn_build
%install
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-
-# jar
-#
-pushd apache-jar-resource-bundle
-install -m 644 \
- target/apache-jar-resource-bundle-%{jar_version}.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}/jar.jar
-cp pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-jar.pom
-%add_to_maven_depmap org.apache apache-jar-resource-bundle %{jar_version} JPP/%{name} jar
-popd
-
-# license-header
-pushd apache-license-header-resource-bundle
-install -m 644 \
- target/apache-license-header-resource-bundle-%{lh_version}.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}/license-header.jar
-cp pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-license-header.pom
-%add_to_maven_depmap org.apache apache-license-header-resource-bundle %{lh_version} JPP/%{name} license-header
-popd
-
-# incubator-disclaimer
-pushd apache-incubator-disclaimer-resource-bundle
-install -m 644 \
- target/apache-incubator-disclaimer-resource-bundle-%{id_version}.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}/incubator-disclaimer.jar
-cp pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-incubator-disclaimer.pom
-%add_to_maven_depmap org.apache apache-incubator-disclaimer-resource-bundle %{id_version} JPP/%{name} incubator-disclaimer
-popd
+%mvn_install
-# Add parent to depmap too
-cp pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
-%add_to_maven_depmap org.apache %{name} %{version} JPP %{name}
-
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
-%files
-%{_javadir}/%{name}
-%{_mavendepmapfragdir}/*
-%{_mavenpomdir}/*.pom
+%files -f .mfiles
%changelog
+* Wed Jan 16 2013 Michal Srb <msrb at redhat.com> - 2-9
+- Build with xmvn
+
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
More information about the scm-commits
mailing list