From da8fbd0f11a8f1ff4378d861675f1b6071ba15cc Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 19 Feb 2013 08:34:51 +0100 Subject: [PATCH] Build with xmvn --- maven-shared-io.spec | 46 ++++++++++---------------------------------- 1 file changed, 10 insertions(+), 36 deletions(-) diff --git a/maven-shared-io.spec b/maven-shared-io.spec index 6ea2683..94c25b2 100644 --- a/maven-shared-io.spec +++ b/maven-shared-io.spec @@ -1,6 +1,6 @@ Name: maven-shared-io Version: 1.1 -Release: 4%{?dist} +Release: 5%{?dist} # Maven-shared defines maven-shared-io version as 1.2 Epoch: 1 Summary: API for I/O support like logging, download or file scanning. @@ -11,20 +11,11 @@ URL: http://maven.apache.org/shared/maven-shared-io Source0: %{name}-%{version}.tar.xz # ASL mandates that the licence file be included in redistributed source Source1: http://www.apache.org/licenses/LICENSE-2.0.txt - BuildArch: noarch -BuildRequires: easymock -BuildRequires: java-devel -BuildRequires: jpackage-utils BuildRequires: maven-local -BuildRequires: maven-surefire-provider-junit -Requires: java -Requires: jpackage-utils -Requires: maven -Requires: maven-artifact-manager -Requires: maven-wagon -Requires: plexus-utils +BuildRequires: maven-shared +BuildRequires: easymock Obsoletes: maven-shared-io < %{epoch}:%{version}-%{release} Provides: maven-shared-io = %{epoch}:%{version}-%{release} @@ -35,14 +26,11 @@ API for I/O support like logging, download or file scanning. This is a replacement package for maven-shared-io %package javadoc -Group: Documentation Summary: Javadoc for %{name} -Requires: jpackage-utils %description javadoc API documentation for %{name}. - %prep %setup -q @@ -55,35 +43,21 @@ rm src/test/java/org/apache/maven/shared/io/download/DefaultDownloadManagerTest. cp %{SOURCE1} LICENSE.txt %build -mvn-rpmbuild package javadoc:aggregate +%mvn_build %install -# JAR -install -Ddm 755 %{buildroot}/%{_javadir} -install -Dpm 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar +%mvn_install -# POM -install -Ddm 755 %{buildroot}/%{_mavenpomdir} -install -Dpm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom - -# JavaDoc -install -Ddm 755 %{buildroot}/%{_javadocdir}/%{name} -cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name} - -%add_maven_depmap JPP-%{name}.pom %{name}.jar - -%files +%files -f .mfiles %doc LICENSE.txt -%{_javadir}/%{name}.jar -%{_mavenpomdir}/JPP-%{name}.pom -%{_mavendepmapfragdir}/%{name} -%files javadoc +%files javadoc -f .mfiles-javadoc %doc LICENSE.txt -%doc %{_javadocdir}/%{name} - %changelog +* Tue Feb 19 2013 Mikolaj Izdebski - 1:1.1-5 +- Build with xmvn + * Mon Feb 18 2013 Mikolaj Izdebski - 1:1.1-4 - Drop dependency on plexus-container-default