[findbugs] Install Javadoc into unversioned directory (bug #1068943)
richardfearn
richardfearn at fedoraproject.org
Thu Jan 8 20:47:59 UTC 2015
commit b07863166771d6c9e098fdcfa42bc53390985a35
Author: Richard Fearn <richardfearn at gmail.com>
Date: Thu Jan 8 21:47:36 2015 +0100
Install Javadoc into unversioned directory (bug #1068943)
findbugs.spec | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
---
diff --git a/findbugs.spec b/findbugs.spec
index 91d28ca..3cfeea4 100644
--- a/findbugs.spec
+++ b/findbugs.spec
@@ -2,7 +2,7 @@
Name: findbugs
Version: 3.0.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Find bugs in Java code
Group: Development/Languages
@@ -162,8 +162,7 @@ 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}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -a apiJavaDoc $RPM_BUILD_ROOT%{_javadocdir}/%{name}
# Install the scripts
mkdir -p $RPM_BUILD_ROOT%{_bindir}
@@ -200,6 +199,13 @@ cp %{SOURCE6} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.ant-ant-%{name}.pom
%add_maven_depmap -a net.sourceforge.findbugs:annotations JPP-%{name}-annotations.pom %{name}-annotations.jar
%add_maven_depmap -a net.sourceforge.findbugs:findbugs-ant JPP.ant-ant-%{name}.pom ant/ant-findbugs.jar -f ant
+%pretrans javadoc -p <lua>
+path = "%{_javadocdir}/%{name}"
+st = posix.stat(path)
+if st and st.type == "link" then
+ os.remove(path)
+end
+
%files -f .mfiles
%doc licenses/LICENSE.txt design/DecouplingFromBCEL.txt design/VisitingAndCaching.txt
%doc README.txt "design/eclipse findbugs plugin features.sxw"
@@ -219,6 +225,9 @@ cp %{SOURCE6} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.ant-ant-%{name}.pom
%{_javadir}/findbugs-tools.jar
%changelog
+* Thu Jan 08 2015 Richard Fearn <richardfearn at gmail.com> - 3.0.0-4
+- Install Javadoc into unversioned directory (bug #1068943)
+
* Sun Jul 13 2014 Richard Fearn <richardfearn at gmail.com> - 3.0.0-3
- Use current POMs
More information about the scm-commits
mailing list