[findbugs/f17] Allow FindBugs launcher scripts to be run from /bin or /usr/bin (#848612)

[richardfearn]

commit 3e4547ad25a2a86315fa96b8620fd7a936a55aae
Author: Richard Fearn <richardfearn at gmail.com>
Date:   Thu Aug 16 20:32:44 2012 +0100

    Allow FindBugs launcher scripts to be run from /bin or /usr/bin (#848612)

 findbugs-home.patch |   12 ++++++++++++
 findbugs.spec       |   10 +++++++++-
 2 files changed, 21 insertions(+), 1 deletions(-)
---
diff --git a/findbugs-home.patch b/findbugs-home.patch
new file mode 100644
index 0000000..d994942
--- /dev/null
+++ b/findbugs-home.patch
@@ -0,0 +1,12 @@
+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-08-16 20:11:04.169075637 +0100
++++ findbugs-1.3.9/etc/script.properties	2012-08-16 20:12:41.334188169 +0100
+@@ -31,7 +31,7 @@
+ 	fi\n\
+ 	\n\
+ 	# Make absolute\n\
+-	findbugs_home=`cd "$findbugs_home" && pwd`\n\
++	findbugs_home=`cd -P "$findbugs_home" && pwd`\n\
+ 	\n\
+ 	fb_pathsep=':'\n\
+ 	\n\
diff --git a/findbugs.spec b/findbugs.spec
index c259ff5..82f7165 100644
--- a/findbugs.spec
+++ b/findbugs.spec
@@ -5,7 +5,7 @@
 
 Name:           findbugs
 Version:        1.3.9
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Find bugs in Java code
 
 Group:          Development/Languages
@@ -40,6 +40,10 @@ Patch3:         findbugs-jar-filenames.patch
 # from findbugs.jar manifest
 Patch4:         findbugs-remove-classpath.patch
 
+# Fedora-specific patch to allow FindBugs launcher scripts to be run from
+# /bin or /usr/bin (#848612)
+Patch5:         findbugs-home.patch
+
 BuildArch:      noarch
 
 BuildRequires:  findbugs-bcel
@@ -112,6 +116,7 @@ cp -p %{SOURCE4} annotations.pom
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 cp -p %{SOURCE2} README.fedora
 
@@ -218,6 +223,9 @@ cp annotations.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-annotations.pom
 %{_javadir}/findbugs-tools*
 
 %changelog
+* Thu Aug 16 2012 Richard Fearn <richardfearn at gmail.com> - 1.3.9-12
+- Allow FindBugs launcher scripts to be run from /bin or /usr/bin (#848612)
+
 * 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