[maven-jxr] Update to upstream 2.3. release.

[Alexander Kurtakov]

commit 5d10f40c4969db37455e32a31eaf2b7792cc4fd0
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Wed Jul 20 13:46:33 2011 +0300

    Update to upstream 2.3. release.

 .gitignore               |    1 +
 add-oro-dep.patch        |   13 +++++++++++++
 maven-jxr-jpp-depmap.xml |   14 --------------
 maven-jxr.spec           |   41 ++++++++++-------------------------------
 sources                  |    2 +-
 5 files changed, 25 insertions(+), 46 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4f467e2..4895980 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 maven-jxr-2.1.tar.bz2
 jxr-2.2-source-release.zip
+jxr-2.3-source-release.zip
diff --git a/add-oro-dep.patch b/add-oro-dep.patch
new file mode 100644
index 0000000..3ff990f
--- /dev/null
+++ b/add-oro-dep.patch
@@ -0,0 +1,13 @@
+--- maven-jxr/pom.xml.oro	2011-07-15 12:48:50.000000000 +0300
++++ maven-jxr/pom.xml	2011-07-20 13:37:35.699740540 +0300
+@@ -112,6 +112,10 @@ under the License.
+       <artifactId>plexus-utils</artifactId>
+       <version>1.5.8</version>
+     </dependency>
++     <dependency>
++      <groupId>oro</groupId>
++      <artifactId>oro</artifactId>
++    </dependency>
+ 
+     <dependency>
+       <groupId>org.apache.velocity</groupId>
diff --git a/maven-jxr.spec b/maven-jxr.spec
index 6126bb5..94ecd0b 100644
--- a/maven-jxr.spec
+++ b/maven-jxr.spec
@@ -29,21 +29,21 @@
 #
 
 Name:           maven-jxr
-Version:        2.2
-Release:        3%{?dist}
+Version:        2.3
+Release:        1%{?dist}
 Epoch:          0
 Summary:        Source cross referencing tool
 License:        ASL 2.0
 Group:          Development/Tools
 URL:            http://maven.apache.org/doxia/
 
-Source0:        http://repo2.maven.org/maven2/org/apache/maven/jxr/jxr/2.2/jxr-2.2-source-release.zip
-Source1:        %{name}-jpp-depmap.xml
+Source0:        http://repo2.maven.org/maven2/org/apache/maven/jxr/jxr/%{version}/jxr-%{version}-source-release.zip
+Patch0:         add-oro-dep.patch
 
 BuildArch:      noarch
 
 BuildRequires:  jpackage-utils >= 0:1.7.2
-BuildRequires:  maven2 >= 2.0.4
+BuildRequires:  maven
 BuildRequires:  maven-resources-plugin
 BuildRequires:  maven-compiler-plugin
 BuildRequires:  maven-resources-plugin
@@ -69,9 +69,6 @@ Requires:       jakarta-oro >= 2.0.8
 Requires:       plexus-utils >= 1.2
 Requires:       velocity >= 1.4
 
-Requires(post):    jpackage-utils >= 0:1.7.2
-Requires(postun):  jpackage-utils >= 0:1.7.2
-
 %description
 Maven JXR is a source cross referencing tool.
 
@@ -93,26 +90,20 @@ Maven plugin for JXR.
 
 %prep
 %setup -q -n jxr-%{version}
+%patch0
 
 %build
 
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mkdir -p $MAVEN_REPO_LOCAL
-
 # The test failures seem to have something to do with:
 # http://jira.codehaus.org/browse/MCHANGES-88
 # We can investigate when we upgrade to 2.2.x to see if they still occur.
 # Update: Seems that tests fail because they are trying to access
 # plexus component descriptors which seem to be different?
-    mvn-jpp \
-        -e \
-        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-        -Dmaven2.jpp.depmap.file=%{SOURCE1} \
+mvn-rpmbuild \
         -Dmaven.test.failure.ignore=true \
         install javadoc:aggregate
 
 %install
-rm -rf $RPM_BUILD_ROOT
 # jars/poms
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
 install -d -m 755 $RPM_BUILD_ROOT/%{_mavenpomdir}
@@ -139,40 +130,28 @@ install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 cp -pr target/site/apidocs/* \
                 $RPM_BUILD_ROOT%{_javadocdir}/%{name}/
 
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
-%post -n maven-plugin-jxr
-%update_maven_depmap
-
-%postun -n maven-plugin-jxr
-%update_maven_depmap
-
 %pre javadoc
 # workaround for rpm bug, can be removed in F-17
 [ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
 rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 
 %files
-%defattr(-,root,root,-)
 %{_javadir}/%{name}*.jar
 %{_mavenpomdir}/JPP-%{name}-parent.pom
 %{_mavenpomdir}/JPP-%{name}.pom
 %{_mavendepmapfragdir}/%{name}
 
 %files javadoc
-%defattr(-,root,root,-)
 %doc %{_javadocdir}/*
 
 %files -n maven-plugin-jxr
-%defattr(-,root,root,-)
 %{_mavenpomdir}/JPP-maven-plugin-jxr.pom
 %{_javadir}/maven-plugin-jxr*.jar
 
 %changelog
+* Wed Jul 20 2011 Alexander Kurtakov <akurtako at redhat.com> 0:2.3-1
+- Update to upstream 2.3. release.
+
 * Sun Mar 13 2011 Mat Booth <fedora at matbooth.co.uk> 0:2.2-3
 - Maven plug-in sub-package should require the core package.
 - Use _mavenpomdir macro.
diff --git a/sources b/sources
index 427e44f..3c3aad0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-991f20e0ce9e8d16df9bfaf14fd4f75e  jxr-2.2-source-release.zip
+be005f2b21ba29508369b8c1ab211a9e  jxr-2.3-source-release.zip