[findbugs] Revert "Install Javadoc into unversioned directory"

richardfearn richardfearn at fedoraproject.org
Mon Jul 7 16:27:42 UTC 2014


commit 65a1d8a4ad32e1998a40d52fbf103ef1db07ddba
Author: Richard Fearn <richardfearn at gmail.com>
Date:   Mon Jul 7 17:13:41 2014 +0100

    Revert "Install Javadoc into unversioned directory"
    
    This reverts commit a39419b7c7aabfe39f12ae6ff1cbb364d7e9daff.

 findbugs.spec |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/findbugs.spec b/findbugs.spec
index ae92ffa..a531e32 100644
--- a/findbugs.spec
+++ b/findbugs.spec
@@ -2,7 +2,7 @@
 
 Name:           findbugs
 Version:        2.0.3
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Find bugs in Java code
 
 Group:          Development/Languages
@@ -156,7 +156,8 @@ cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/ant.d/%{name}
 
 # Install the javadocs
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}
-cp -a apiJavaDoc $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -a apiJavaDoc $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 # Install the scripts
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
@@ -212,6 +213,9 @@ cp %{SOURCE6} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.ant-ant-%{name}.pom
 %{_javadir}/findbugs-tools.jar
 
 %changelog
+* Mon Jul 07 2014 Richard Fearn <richardfearn at gmail.com> - 2.0.3-9
+- Revert back to installing Javadoc into versioned directory
+
 * Sun Jun 22 2014 Richard Fearn <richardfearn at gmail.com> - 2.0.3-8
 - Allow Ant task to work even though findbugs.jar has no Class-Path attribute
   in its manifest (bug #1080682)


More information about the scm-commits mailing list