[findbugs/f20] Update to 2.0.3; drop findbugs-bug-1157.patch

[richardfearn]

commit 8449f7ae72e7d5e24fb26a8d494197153fac2fa8
Author: Richard Fearn <richardfearn at gmail.com>
Date:   Mon Jan 13 21:10:41 2014 +0000

    Update to 2.0.3; drop findbugs-bug-1157.patch

 .gitignore              |    1 +
 findbugs-bug-1157.patch |   13 -------------
 findbugs-build.patch    |   10 +++++-----
 findbugs-fedora.patch   |    4 ++--
 findbugs.spec           |   12 ++++++------
 sources                 |    2 +-
 6 files changed, 15 insertions(+), 27 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bb6afd5..591f6a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 findbugs-1.3.9-source.zip
 /findbugs-2.0.2-source.zip
 /noUpdateChecks-plugin-20131026svn14849.tgz
+/findbugs-2.0.3-source.zip
diff --git a/findbugs-build.patch b/findbugs-build.patch
index c967f2d..c3a1061 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 0981cc5..bb52951 100644
 --- a/build.xml
 +++ b/build.xml
 @@ -18,6 +18,7 @@
@@ -10,7 +10,7 @@ index 89b95a6..44c8144 100644
      <property name="plugin.dir" value="plugin"/>
      <property name="build.dir" value="build"/>
      <property name="junit.dir" value="build/junit"/>
-@@ -59,24 +60,23 @@
+@@ -60,24 +61,23 @@
      <property name="version.props.file" value="${build.dir}/classes/edu/umd/cs/findbugs/version.properties"/>
  
      <path id="findbugs.classpath">
@@ -21,10 +21,10 @@ index 89b95a6..44c8144 100644
 -        <pathelement location="${jar.dir}/asm-3.3.jar"/>
 -        <pathelement location="${jar.dir}/asm-commons-3.3.jar"/>
 -        <pathelement location="${jar.dir}/asm-tree-3.3.jar"/>
--        <pathelement location="${jar.dir}/jaxen-1.1.1.jar"/>
+-        <pathelement location="${jar.dir}/jaxen-1.1.6.jar"/>
 -        <pathelement location="${jar.dir}/jsr305.jar"/>
 -        <pathelement location="${jar.dir}/jFormatString.jar"/>
--        <pathelement location="${jar.dir}/commons-lang-2.4.jar"/>
+-        <pathelement location="${jar.dir}/commons-lang-2.6.jar"/>
 -        <pathelement location="${jar.dir}/jcip-annotations.jar"/>
 +        <pathelement location="${systemjar.dir}/findbugs-bcel.jar"/>
 +        <pathelement location="${systemjar.dir}/dom4j.jar"/>
@@ -47,7 +47,7 @@ index 89b95a6..44c8144 100644
          <path refid="findbugs.classpath"/>
      </path>
  
-@@ -313,8 +313,6 @@
+@@ -329,8 +329,6 @@
              <fileset dir="${src.dir}">
                  <include name="**/annotations/*.java"/>
              </fileset>
diff --git a/findbugs-fedora.patch b/findbugs-fedora.patch
index 7b8d4d3..af0ac1b 100644
--- a/findbugs-fedora.patch
+++ b/findbugs-fedora.patch
@@ -1,11 +1,11 @@
 diff --git a/etc/MANIFEST-findbugs.MF b/etc/MANIFEST-findbugs.MF
-index 9f7dc04..9d885be 100644
+index 9ac9bfc..9d885be 100644
 --- a/etc/MANIFEST-findbugs.MF
 +++ b/etc/MANIFEST-findbugs.MF
 @@ -1,3 +1 @@
  Manifest-Version: 1.0
 -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
+-Class-Path: bcel.jar dom4j-1.6.1.jar jaxen-1.1.6.jar asm-3.3.jar asm-tree-3.3.jar asm-commons-3.3.jar jsr305.jar jFormatString.jar commons-lang-2.6.jar
 diff --git a/etc/script.properties b/etc/script.properties
 index f595a9a..0e28c6e 100644
 --- a/etc/script.properties
diff --git a/findbugs.spec b/findbugs.spec
index fc9dba1..507389d 100644
--- a/findbugs.spec
+++ b/findbugs.spec
@@ -1,8 +1,8 @@
 %global noupdatechecks_version 20131026svn14849
 
 Name:           findbugs
-Version:        2.0.2
-Release:        3%{?dist}
+Version:        2.0.3
+Release:        1%{?dist}
 Summary:        Find bugs in Java code
 
 Group:          Development/Languages
@@ -32,9 +32,6 @@ Patch0:         findbugs-build.patch
 #  - Simplify shell fragment that determines findbugs_home (also fixes #848612)
 Patch1:         findbugs-fedora.patch
 
-# Patch to fix bug #1157 (https://sourceforge.net/p/findbugs/bugs/1157/)
-Patch2:         findbugs-bug-1157.patch
-
 BuildArch:      noarch
 
 BuildRequires:  findbugs-bcel
@@ -102,7 +99,6 @@ README.fedora for more information.
 %setup -a 5
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 cp -p %{SOURCE2} README.fedora
 
@@ -205,6 +201,10 @@ cp %{SOURCE4} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-annotations.pom
 %{_javadir}/findbugs-tools.jar
 
 %changelog
+* Mon Jan 13 2014 Richard Fearn <richardfearn at gmail.com> - 2.0.3-1
+- Update to 2.0.3
+- Drop findbugs-bug-1157.patch as the bug is fixed in 2.0.3
+
 * Mon Jan 13 2014 Richard Fearn <richardfearn at gmail.com> - 2.0.2-3
 - Use actual 2.0.2 POMs from Maven Central
 
diff --git a/sources b/sources
index 7b30c6c..13ea81a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-35ae20351c72885d241e7b7f8fb9cb2d  findbugs-2.0.2-source.zip
+755c8bc7a6b1fec0492cc390ef92142b  findbugs-2.0.3-source.zip
 f6ead169e65392441e9777faadf7418b  noUpdateChecks-plugin-20131026svn14849.tgz