[findbugs-contrib/f21] Install Javadoc into unversioned directory (bug #1068945)

[richardfearn]

commit adc6404ce67af65c29e8a170343b0a31644c7625
Author: Richard Fearn <richardfearn at gmail.com>
Date:   Thu Jan 8 22:57:49 2015 +0100

    Install Javadoc into unversioned directory (bug #1068945)

 findbugs-contrib.spec |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)
---
diff --git a/findbugs-contrib.spec b/findbugs-contrib.spec
index 8e487d0..d444306 100644
--- a/findbugs-contrib.spec
+++ b/findbugs-contrib.spec
@@ -7,7 +7,7 @@
 
 Name:           findbugs-contrib
 Version:        5.2.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Extra findbugs detectors
 
 Group:          Development/Languages
@@ -77,15 +77,21 @@ mkdir -p $RPM_BUILD_ROOT%{plugin_dir}
 cp -p fb-contrib-%{version}.jar $RPM_BUILD_ROOT%{plugin_dir}
 
 # Install the documentation
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/fb-contrib-%{version}
-cp -a javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/fb-contrib-%{version}
-ln -s fb-contrib-%{version} $RPM_BUILD_ROOT%{_javadocdir}/fb-contrib
+mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/fb-contrib
+cp -a javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/fb-contrib
 
 # Make a soft link for eclipse
 mkdir -p $RPM_BUILD_ROOT%{eclipse_plugin_dir}/plugin
 ln -s %{plugin_dir}/fb-contrib-%{version}.jar \
   $RPM_BUILD_ROOT%{eclipse_plugin_dir}/plugin/fb-contrib-%{version}.jar
 
+%pretrans javadoc -p <lua>
+path = "%{_javadocdir}/fb-contrib"
+st = posix.stat(path)
+if st and st.type == "link" then
+  os.remove(path)
+end
+
 %files
 %doc license.txt
 %{plugin_dir}/fb-contrib-%{version}.jar
@@ -100,6 +106,9 @@ ln -s %{plugin_dir}/fb-contrib-%{version}.jar \
 %{eclipse_plugin_dir}/plugin/fb-contrib-%{version}.jar
 
 %changelog
+* Thu Jan 08 2015 Richard Fearn <richardfearn at gmail.com> - 5.2.1-4
+- Install Javadoc into unversioned directory (bug #1068945)
+
 * Mon Jul 07 2014 Richard Fearn <richardfearn at gmail.com> - 5.2.1-3
 - Update to build against FindBugs 3.0.0