commit 20bb2295cc1cb64c3b3f35f25dcb1deeb170ef9e Author: Alexander Kurtakov akurtako@redhat.com Date: Wed May 11 13:23:04 2011 +0300
Update to latest upstream version.
Guidelines fixes.
.gitignore | 1 + maven-javadoc-plugin.spec | 52 +++++++++++++++----------------------------- remove-test-deps.patch | 18 +++++++------- sources | 2 +- 4 files changed, 29 insertions(+), 44 deletions(-) --- diff --git a/.gitignore b/.gitignore index c0a75ef..44672d8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ maven-javadoc-plugin-2.7.tar.xz +/maven-javadoc-plugin-2.8-source-release.zip diff --git a/maven-javadoc-plugin.spec b/maven-javadoc-plugin.spec index 1a9edd2..8d70d23 100644 --- a/maven-javadoc-plugin.spec +++ b/maven-javadoc-plugin.spec @@ -1,30 +1,27 @@ %global bootstrap 0
Name: maven-javadoc-plugin -Version: 2.7 -Release: 4%{?dist} +Version: 2.8 +Release: 1%{?dist} Summary: Maven Javadoc Plugin
Group: Development/Libraries License: ASL 2.0 URL: http://maven.apache.org/plugins/maven-javadoc-plugin -# svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-javadoc-plugin-2.7 -# tar caf maven-javadoc-plugin-2.7.tar.xz maven-javadoc-plugin-2.7/ -Source0: %{name}-%{version}.tar.xz +Source0: http://repo1.maven.org/maven2/org/apache/maven/plugins/%%7Bname%7D/%%7Bversi... Patch0: remove-test-deps.patch Patch1: pom.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: maven2 +BuildRequires: maven BuildRequires: maven-clean-plugin BuildRequires: maven-compiler-plugin BuildRequires: maven-install-plugin BuildRequires: maven-jar-plugin BuildRequires: maven-plugin-plugin BuildRequires: maven-resources-plugin -BuildRequires: maven-surefire-maven-plugin +BuildRequires: maven-surefire-plugin BuildRequires: maven-doxia-sitetools -BuildRequires: maven-shared-plugin-testing-harness +BuildRequires: maven-plugin-testing-harness BuildRequires: maven-shade-plugin BuildRequires: plexus-interactivity BuildRequires: maven-shared-invoker @@ -33,7 +30,7 @@ BuildRequires: maven-javadoc-plugin %endif
Requires: jpackage-utils -Requires: maven2 +Requires: maven Requires: maven-shared-invoker Requires(post): jpackage-utils Requires(postun): jpackage-utils @@ -60,40 +57,28 @@ API documentation for %{name}.
%prep %setup -q -%patch0 +%patch0 -b .sav # Update source for use with newer doxia -%patch1 +#%patch1
sed -i -e "s|org.apache.maven.doxia.module.xhtml.decoration.render|org.apache.maven.doxia.sink.render|g" src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
sed -i -e "s|model>|models>|g" pom.xml
%build -export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository -mvn-jpp \ - -e \ - -Dmaven2.jpp.mode=true \ - -Dmaven.repo.local=$MAVEN_REPO_LOCAL \ +mvn-rpmbuild \ -Dmaven.test.skip=true \ install %if ! %{bootstrap} -mvn-jpp \ - -e \ - -Dmaven2.jpp.mode=true \ - -Dmaven.repo.local=$MAVEN_REPO_LOCAL \ +mvn-rpmbuild \ -Dmaven.test.skip=true \ javadoc:javadoc %endif
%install -rm -rf %{buildroot} - # jars install -d -m 0755 %{buildroot}%{_javadir} -install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar - -(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; \ - do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) +install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
%add_to_maven_depmap org.apache.maven.plugins maven-javadoc-plugin %{version} JPP maven-javadoc-plugin
@@ -104,9 +89,8 @@ install -pm 644 pom.xml \
%if ! %{bootstrap} # javadoc -install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version} -cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/ -ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name} +install -d -m 0755 %{buildroot}%{_javadocdir}/%{name} +cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/ rm -rf target/site/api* %endif
@@ -116,9 +100,6 @@ rm -rf target/site/api* %postun %update_maven_depmap
-%clean -%{__rm} -rf %{buildroot} - %files %defattr(-,root,root,-) %{_javadir}/* @@ -128,11 +109,14 @@ rm -rf target/site/api* %if ! %{bootstrap} %files javadoc %defattr(-,root,root,-) -%{_javadocdir}/%{name}-%{version} %{_javadocdir}/%{name} %endif
%changelog +* Wed May 11 2011 Alexander Kurtakov akurtako@redhat.com 2.8-1 +- Update to latest upstream version. +- Guidelines fixes. + * Tue Feb 08 2011 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 2.7-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/remove-test-deps.patch b/remove-test-deps.patch index 8953d15..d83d4e5 100644 --- a/remove-test-deps.patch +++ b/remove-test-deps.patch @@ -1,6 +1,6 @@ ---- pom.xml.sav 2010-07-19 17:00:50.000000000 +0300 -+++ pom.xml 2010-07-19 17:24:35.896986800 +0300 -@@ -212,12 +212,6 @@ under the License. +--- pom.xml.sav 2011-05-02 00:47:52.000000000 +0300 ++++ pom.xml 2011-05-11 13:03:43.411039567 +0300 +@@ -220,12 +220,6 @@ under the License. <scope>test</scope> </dependency> <dependency> @@ -13,16 +13,16 @@ <groupId>org.apache.maven.plugin-testing</groupId> <artifactId>maven-plugin-testing-harness</artifactId> <version>1.2</version> -@@ -230,12 +224,6 @@ under the License. +@@ -237,12 +231,6 @@ under the License. + <version>6.1.19</version> <scope>test</scope> </dependency> - <dependency> +- <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-client</artifactId> - <version>6.1.19</version> - <scope>test</scope> - </dependency> -- <dependency> - <groupId>org.apache.maven.shared</groupId> - <artifactId>maven-common-artifact-filters</artifactId> - <version>1.2</version> + </dependencies> + + <build> diff --git a/sources b/sources index 8f47c51..6da96c5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bc81f1aa7bf6e6c25f821de3cf62536e maven-javadoc-plugin-2.7.tar.xz +db1de84284174b0b59150ffb8132e564 maven-javadoc-plugin-2.8-source-release.zip