[findbugs] Add noUpdateChecks plugin, and fix bug #1157

[richardfearn]

commit 5a8899154bdc184dd13290b505b3228b5dd5589e
Author: Richard Fearn <richard.fearn at diamond.ac.uk>
Date:   Sat Oct 26 19:29:34 2013 +0100

    Add noUpdateChecks plugin, and fix bug #1157

 .gitignore              |    1 +
 findbugs-bug-1157.patch |   13 +++++++++++++
 findbugs.spec           |   29 +++++++++++++++++++++++++++--
 sources                 |    1 +
 4 files changed, 42 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 449c6a2..bb6afd5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 findbugs-1.3.9-source.zip
 /findbugs-2.0.2-source.zip
+/noUpdateChecks-plugin-20131026svn14849.tgz
diff --git a/findbugs-bug-1157.patch b/findbugs-bug-1157.patch
new file mode 100644
index 0000000..24d9450
--- /dev/null
+++ b/findbugs-bug-1157.patch
@@ -0,0 +1,13 @@
+diff --git a/src/gui/edu/umd/cs/findbugs/gui2/Driver.java b/src/gui/edu/umd/cs/findbugs/gui2/Driver.java
+index b4622c5..54ca6e9 100644
+--- a/src/gui/edu/umd/cs/findbugs/gui2/Driver.java
++++ b/src/gui/edu/umd/cs/findbugs/gui2/Driver.java
+@@ -141,7 +141,7 @@ public class Driver {
+         for (String pid : plugins) {
+             Plugin plugin = Plugin.getByPluginId(pid);
+             if (plugin != null) {
+-                if (plugin.cannotDisable())
++                if (!enabled && plugin.cannotDisable())
+                     JOptionPane.showMessageDialog(null,
+                             "Cannot disable plugin: " + plugin.getPluginId() + "\n" + plugin.getShortDescription(),
+                             "Cannot disable plugin", JOptionPane.ERROR_MESSAGE);
diff --git a/findbugs.spec b/findbugs.spec
index 92ae08c..e6e605f 100644
--- a/findbugs.spec
+++ b/findbugs.spec
@@ -1,6 +1,8 @@
+%global noupdatechecks_version 20131026svn14849
+
 Name:           findbugs
 Version:        2.0.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Find bugs in Java code
 
 Group:          Development/Languages
@@ -14,6 +16,12 @@ Source2:        findbugs-tools-README
 Source3:        http://search.maven.org/remotecontent?filepath=com/google/code/findbugs/findbugs/2.0.1/findbugs-2.0.1.pom
 Source4:        http://repo1.maven.org/maven2/net/sourceforge/findbugs/annotations/1.3.2/annotations-1.3.2.pom
 
+# This archive contains the source for the noUpdateChecks plugin.
+# It was created with:
+#   $ svn export http://findbugs.googlecode.com/svn/trunk/plugins/noUpdateChecks -r 14849 noUpdateChecks-plugin-20131026svn14849
+#   $ tar -zcf noUpdateChecks-plugin-20131026svn14849.tgz noUpdateChecks-plugin-20131026svn14849
+Source5:        noUpdateChecks-plugin-%{noupdatechecks_version}.tgz
+
 # This patch has not been submitted upstream, as it contains Fedora-specific
 # changes.  It looks in /usr/share/java for jar files at compile time, instead
 # of in findbugs' lib directory.
@@ -25,6 +33,9 @@ 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
@@ -89,8 +100,10 @@ README.fedora for more information.
 
 %prep
 %setup -q
+%setup -a 5
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 cp -p %{SOURCE3} findbugs.pom
 sed -i 's/2\.0\.1/2\.0\.2/g' findbugs.pom
@@ -122,8 +135,14 @@ make
 popd
 
 # Package up the tools
-cd build/classes
+pushd build/classes
 jar cf ../../lib/findbugs-tools.jar edu/umd/cs/findbugs/tools
+popd
+
+# Build the noUpdateChecks plugin
+pushd noUpdateChecks-plugin-%{noupdatechecks_version}
+ant plugin-jar
+popd
 
 %install
 # Install the jars
@@ -153,6 +172,9 @@ done
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
 cp -a etc plugin $RPM_BUILD_ROOT%{_datadir}/%{name}
 
+# Install the noUpdateChecks plugin
+cp -p noUpdateChecks-plugin-%{noupdatechecks_version}/build/noUpdateChecks.jar $RPM_BUILD_ROOT%{_datadir}/%{name}/plugin
+
 # Remove now unnecessary build-only manual files so %%doc doesn't get them
 rm -f doc/manual*.xml doc/manual*.xsl
 
@@ -189,6 +211,9 @@ cp annotations.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-annotations.pom
 %{_javadir}/findbugs-tools.jar
 
 %changelog
+* Sat Oct 26 2013 Richard Fearn <richardfearn at gmail.com> - 2.0.2-2
+- Add noUpdateChecks plugin, and fix bug #1157
+
 * Wed Sep 11 2013 Richard Fearn <richardfearn at gmail.com> - 2.0.2-1
 - Update to 2.0.2
 
diff --git a/sources b/sources
index 5745b45..7b30c6c 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 35ae20351c72885d241e7b7f8fb9cb2d  findbugs-2.0.2-source.zip
+f6ead169e65392441e9777faadf7418b  noUpdateChecks-plugin-20131026svn14849.tgz