commit e27d7ce87194a454c1950c27c4361aa70191305d Author: Mikolaj Izdebski mizdebsk@redhat.com Date: Tue Oct 1 18:44:35 2013 +0200

Install NOTICE file with javadoc package

- Update to current packaging guidelines - Fix BuildRequires

maven-doxia-tools.spec | 113 +++++++++++++++++++----------------------------- 1 files changed, 45 insertions(+), 68 deletions(-) --- diff --git a/maven-doxia-tools.spec b/maven-doxia-tools.spec index a23291a..c46ee3a 100644 --- a/maven-doxia-tools.spec +++ b/maven-doxia-tools.spec @@ -1,91 +1,68 @@ -Name: maven-doxia-tools -Version: 1.4 -Release: 12%{?dist} -Summary: Maven Doxia Integration Tools - -Group: Development/Libraries -License: ASL 2.0 -URL: http://maven.apache.org/shared/maven-doxia-tools/ -Source0: http://repo1.maven.org/maven2/org/apache/maven/shared/%%7Bname%7D/%%7Bversio... -Patch0: %{name}-migration-to-component-metadata.patch - -BuildRequires: apache-commons-io >= 1.4 -BuildRequires: apache-commons-logging -BuildRequires: plexus-utils -BuildRequires: plexus-interpolation -BuildRequires: plexus-containers-container-default -BuildRequires: plexus-i18n -BuildRequires: maven-local -BuildRequires: maven-doxia-logging-api -BuildRequires: maven-doxia-sitetools -BuildRequires: maven-compiler-plugin -BuildRequires: maven-install-plugin -BuildRequires: maven-jar-plugin -BuildRequires: maven-javadoc-plugin -BuildRequires: maven-resources-plugin -BuildRequires: maven-surefire-plugin -BuildRequires: maven-plugin-testing-harness -BuildRequires: maven-shared-reporting-impl -BuildRequires: plexus-containers-component-metadata -BuildRequires: java-devel >= 1:1.6.0 - -BuildArch: noarch - -Requires: apache-commons-io >= 1.4 -Requires: plexus-utils -Requires: plexus-interpolation -Requires: plexus-containers-container-default -Requires: plexus-i18n -Requires: maven-doxia-logging-api -Requires: maven-doxia-sitetools - -Requires: jpackage-utils +Name: maven-doxia-tools +Version: 1.4 +Release: 13%{?dist} +Summary: Maven Doxia Integration Tools +License: ASL 2.0 +URL: http://maven.apache.org/shared/maven-doxia-tools/ +BuildArch: noarch + +Source0: http://repo1.maven.org/maven2/org/apache/maven/shared/%%7Bname%7D/%%7Bversio... + +Patch0: %{name}-migration-to-component-metadata.patch + +BuildRequires: maven-local +BuildRequires: mvn(commons-io:commons-io) +BuildRequires: mvn(org.apache.maven.doxia:doxia-decoration-model) +BuildRequires: mvn(org.apache.maven.doxia:doxia-logging-api) +BuildRequires: mvn(org.apache.maven:maven-artifact) +BuildRequires: mvn(org.apache.maven:maven-artifact-manager) +BuildRequires: mvn(org.apache.maven:maven-compat) +BuildRequires: mvn(org.apache.maven:maven-model) +BuildRequires: mvn(org.apache.maven:maven-plugin-api) +BuildRequires: mvn(org.apache.maven:maven-project) +BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-api) +BuildRequires: mvn(org.apache.maven.shared:maven-shared-components) +BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) +BuildRequires: mvn(org.codehaus.plexus:plexus-container-default) +BuildRequires: mvn(org.codehaus.plexus:plexus-i18n) +BuildRequires: mvn(org.codehaus.plexus:plexus-interpolation) +BuildRequires: mvn(org.codehaus.plexus:plexus-utils)

%description A collection of tools to help the integration of Doxia in Maven plugins.

%package javadoc -Summary: Javadoc for %{name} -Group: Documentation -Requires: jpackage-utils +Summary: API documentation for %{name}

%description javadoc -API documentation for %{name}. +This package contains %{summary}.

%prep %setup -q %patch0 -b .sav %pom_xpath_remove "pom:dependency[pom:scope[text()='test']]"

+%mvn_file : %{name} +%mvn_alias : org.apache.maven.doxia:doxia-integration-tools + %build -mvn-rpmbuild \ - -Dmaven.test.skip=true \ - install javadoc:aggregate +%mvn_build -f

%install -# jars -install -Dm 644 target/%{name}-%{version}.jar %{buildroot}/%{_javadir}/%{name}.jar - -# javadoc -install -d -m 755 %{buildroot}/%{_javadocdir}/%{name} -cp -pr target/site/apidocs/* %{buildroot}/%{_javadocdir}/%{name} - -# poms -install -Dpm 644 pom.xml %{buildroot}/%{_mavenpomdir}/JPP-%{name}.pom +%mvn_install

-%add_maven_depmap JPP-%{name}.pom %{name}.jar -a org.apache.maven.doxia:doxia-integration-tools +%files -f .mfiles +%doc LICENSE NOTICE

-%files -%{_javadir}/* -%{_mavenpomdir}/* -%{_mavendepmapfragdir}/%{name} -%doc LICENSE NOTICE DEPENDENCIES - -%files javadoc -%doc %{_javadocdir}/* -%doc LICENSE +%files javadoc -f .mfiles-javadoc +%doc LICENSE NOTICE

%changelog +* Tue Oct 1 2013 Mikolaj Izdebski mizdebsk@redhat.com - 1.4-13 +- Install NOTICE file with javadoc package +- Update to current packaging guidelines +- Fix BuildRequires + * Sat Aug 03 2013 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 1.4-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild