rpms/findbugs/devel findbugs-asm-version.patch, NONE, 1.1 findbugs.spec, 1.7, 1.8

[richardfearn]

Author: richardfearn

Update of /cvs/pkgs/rpms/findbugs/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv2970

Modified Files:
	findbugs.spec 
Added Files:
	findbugs-asm-version.patch 
Log Message:
Rebuild for ASM 3.2, to fix FTBFS


findbugs-asm-version.patch:
 build.xml                |    6 +++---
 etc/MANIFEST-findbugs.MF |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE findbugs-asm-version.patch ---
diff -urN findbugs-1.3.9-ORIGINAL/build.xml findbugs-1.3.9/build.xml
--- findbugs-1.3.9-ORIGINAL/build.xml	2010-06-02 19:22:17.000000000 +0100
+++ findbugs-1.3.9/build.xml	2010-06-02 19:22:38.000000000 +0100
@@ -60,9 +60,9 @@
 		<pathelement location="${systemjar.dir}/findbugs-bcel.jar"/>
 		<pathelement location="${systemjar.dir}/dom4j-1.6.1.jar"/>
 		<pathelement location="${systemjar.dir}/junit4.jar"/>
-		<pathelement location="${systemjar.dir}/objectweb-asm/asm-3.1.jar"/>
-		<pathelement location="${systemjar.dir}/objectweb-asm/asm-commons-3.1.jar"/>
-		<pathelement location="${systemjar.dir}/objectweb-asm/asm-tree-3.1.jar"/>
+		<pathelement location="${systemjar.dir}/objectweb-asm/asm-3.2.jar"/>
+		<pathelement location="${systemjar.dir}/objectweb-asm/asm-commons-3.2.jar"/>
+		<pathelement location="${systemjar.dir}/objectweb-asm/asm-tree-3.2.jar"/>
 		<pathelement location="${systemjar.dir}/jaxen-1.1.1.jar"/>		
 		<pathelement location="${systemjar.dir}/jsr-305.jar"/>
 		<pathelement location="${systemjar.dir}/jFormatString.jar"/>
diff -urN 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	2010-06-02 19:22:17.000000000 +0100
+++ findbugs-1.3.9/etc/MANIFEST-findbugs.MF	2010-06-02 19:26:11.000000000 +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-3.1.jar objectweb-asm/asm-tree-3.1.jar objectweb-asm/asm-commons-3.1.jar jsr-305.jar jFormatString.jar commons-lang.jar
+Class-Path: findbugs-bcel.jar dom4j-1.6.1.jar jaxen-1.1.1.jar objectweb-asm/asm-3.2.jar objectweb-asm/asm-tree-3.2.jar objectweb-asm/asm-commons-3.2.jar jsr-305.jar jFormatString.jar commons-lang.jar


Index: findbugs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/findbugs/devel/findbugs.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- findbugs.spec	14 Jan 2010 17:49:07 -0000	1.7
+++ findbugs.spec	2 Jun 2010 19:04:22 -0000	1.8
@@ -5,7 +5,7 @@
 
 Name:           findbugs
 Version:        1.3.9
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Find bugs in Java code
 
 Group:          Development/Languages
@@ -14,10 +14,18 @@ URL:            http://findbugs.sourcefo
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}-source.zip
 Source1:        findbugs-ant
 Source2:        findbugs-tools-README
+
 # This patch has not been submitted upstream, as it contains Fedora-specific
 # changes.  It looks in /usr/share/java for jar files at both compile time and
 # run time, instead of in findbugs' lib directory.
 Patch0:         findbugs-1.3.9-build.patch
+
+# Build against ASM 3.2 instead of 3.1. Already changed upstream; see:
+# http://code.google.com/p/findbugs/source/detail?r=11757
+# http://code.google.com/p/findbugs/source/detail?r=11758
+# http://code.google.com/p/findbugs/source/detail?r=11795
+Patch1:         findbugs-asm-version.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -83,6 +91,7 @@ README.fedora for more information.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 cp -p %{SOURCE2} README.fedora
 
@@ -183,6 +192,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadir}/findbugs-tools*
 
 %changelog
+* Wed Jun  2 2010 Richard Fearn <richardfearn at gmail.com> - 1.3.9-3
+- Rebuild for ASM 3.2
+
 * Thu Jan 14 2010 Jerry James <loganjerry at gmail.com> - 1.3.9-2
 - Rebuild for jdepend 2.9.1 (bz 555476)