[findbugs] Remove Class-Path entry from findbugs.jar manifest (#575632); also remove Main-Class entry

[richardfearn]

commit a255572a076af2f565729786281050149584df61
Author: Richard Fearn <richardfearn at gmail.com>
Date:   Sat Jul 28 23:57:45 2012 +0100

    Remove Class-Path entry from findbugs.jar manifest (#575632); also remove Main-Class entry

 findbugs-remove-classpath.patch |   45 +++++++++++++++++++++++++++++++++++++++
 findbugs.spec                   |   15 ++++++++++++-
 2 files changed, 59 insertions(+), 1 deletions(-)
---
diff --git a/findbugs-remove-classpath.patch b/findbugs-remove-classpath.patch
new file mode 100644
index 0000000..63311d0
--- /dev/null
+++ b/findbugs-remove-classpath.patch
@@ -0,0 +1,45 @@
+diff -ur findbugs-1.3.9-ORIGINAL/etc/script.properties findbugs-1.3.9/etc/script.properties
+--- findbugs-1.3.9-ORIGINAL/etc/script.properties	2012-07-28 22:30:00.767724162 +0100
++++ findbugs-1.3.9/etc/script.properties	2012-07-28 23:05:37.476928168 +0100
+@@ -94,10 +94,15 @@
+ 	fb_javacmd=\${fb_javacmd:-"java"}\n\
+ 	fb_maxheap=\${fb_maxheap:-"-Xmx584m"}\n\
+ 	fb_appjar=\${fb_appjar:-"/usr/share/java/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\
++	\tjsr-305 jFormatString apache-commons-lang)\n\
++	\n\
+ 	set -f\n\
+ 	#echo command: \\\n\
+ 	exec "$fb_javacmd" \\\n\
+-	\t-classpath "$fb_appjar$fb_pathsep$CLASSPATH" \\\n\
++	\t-classpath "$fb_classpath" \\\n\
+ 	\t-Dfindbugs.home="$findbugs_home"\\\n\
+ 	\t$fb_maxheap $fb_jvmargs $fb_mainclass \${@:+"$@"} $fb_appargs
+ 
+diff -ur findbugs-1.3.9-ORIGINAL/src/scripts/standard/findbugs2 findbugs-1.3.9/src/scripts/standard/findbugs2
+--- findbugs-1.3.9-ORIGINAL/src/scripts/standard/findbugs2	2012-07-28 22:30:00.768724163 +0100
++++ findbugs-1.3.9/src/scripts/standard/findbugs2	2012-07-28 23:35:01.750499860 +0100
+@@ -109,13 +109,19 @@
+ 		-Dapple.laf.useScreenMenuBar=true"
+ fi
+ 
++fb_classpath=$(build-classpath findbugs findbugs-bcel dom4j jaxen \
++	objectweb-asm/asm objectweb-asm/asm-tree objectweb-asm/asm-commons \
++	jsr-305 jFormatString apache-commons-lang)
++
++fb_mainclass=edu.umd.cs.findbugs.LaunchAppropriateUI
++
+ #
+ # Launch JVM
+ #
+ exec "$fb_javacmd" \
+-	-classpath "$fb_appjar$fb_pathsep$CLASSPATH" \
++	-classpath "$fb_classpath" \
+ 	-Dfindbugs.home="$findbugs_home" \
+ 	$jvm_debug $jvm_maxheap $jvm_ea $jvm_conservespace $jvm_user_props \
+ 	-Dfindbugs.launchUI=$fb_launchui \
+-	-jar /usr/share/java/findbugs.jar \
++	$fb_mainclass \
+ 	${@:+"$@"}
diff --git a/findbugs.spec b/findbugs.spec
index e5b4853..c259ff5 100644
--- a/findbugs.spec
+++ b/findbugs.spec
@@ -5,7 +5,7 @@
 
 Name:           findbugs
 Version:        1.3.9
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Find bugs in Java code
 
 Group:          Development/Languages
@@ -36,6 +36,10 @@ Patch2:         findbugs-1.3.9-pom.patch
 # Fedora-specific patch: use Fedora JAR filenames
 Patch3:         findbugs-jar-filenames.patch
 
+# Fedora-specific patch to cope with removal of Class-Path & Main-Class entries
+# from findbugs.jar manifest
+Patch4:         findbugs-remove-classpath.patch
+
 BuildArch:      noarch
 
 BuildRequires:  findbugs-bcel
@@ -107,6 +111,7 @@ cp -p %{SOURCE4} annotations.pom
 
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 cp -p %{SOURCE2} README.fedora
 
@@ -123,6 +128,10 @@ rm -f src/java5/edu/umd/cs/findbugs/gui2/OSXAdapter.java
 # Turn on the executable bits for some auxiliary scripts
 chmod a+x etc/summarizeBugs etc/diffBugSummaries design/architecture/mkdep.pl
 
+# Remove Class-Path & Main-Class entries from findbugs.jar manifest
+sed -i '/class-path/I d' etc/MANIFEST-findbugs.MF
+sed -i '/Main-Class/ d' etc/MANIFEST-findbugs.MF
+
 %build
 # Build the class files
 ant
@@ -209,6 +218,10 @@ 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-11
+- Remove Class-Path entry from findbugs.jar manifest (#575632); also remove
+  Main-Class entry
+
 * Sat Jul 28 2012 Richard Fearn <richardfearn at gmail.com> - 1.3.9-10
 - Use Fedora JAR filenames (fixes FTBFS)