commit 562aa270210d80c1a435da75bd36e293553724cb Author: Michal Srb msrb@redhat.com Date: Mon Dec 10 16:30:23 2012 +0100
Migrated to plexus-components-component-default (Resolves: #878553)
- Removed custom depmap and its occurrence in spec file - Fixed various rpmlint warnings
maven-doxia-depmap.xml | 16 ---------------- maven-doxia.spec | 25 +++++++++++++------------ 2 files changed, 13 insertions(+), 28 deletions(-) --- diff --git a/maven-doxia.spec b/maven-doxia.spec index c67a4eb..58f9a6d 100644 --- a/maven-doxia.spec +++ b/maven-doxia.spec @@ -30,7 +30,7 @@
Name: maven-doxia Version: 1.2 -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 0 Summary: Content generation framework License: ASL 2.0 @@ -39,9 +39,6 @@ URL: http://maven.apache.org/doxia/
Source0: http://repo2.maven.org/maven2/org/apache/maven/doxia/doxia/%%7Bversion%7D/do...
-# Point it at the correct plexus-container-default -Source1: %{name}-depmap.xml -
# TODO: push upstream Patch0: 0001-Use-plexus-component-metadata.patch @@ -92,7 +89,7 @@ BuildRequires: plexus-utils BuildRequires: plexus-velocity BuildRequires: plexus-build-api BuildRequires: velocity -BuildRequires: fop +BuildRequires: fop BuildRequires: plexus-containers-component-metadata BuildRequires: plexus-containers-component-javadoc BuildRequires: plexus-containers-container-default @@ -112,12 +109,12 @@ Requires: apache-commons-logging Requires: apache-commons-validator Requires: junit Requires: jakarta-oro -Requires: plexus-container-default +Requires: plexus-containers-container-default Requires: plexus-i18n Requires: plexus-utils Requires: plexus-velocity Requires: velocity -Requires: fop +Requires: fop Requires: httpcomponents-client Requires: httpcomponents-project Requires: geronimo-jms @@ -138,7 +135,7 @@ wikis and content management systems.
%package javadoc Summary: Javadoc for %{name} -Group: Development/Documentation +Group: Documentation
%description javadoc API documentation for %{name}. @@ -155,10 +152,9 @@ API documentation for %{name}. # tests disabled because some use old plexus-container and don't work # with new mvn-rpmbuild \ - -e \ - -Dmaven.local.depmap.file=%{SOURCE1} \ - -Dmaven.test.skip=true \ - install javadoc:aggregate + -e \ + -Dmaven.test.skip=true \ + install javadoc:aggregate
%install # jars/poms @@ -218,6 +214,11 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : %doc %{_javadocdir}/%{name}
%changelog +* Mon Dec 10 2012 Michal Srb msrb@redhat.com - 0:1.2-5 +- Migrated to plexus-components-component-default (Resolves: #878553) +- Removed custom depmap and its occurrence in spec file +- Fixed various rpmlint warnings + * Thu Jul 19 2012 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 0:1.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
java-sig-commits@lists.fedoraproject.org