From d7102c2bf6b5f225cc9544795bedb173d2b6f1f3 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Mar 23 2016 07:32:19 +0000 Subject: Add workaround for symlink->directory rpm bug --- diff --git a/apache-commons-collections.spec b/apache-commons-collections.spec index bcafdbb..bc330cc 100644 --- a/apache-commons-collections.spec +++ b/apache-commons-collections.spec @@ -3,7 +3,7 @@ Name: apache-%{short_name} Version: 3.2.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Provides new interfaces, implementations and utilities for Java Collections License: ASL 2.0 URL: http://commons.apache.org/%{base_name}/ @@ -73,6 +73,12 @@ ant tf.javadoc -Dtf.build.docs=target/site/apidocs/ %install %mvn_install +# Workaround for RPM bug #646523 - can't change symlink to directory +%pretrans javadoc -p +dir = "%{_javadocdir}/%{name}" +dummy = posix.readlink(dir) and os.remove(dir) + + %files -f .mfiles %doc PROPOSAL.html README.txt LICENSE.txt NOTICE.txt @@ -83,6 +89,9 @@ ant tf.javadoc -Dtf.build.docs=target/site/apidocs/ %changelog +* Wed Mar 23 2016 Michael Simacek - 3.2.2-3 +- Add workaround for symlink->directory rpm bug + * Wed Feb 03 2016 Fedora Release Engineering - 3.2.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild