[findbugs] Depend on objectweb-asm3 (objectweb-asm is now ASM 5)

[richardfearn]

commit 4e896046d656a4d2ba7b2939c1856fcf2f872cd3
Author: Richard Fearn <richard.fearn at diamond.ac.uk>
Date:   Sun Dec 8 21:47:02 2013 +0000

    Depend on objectweb-asm3 (objectweb-asm is now ASM 5)

 findbugs-ant          |    4 ++--
 findbugs-build.patch  |    8 ++++----
 findbugs-fedora.patch |    8 ++++----
 findbugs.spec         |    9 ++++++---
 4 files changed, 16 insertions(+), 13 deletions(-)
---
diff --git a/findbugs-ant b/findbugs-ant
index 8f90b79..265788b 100644
--- a/findbugs-ant
+++ b/findbugs-ant
@@ -1,3 +1,3 @@
 findbugs ant/ant-findbugs apache-commons-lang dom4j findbugs-bcel jaxen
-jcip-annotations jFormatString jsr-305 junit objectweb-asm/asm
-objectweb-asm/asm-commons objectweb-asm/asm-tree
+jcip-annotations jFormatString jsr-305 junit objectweb-asm3/asm
+objectweb-asm3/asm-commons objectweb-asm3/asm-tree
diff --git a/findbugs-build.patch b/findbugs-build.patch
index c967f2d..f261ce0 100644
--- a/findbugs-build.patch
+++ b/findbugs-build.patch
@@ -1,5 +1,5 @@
 diff --git a/build.xml b/build.xml
-index 89b95a6..44c8144 100644
+index 89b95a6..3388ca4 100644
 --- a/build.xml
 +++ b/build.xml
 @@ -18,6 +18,7 @@
@@ -29,9 +29,9 @@ index 89b95a6..44c8144 100644
 +        <pathelement location="${systemjar.dir}/findbugs-bcel.jar"/>
 +        <pathelement location="${systemjar.dir}/dom4j.jar"/>
 +        <pathelement location="${systemjar.dir}/junit.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}/objectweb-asm3/asm.jar"/>
++        <pathelement location="${systemjar.dir}/objectweb-asm3/asm-commons.jar"/>
++        <pathelement location="${systemjar.dir}/objectweb-asm3/asm-tree.jar"/>
 +        <pathelement location="${systemjar.dir}/jaxen.jar"/>
 +        <pathelement location="${systemjar.dir}/jsr-305.jar"/>
 +        <pathelement location="${systemjar.dir}/jFormatString.jar"/>
diff --git a/findbugs-fedora.patch b/findbugs-fedora.patch
index 7b8d4d3..1451ae7 100644
--- a/findbugs-fedora.patch
+++ b/findbugs-fedora.patch
@@ -7,7 +7,7 @@ index 9f7dc04..9d885be 100644
 -Main-Class: edu.umd.cs.findbugs.LaunchAppropriateUI
 -Class-Path: bcel.jar dom4j-1.6.1.jar jaxen-1.1.1.jar asm-3.3.jar asm-tree-3.3.jar asm-commons-3.3.jar jsr305.jar jFormatString.jar commons-lang-2.4.jar
 diff --git a/etc/script.properties b/etc/script.properties
-index f595a9a..0e28c6e 100644
+index f595a9a..501a16c 100644
 --- a/etc/script.properties
 +++ b/etc/script.properties
 @@ -3,48 +3,8 @@
@@ -72,7 +72,7 @@ index f595a9a..0e28c6e 100644
 -    fb_appjar=\${fb_appjar:-"$findbugs_home/lib/findbugs.jar"}\n\
 +    \n\
 +    fb_classpath=\$(build-classpath findbugs findbugs-bcel dom4j jaxen \\\n\
-+    \tobjectweb-asm/asm objectweb-asm/asm-tree objectweb-asm/asm-commons \\\n\
++    \tobjectweb-asm3/asm objectweb-asm3/asm-tree objectweb-asm3/asm-commons \\\n\
 +    \tjsr-305 jFormatString apache-commons-lang)\n\
 +    \n\
      set -f\n\
@@ -110,7 +110,7 @@ index d5bd992..779a61a 100644
  	fb_mainclass="edu.umd.cs.findbugs.ShowHelp"
  	@WRAP_JAVA@
 diff --git a/src/scripts/standard/findbugs2 b/src/scripts/standard/findbugs2
-index 36c054b..55fcf5e 100644
+index 36c054b..dccfa99 100644
 --- a/src/scripts/standard/findbugs2
 +++ b/src/scripts/standard/findbugs2
 @@ -109,13 +109,19 @@ if [ $fb_osname = "Darwin" ]; then
@@ -118,7 +118,7 @@ index 36c054b..55fcf5e 100644
  fi
  
 +fb_classpath=$(build-classpath findbugs findbugs-bcel dom4j jaxen \
-+	objectweb-asm/asm objectweb-asm/asm-tree objectweb-asm/asm-commons \
++	objectweb-asm3/asm objectweb-asm3/asm-tree objectweb-asm3/asm-commons \
 +	jsr-305 jFormatString apache-commons-lang)
 +
 +fb_mainclass=edu.umd.cs.findbugs.LaunchAppropriateUI
diff --git a/findbugs.spec b/findbugs.spec
index e6e605f..342cda0 100644
--- a/findbugs.spec
+++ b/findbugs.spec
@@ -2,7 +2,7 @@
 
 Name:           findbugs
 Version:        2.0.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Find bugs in Java code
 
 Group:          Development/Languages
@@ -50,7 +50,7 @@ BuildRequires:  jFormatString
 BuildRequires:  jpackage-utils
 BuildRequires:  jsr-305
 BuildRequires:  junit4
-BuildRequires:  objectweb-asm
+BuildRequires:  objectweb-asm3
 BuildRequires:  perl
 BuildRequires:  tex(latex)
 BuildRequires:  texlive-preprint
@@ -63,7 +63,7 @@ Requires:       jFormatString
 Requires:       jpackage-utils
 Requires:       jsr-305
 Requires:       junit4
-Requires:       objectweb-asm
+Requires:       objectweb-asm3
 
 %description
 Findbugs is a program which uses static analysis to look for bugs in Java code.
@@ -211,6 +211,9 @@ cp annotations.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-annotations.pom
 %{_javadir}/findbugs-tools.jar
 
 %changelog
+* Sun Dec 08 2013 Richard Fearn <richardfearn at gmail.com> - 2.0.2-3
+- Depend on objectweb-asm3 (objectweb-asm is now ASM 5)
+
 * Sat Oct 26 2013 Richard Fearn <richardfearn at gmail.com> - 2.0.2-2
 - Add noUpdateChecks plugin, and fix bug #1157