From 76fabf0d22bdd53fa04edee7d8f389b31cec7e0d Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Jan 17 2013 13:26:57 +0000 Subject: Build with xmvn --- diff --git a/plexus-resources.spec b/plexus-resources.spec index 8e17d51..63aab40 100644 --- a/plexus-resources.spec +++ b/plexus-resources.spec @@ -34,7 +34,7 @@ Name: %{parent}-%{subname} Version: 1.0 -Release: 0.10.a7%{?dist} +Release: 0.11.a7%{?dist} Summary: Plexus Resource Manager License: MIT Group: Development/Tools @@ -42,14 +42,11 @@ URL: http://plexus.codehaus.org/ # svn export http://svn.codehaus.org/plexus/plexus-components/tags/plexus-resources-1.0-alpha-7/ # tar caf plexus-resources-1.0-alpha-7-src.tar.xz plexus-resources-1.0-alpha-7 Source0: %{name}-%{version}-alpha-7-src.tar.xz -Requires: classworlds >= 0:1.1 -Requires: plexus-containers-container-default -Requires: plexus-utils -Requires: jpackage-utils >= 0:1.7.3 + BuildRequires: jpackage-utils >= 0:1.7.3 BuildRequires: java-devel >= 0:1.5.0 BuildRequires: ant >= 0:1.6 -BuildRequires: maven +BuildRequires: xmvn BuildRequires: maven-compiler-plugin BuildRequires: maven-install-plugin BuildRequires: maven-jar-plugin @@ -76,7 +73,6 @@ is like a J2EE application server, without all the baggage. %package javadoc Summary: Javadoc for %{name} Group: Documentation -Requires: jpackage-utils %description javadoc API documentation for %{name}. @@ -85,35 +81,20 @@ API documentation for %{name}. %setup -q -n %{name}-%{namedversion} %build -mvn-rpmbuild \ - -Dmaven.test.failure.ignore=true \ - install javadoc:javadoc +%mvn_file : %{parent}/%{subname} +%mvn_build -f %install -# jars -install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus -install -pm 644 target/%{name}-%{namedversion}.jar \ - $RPM_BUILD_ROOT%{_javadir}/plexus/%{subname}.jar -%add_to_maven_depmap org.codehaus.plexus %{name} %{namedversion} JPP/%{parent} %{subname} - -# poms -install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir} -install -pm 644 pom.xml \ - $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{parent}-%{subname}.pom +%mvn_install -# javadoc -install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name} -cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} +%files -f .mfiles -%files -%{_javadir}/%{parent}/* -%{_mavenpomdir}/* -%{_mavendepmapfragdir}/* - -%files javadoc -%{_javadocdir}/%{name} +%files javadoc -f .mfiles-javadoc %changelog +* Thu Jan 17 2013 Michal Srb - 1.0-0.11.a7 +- Build with xmvn + * Thu Nov 22 2012 Jaromir Capik - 1.0-0.10.a7 - Migration to plexus-containers-container-default