[pmd] * Mon Nov 29 2010 Jerry James <loganjerry at gmail.com> - 0:4.2.5-8 - Fix maven ant dep (bz 643748). -

[Jerry James]

commit f0ee4c9489bb7986f08fcde05495197516c6a523
Author: Jerry James <loganjerry at gmail.com>
Date:   Mon Nov 29 11:41:01 2010 -0700

    * Mon Nov 29 2010 Jerry James <loganjerry at gmail.com> - 0:4.2.5-8
    - Fix maven ant dep (bz 643748).
    - Add LICENSE.txt to -javadoc package.
    - Remove BuildRoot tag.

 pmd-4.2.5-antdep.patch |   14 ++++++++++++++
 pmd.spec               |   13 +++++++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)
---
diff --git a/pmd-4.2.5-antdep.patch b/pmd-4.2.5-antdep.patch
new file mode 100644
index 0000000..f46af7e
--- /dev/null
+++ b/pmd-4.2.5-antdep.patch
@@ -0,0 +1,14 @@
+--- pom.xml.orig	2009-02-08 17:52:32.000000000 -0700
++++ pom.xml	2010-11-29 11:30:26.147097635 -0700
+@@ -254,9 +254,9 @@
+   </build>
+   <dependencies>
+     <dependency>
+-      <groupId>ant</groupId>
++      <groupId>org.apache.ant</groupId>
+       <artifactId>ant</artifactId>
+-      <version>1.6</version>
++      <version>1.8.1</version>
+     </dependency>
+     <dependency>
+       <groupId>jaxen</groupId>
diff --git a/pmd.spec b/pmd.spec
index 68d2bef..298871a 100644
--- a/pmd.spec
+++ b/pmd.spec
@@ -29,7 +29,7 @@
 #
 Name:           pmd
 Version:        4.2.5
-Release:        7%{?dist}
+Release:        8%{?dist}
 Epoch:          0
 Summary:        Scans Java source code and looks for potential problems
 License:        BSD
@@ -42,6 +42,9 @@ Patch0:         pmd-4.2.5-build.patch
 # This patch was sent upstream on 11 Feb 2009.  It fixes a null pointer
 # exception when using the nicerhtml output format.
 Patch1:         pmd-4.2.4-nicerhtml.patch
+# This patch has not been sent upstream.  It updates an ant dep in a pom file
+# to use the latest groupId for ant.
+Patch2:         pmd-4.2.5-antdep.patch
 Url:            http://pmd.sourceforge.net/
 
 BuildRequires:  jpackage-utils >= 0:1.6
@@ -63,7 +66,6 @@ Requires(post):       jpackage-utils
 Requires(postun):     jpackage-utils
 Group:          Development/Tools
 Buildarch:      noarch
-Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Provides:       %{name}-manual = %{epoch}:%{version}-%{release}
 Obsoletes:      %{name}-manual < 0:4.0.0-1
@@ -93,6 +95,7 @@ Javadoc for %{name}.
 %setup -q
 %patch0
 %patch1
+%patch2
 
 # remove all binary libs
 find . -name "*.jar" -exec rm -f {} \;
@@ -152,9 +155,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files javadoc
 %defattr(0644,root,root,0755)
+%doc LICENSE.txt
 %{_javadocdir}/*
 
 %changelog
+* Mon Nov 29 2010 Jerry James <loganjerry at gmail.com> - 0:4.2.5-8
+- Fix maven ant dep (bz 643748).
+- Add LICENSE.txt to -javadoc package.
+- Remove BuildRoot tag.
+
 * Tue Sep  7 2010 Jerry James <loganjerry at gmail.com> - 0:4.2.5-7
 - Update junit4 dependency for junit 4.8.2.