From e8a6a4f610ce7add55290a009d7e4c2e3f6207c0 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Feb 18 2013 16:56:29 +0000 Subject: Build with xmvn - Resolves: rhbz#912437 --- diff --git a/maven-reporting-api.spec b/maven-reporting-api.spec index 401fa12..12906c4 100644 --- a/maven-reporting-api.spec +++ b/maven-reporting-api.spec @@ -1,6 +1,6 @@ Name: maven-reporting-api Version: 3.0 -Release: 2%{?dist} +Release: 3%{?dist} # Maven-shared defines maven-reporting-api version as 3.0 Epoch: 1 Summary: API to manage report generation @@ -14,12 +14,9 @@ Source1: http://www.apache.org/licenses/LICENSE-2.0.txt BuildArch: noarch -BuildRequires: java-devel -BuildRequires: jpackage-utils BuildRequires: maven-local -Requires: java -Requires: jpackage-utils -Requires: maven-doxia-sink-api +BuildRequires: mvn(org.apache.maven.shared:maven-shared-components) +BuildRequires: mvn(org.apache.maven.doxia:doxia-sink-api) Obsoletes: maven-shared-reporting-api < %{epoch}:%{version}-%{release} Provides: maven-shared-reporting-api = %{epoch}:%{version}-%{release} @@ -32,9 +29,7 @@ from Maven 3 core. This is a replacement package for maven-shared-reporting-api %package javadoc -Group: Documentation Summary: Javadoc for %{name} -Requires: jpackage-utils %description javadoc API documentation for %{name}. @@ -42,40 +37,28 @@ API documentation for %{name}. %prep %setup -q - cp %{SOURCE1} LICENSE.txt %build -mvn-rpmbuild package javadoc:aggregate +# Previous package provides groupIds org.apache.maven.shared and org.apache.maven.reporting +%mvn_alias : org.apache.maven.shared:maven-reporting-api +%mvn_build %install -# JAR -install -Ddm 755 %{buildroot}/%{_javadir} -install -Dpm 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar - -# 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} +%mvn_install -# Previous package provides groupIds org.apache.maven.shared and org.apache.maven.reporting -%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "org.apache.maven.shared:maven-reporting-api" - -%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 +* Mon Feb 18 2013 Mikolaj Izdebski - 1:3.0-3 +- Build with xmvn +- Resolves: rhbz#912437 + * Wed Feb 06 2013 Java SIG - 1:3.0-2 - Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild - Replace maven BuildRequires with maven-local