[geronimo-jms] Fix forgotten pre scriptlet for javadoc symlink removal

Stanislav Ochotnicky sochotni at fedoraproject.org
Thu Nov 24 17:02:48 UTC 2011


commit 5c788c9954a17280944b3d363930cdbb5ae6c728
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Thu Nov 24 18:02:38 2011 +0100

    Fix forgotten pre scriptlet for javadoc symlink removal

 geronimo-jms.spec |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)
---
diff --git a/geronimo-jms.spec b/geronimo-jms.spec
index 3fdcc2f..97b79dd 100644
--- a/geronimo-jms.spec
+++ b/geronimo-jms.spec
@@ -2,7 +2,7 @@
 
 Name:		geronimo-jms
 Version:	1.1.1
-Release:	9%{?dist}
+Release:	10%{?dist}
 Summary:	J2EE JMS v1.1 API
 
 Group:		Development/Libraries
@@ -70,6 +70,11 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
 
 %add_maven_depmap JPP-%{name}.pom %{name}.jar -a "javax.jms:jms"
 
+%pre javadoc
+# workaround for rpm bug, can be removed in F-20
+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
+
 %files
 %doc LICENSE.txt NOTICE.txt
 %{_javadir}/%{name}.jar
@@ -83,6 +88,9 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
 
 
 %changelog
+* Thu Nov 24 2011 Stanislav Ochotnicky <sochotnicky at redhat.com> - 1.1.1-10
+- Fix forgotten pre scriptlet for javadoc symlink removal
+
 * Thu Nov 24 2011 Stanislav Ochotnicky <sochotnicky at redhat.com> - 1.1.1-9
 - Use maven 3 to build
 - Update according to latest guidelines


More information about the scm-commits mailing list