diff --git a/maven-reporting-impl.spec b/maven-reporting-impl.spec index 7c501e9..9487428 100644 --- a/maven-reporting-impl.spec +++ b/maven-reporting-impl.spec @@ -1,6 +1,6 @@ Name: maven-reporting-impl Version: 2.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Abstract classes to manage report generation License: ASL 2.0 URL: http://maven.apache.org/shared/maven-reporting-impl @@ -9,25 +9,11 @@ URL: http://maven.apache.org/shared/maven-reporting-impl 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: java-devel -BuildRequires: jpackage-utils -BuildRequires: junit -BuildRequires: junit-addons BuildRequires: maven-local -BuildRequires: maven-surefire-provider-junit -Requires: apache-commons-validator -Requires: java -Requires: jpackage-utils -Requires: maven -Requires: maven-doxia-core -Requires: maven-doxia-sink-api -Requires: maven-doxia-sitetools -Requires: maven-project -Requires: maven-shared-reporting-api -Requires: plexus-utils +BuildRequires: maven-shared +BuildRequires: junit-addons Obsoletes: maven-shared-reporting-impl < %{version}-%{release} Provides: maven-shared-reporting-impl = %{version}-%{release} @@ -41,49 +27,31 @@ Abstract classes to manage report generation, which can be run both: This is a replacement package for maven-shared-reporting-impl %package javadoc -Group: Documentation Summary: Javadoc for %{name} -Requires: jpackage-utils %description javadoc API documentation for %{name}. - %prep %setup -q - -cp %{SOURCE1} LICENSE.txt +cp -p %{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 - 2.2-4 +- Build with xmvn + * Wed Feb 06 2013 Java SIG - 2.2-3 - Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild - Replace maven BuildRequires with maven-local