[pmd/f13/master: 8/8] Fix version dependencies for F-13.

[Jerry James]

commit a184c6640e8b3dbb83e2f37b390c7fce001c0866
Author: Jerry James <loganjerry at gmail.com>
Date:   Mon Nov 29 13:07:21 2010 -0700

    Fix version dependencies for F-13.

 pmd-4.2.5-build.patch |    9 +++------
 pmd.spec              |   12 +++---------
 2 files changed, 6 insertions(+), 15 deletions(-)
---
diff --git a/pmd-4.2.5-build.patch b/pmd-4.2.5-build.patch
index 1fedef8..b33e0ca 100644
--- a/pmd-4.2.5-build.patch
+++ b/pmd-4.2.5-build.patch
@@ -1,15 +1,12 @@
 --- bin/build.xml.orig	2009-01-27 13:24:02.000000000 -0700
 +++ bin/build.xml	2010-06-02 09:32:41.472666527 -0600
-@@ -12,10 +12,9 @@
- 	<property name="dir.regress" value="regress/" />
- 	<property name="version" value="4.2.5" />
+@@ -14,8 +14,7 @@
  
--	<property name="asm.version" value="3.1" />
-+	<property name="asm.version" value="3.2" />
+	<property name="asm.version" value="3.1" />
  	<property name="jaxen.version" value="1.1.1" />
 -	<property name="junit.version" value="4.4" />
 -	<property name="retroweaver.version" value="2.0.5" />
-+	<property name="junit.version" value="4.8.2" />
++	<property name="junit.version" value="4.6" />
  	<property name="javacc-home.path" value="${dir.lib}" />
  
  	<!--Settings-->
diff --git a/pmd.spec b/pmd.spec
index 298871a..cf8f159 100644
--- a/pmd.spec
+++ b/pmd.spec
@@ -29,7 +29,7 @@
 #
 Name:           pmd
 Version:        4.2.5
-Release:        8%{?dist}
+Release:        6%{?dist}
 Epoch:          0
 Summary:        Scans Java source code and looks for potential problems
 License:        BSD
@@ -51,7 +51,7 @@ BuildRequires:  jpackage-utils >= 0:1.6
 BuildRequires:  java-devel
 BuildRequires:  ant >= 0:1.6
 BuildRequires:  ant-junit
-BuildRequires:  junit4 = 0:4.8.2
+BuildRequires:  junit4 = 0:4.6
 BuildRequires:  jaxen >= 0:1.1.1
 BuildRequires:  objectweb-asm >= 0:3.1
 BuildRequires:  objectweb-asm-javadoc >= 0:3.1
@@ -159,17 +159,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadocdir}/*
 
 %changelog
-* Mon Nov 29 2010 Jerry James <loganjerry at gmail.com> - 0:4.2.5-8
+* Mon Nov 29 2010 Jerry James <loganjerry at gmail.com> - 0:4.2.5-6
 - 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.
-
-* Wed Jun  2 2010 Jerry James <loganjerry at gmail.com> - 0:4.2.5-6
-- Update objectweb-asm dependency for version 3.2.
-
 * Fri Nov 20 2009 Jerry James <loganjerry at gmail.com> - 0:4.2.5-5
 - Update junit4 dependency for junit 4.6.