[ini4j] Switch from mvn-rpmbuild to xmvn
Omair Majid
omajid at fedoraproject.org
Mon Feb 24 15:31:11 UTC 2014
commit c578606ab5b1f7f7adfbcc298b14d3b1c3d513cb
Author: Omair Majid <omajid at redhat.com>
Date: Mon Feb 24 10:25:47 2014 -0500
Switch from mvn-rpmbuild to xmvn
ini4j.spec | 30 ++++--------------------------
1 files changed, 4 insertions(+), 26 deletions(-)
---
diff --git a/ini4j.spec b/ini4j.spec
index 2336e90..a7aa74e 100644
--- a/ini4j.spec
+++ b/ini4j.spec
@@ -87,43 +87,21 @@ find . -type f \( -iname "*.jar" -o -iname "*.class" -o -iname "*.exe" -o -iname
%build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mkdir -p $MAVEN_REPO_LOCAL
-
# Tests require easymock2 class extension to compile. This package is not
# available in fedora yet. So disable tests for now.
# Will also need to add the correct depmap for jetty when tests are enabled.
-
-mvn-rpmbuild \
- -Dmaven.local.depmap.file=%{SOURCE1} \
- -Dmaven.test.skip=true \
- install javadoc:aggregate
-
+%mvn_build -f
%install
-# jar
-mkdir -p $RPM_BUILD_ROOT%{_javadir}
-cp -p target/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-
-# javadoc
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+%mvn_install
-# pom
-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 %{name}.jar
-%files
+%files -f .mfiles
%doc LICENSE.txt NOTICE.txt
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-%{_javadir}/*
-%files javadoc
+%files javadoc -f .mfiles-javadoc
%doc LICENSE.txt
-%{_javadocdir}/%{name}
%changelog
More information about the scm-commits
mailing list