[findbugs] Use Fedora JAR filenames (fixes FTBFS)

[richardfearn]

commit 466b43aac6897e9e74441fe87c52fd1d68b7f179
Author: Richard Fearn <richardfearn at gmail.com>
Date:   Sat Jul 28 18:32:27 2012 +0100

    Use Fedora JAR filenames (fixes FTBFS)

 findbugs-jar-filenames.patch |   39 +++++++++++++++++++++++++++++++++++++++
 findbugs.spec                |    9 ++++++++-
 2 files changed, 47 insertions(+), 1 deletions(-)
---
diff --git a/findbugs-jar-filenames.patch b/findbugs-jar-filenames.patch
new file mode 100644
index 0000000..591ab12
--- /dev/null
+++ b/findbugs-jar-filenames.patch
@@ -0,0 +1,39 @@
+diff -ur findbugs-1.3.9-ORIGINAL/build.xml findbugs-1.3.9/build.xml
+--- findbugs-1.3.9-ORIGINAL/build.xml	2012-07-28 18:19:37.697925429 +0100
++++ findbugs-1.3.9/build.xml	2012-07-28 18:20:09.362968800 +0100
+@@ -58,15 +58,15 @@
+ 	
+ 	<path id="findbugs.classpath">
+ 		<pathelement location="${systemjar.dir}/findbugs-bcel.jar"/>
+-		<pathelement location="${systemjar.dir}/dom4j-1.6.1.jar"/>
++		<pathelement location="${systemjar.dir}/dom4j.jar"/>
+ 		<pathelement location="${systemjar.dir}/junit4.jar"/>
+ 		<pathelement location="${systemjar.dir}/objectweb-asm/asm.jar"/>
+ 		<pathelement location="${systemjar.dir}/objectweb-asm/asm-commons.jar"/>
+ 		<pathelement location="${systemjar.dir}/objectweb-asm/asm-tree.jar"/>
+-		<pathelement location="${systemjar.dir}/jaxen-1.1.1.jar"/>		
++		<pathelement location="${systemjar.dir}/jaxen.jar"/>		
+ 		<pathelement location="${systemjar.dir}/jsr-305.jar"/>
+ 		<pathelement location="${systemjar.dir}/jFormatString.jar"/>
+-		<pathelement location="${systemjar.dir}/commons-lang.jar"/>
++		<pathelement location="${systemjar.dir}/apache-commons-lang.jar"/>
+ 		<pathelement location="${systemjar.dir}/jcip-annotations.jar"/>
+ 		<pathelement location="${systemjar.dir}/ant.jar"/>
+ 	</path>
+@@ -74,7 +74,7 @@
+ 	<path id="tools.classpath">
+ 		<pathelement location="${classes.dir}"/>
+ 		<pathelement location="${jar.dir}/findbugs.jar"/>
+-		<pathelement location="${systemjar.dir}/jdepend-2.9.1.jar"/>
++		<pathelement location="${systemjar.dir}/jdepend.jar"/>
+ 		<path refid="findbugs.classpath"/>
+ 	</path>
+ 
+diff -ur findbugs-1.3.9-ORIGINAL/etc/MANIFEST-findbugs.MF findbugs-1.3.9/etc/MANIFEST-findbugs.MF
+--- findbugs-1.3.9-ORIGINAL/etc/MANIFEST-findbugs.MF	2012-07-28 18:19:37.697925429 +0100
++++ findbugs-1.3.9/etc/MANIFEST-findbugs.MF	2012-07-28 18:23:54.275270153 +0100
+@@ -1,3 +1,3 @@
+ Manifest-Version: 1.0
+ Main-Class: edu.umd.cs.findbugs.LaunchAppropriateUI
+-Class-Path: findbugs-bcel.jar dom4j-1.6.1.jar jaxen-1.1.1.jar objectweb-asm/asm.jar objectweb-asm/asm-tree.jar objectweb-asm/asm-commons.jar jsr-305.jar jFormatString.jar commons-lang.jar
++Class-Path: findbugs-bcel.jar dom4j.jar jaxen.jar objectweb-asm/asm.jar objectweb-asm/asm-tree.jar objectweb-asm/asm-commons.jar jsr-305.jar jFormatString.jar commons-lang.jar
diff --git a/findbugs.spec b/findbugs.spec
index 1ed89ff..e5b4853 100644
--- a/findbugs.spec
+++ b/findbugs.spec
@@ -5,7 +5,7 @@
 
 Name:           findbugs
 Version:        1.3.9
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Find bugs in Java code
 
 Group:          Development/Languages
@@ -33,6 +33,9 @@ Patch1:         findbugs-asm-version.patch
 # Updates the version information in POMs, as we don't have up to date POM's :(
 Patch2:         findbugs-1.3.9-pom.patch
 
+# Fedora-specific patch: use Fedora JAR filenames
+Patch3:         findbugs-jar-filenames.patch
+
 BuildArch:      noarch
 
 BuildRequires:  findbugs-bcel
@@ -103,6 +106,7 @@ cp -p %{SOURCE3} findbugs.pom
 cp -p %{SOURCE4} annotations.pom
 
 %patch2 -p1
+%patch3 -p1
 
 cp -p %{SOURCE2} README.fedora
 
@@ -205,6 +209,9 @@ cp annotations.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-annotations.pom
 %{_javadir}/findbugs-tools*
 
 %changelog
+* Sat Jul 28 2012 Richard Fearn <richardfearn at gmail.com> - 1.3.9-10
+- Use Fedora JAR filenames (fixes FTBFS)
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.9-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild