[java-sig-commits] [maven-changes-plugin] Update to latest upsteam (2.4)

[Stanislav Ochotnicky]

commit f2d5c6e6ee1328f2457fa5b4fcafe0beca115cdc
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com&gt;
Date:   Mon Mar 7 11:04:34 2011 +0100

    Update to latest upsteam (2.4)
    
    - Build with maven 3
    - Versionless jars & javadocs

 .gitignore                  |    1 +
 maven-changes-plugin.depmap |    7 ++++++
 maven-changes-plugin.spec   |   47 +++++++++++++++++++-----------------------
 sources                     |    2 +-
 4 files changed, 30 insertions(+), 27 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 333f55d..79d0e2f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 maven-changes-plugin-2.3.tar.xz
+/maven-changes-plugin-2.4.tar.xz
diff --git a/maven-changes-plugin.depmap b/maven-changes-plugin.depmap
index 1c5c369..364b8ec 100644
--- a/maven-changes-plugin.depmap
+++ b/maven-changes-plugin.depmap
@@ -1,6 +1,13 @@
 <dependencies>
     <dependency>
       <maven>
+        <groupId>javax.activation</groupId>
+        <artifactId>activation</artifactId>
+        <version>1.4</version>
+      </maven>
+    </dependency>
+    <dependency>
+      <maven>
         <groupId>org.apache.xmlrpc</groupId>
         <artifactId>xmlrpc-client</artifactId>
         <version>3.0</version>
diff --git a/maven-changes-plugin.spec b/maven-changes-plugin.spec
index 4c10b04..a500189 100644
--- a/maven-changes-plugin.spec
+++ b/maven-changes-plugin.spec
@@ -1,14 +1,13 @@
-
 Name:           maven-changes-plugin
-Version:        2.3
-Release:        2%{?dist}
+Version:        2.4
+Release:        1%{?dist}
 Summary:        Plugin to support reporting of changes between releases
 
 Group:          Development/Libraries
 License:        ASL 2.0
 URL:            http://maven.apache.org/plugins/%{name}
-# svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-changes-plugin-2.3
-# tar caf maven-changes-plugin-2.3.tar.xz maven-changes-plugin-2.3
+# svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-changes-plugin-2.4
+# tar caf maven-changes-plugin-2.4.tar.xz maven-changes-plugin-2.4
 Source0:        %{name}-%{version}.tar.xz
 Source1:        %{name}.depmap
 
@@ -17,14 +16,13 @@ Source1:        %{name}.depmap
 Patch0:         0001-xmlrpc3-common-dependency.patch
 Patch1:         0002-doxia-1.1-import-fix.patch
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 
 BuildRequires: java-devel >= 1:1.6.0
 BuildRequires: plexus-utils
 BuildRequires: ant-nodeps
-BuildRequires: maven2
+BuildRequires: maven
 BuildRequires: maven-install-plugin
 BuildRequires: maven-compiler-plugin
 BuildRequires: maven-plugin-plugin
@@ -74,23 +72,15 @@ API documentation for %{name}.
 %patch1 -p1
 
 %build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-# tests are skipped because package expects old doxia and doesn't work
-# with new one
-mvn-jpp -e \
-        -Dmaven2.jpp.depmap.file="%{SOURCE1}" \
-        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+mvn-rpmbuild -e -X \
+        -Dmaven.local.depmap.file="%{SOURCE1}" \
         -Dmaven.test.skip=true \
         install javadoc:javadoc
 
 %install
-rm -rf %{buildroot}
 
 # jars
-install -Dpm 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 -Dpm 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
 
 %add_to_maven_depmap org.apache.maven.plugins %{name} %{version} JPP %{name}
 
@@ -98,10 +88,14 @@ install -Dpm 644 target/%{name}-%{version}.jar
%{buildroot}%{_javadir}/%{name}-%
 install -Dpm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
 
 # javadoc
-install -dm 755 %{buildroot}%{_javadocdir}/%{name}-%{version}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
-ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
-rm -rf target/site/api*
+install -dm 755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
+
+%pre javadoc
+# workaround for rpm bug, can be removed in F-18
+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
+
 
 %post
 %update_maven_depmap
@@ -109,9 +103,6 @@ rm -rf target/site/api*
 %postun
 %update_maven_depmap
 
-%clean
-rm -rf %{buildroot}
-
 %files
 %defattr(-,root,root,-)
 %{_javadir}/*
@@ -120,10 +111,14 @@ rm -rf %{buildroot}
 
 %files javadoc
 %defattr(-,root,root,-)
-%{_javadocdir}/%{name}-%{version}
 %{_javadocdir}/%{name}
 
 %changelog
+* Fri Mar  4 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com&gt; - 2.4-1
+- Update to latest upsteam (2.4)
+- Build with maven 3
+- Versionless jars & javadocs
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org&gt; -
2.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 63772b5..2af4922 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-05bff2f973fd15a405a5d86a0dd51ce1  maven-changes-plugin-2.3.tar.xz
+6f29cee146495b6e71c9e0f08acb60a6  maven-changes-plugin-2.4.tar.xz