From 2a9e5efb16aeb8eeeb09dbc96776bc0fdfb03cc7 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 May 2014 11:29:31 +0200 Subject: [PATCH] Build with %mvn_build --- qdox.spec | 35 +++++++++++------------------------ 1 file changed, 11 insertions(+), 24 deletions(-) diff --git a/qdox.spec b/qdox.spec index d3bbee2..d5437c7 100644 --- a/qdox.spec +++ b/qdox.spec @@ -31,7 +31,7 @@ Summary: Extract class/interface/method definitions from sources Name: qdox Version: 1.12.1 -Release: 8%{?dist} +Release: 9%{?dist} Epoch: 0 License: ASL 2.0 URL: http://qdox.codehaus.org/ @@ -102,6 +102,9 @@ rm -rf bootstrap %pom_remove_plugin :xsite-maven-plugin %pom_xpath_remove pom:build/pom:extensions +%mvn_file : %{name} +%mvn_alias : qdox:qdox + %build # Generate scanner (upstream does this with maven-jflex-plugin) jflex \ @@ -123,10 +126,7 @@ byaccj \ ../../../../../../grammar/parser.y) # Build artifact -mvn-rpmbuild \ - -Dmaven.test.skip=true \ - install \ - javadoc:aggregate +%mvn_build -f # Inject OSGi manifests mkdir -p META-INF @@ -135,31 +135,18 @@ touch META-INF/MANIFEST.MF zip -u target/%{name}-%{version}.jar META-INF/MANIFEST.MF %install -# jars -mkdir -p $RPM_BUILD_ROOT%{_javadir} -cp -p target/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar +%mvn_install -J target/apidocs -# poms -install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir} -install -m 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom - -%add_maven_depmap -a qdox:qdox - -# javadoc -mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name} -cp -pr target/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} - -%files +%files -f .mfiles %doc LICENSE.txt README.txt -%{_javadir}/%{name}.jar -%{_mavenpomdir}/* -%{_mavendepmapfragdir}/* -%files javadoc +%files javadoc -f .mfiles-javadoc %doc LICENSE.txt -%doc %{_javadocdir}/%{name} %changelog +* Thu May 29 2014 Mikolaj Izdebski - 0:1.12.1-9 +- Build with %%mvn_build + * Tue Mar 04 2014 Stanislav Ochotnicky - 0:1.12.1-8 - Use Requires: java-headless rebuild (#1067528)