[maven-enforcer] Remove RPM bug workaround

Mikolaj Izdebski mizdebsk at fedoraproject.org
Mon Oct 15 04:28:40 UTC 2012


commit 3aaf867091aab4470b953bc57b02b9c4173b375e
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Mon Oct 15 06:18:02 2012 +0200

    Remove RPM bug workaround

 maven-enforcer-maven3-compat.patch                 |   15 ---------
 ...-enforcer-migration-to-component-metadata.patch |   34 --------------------
 ...equirePluginVersions-maven3-compatibility.patch |   31 ------------------
 maven-enforcer.spec                                |   11 ++----
 4 files changed, 4 insertions(+), 87 deletions(-)
---
diff --git a/maven-enforcer.spec b/maven-enforcer.spec
index 9313e51..884587f 100644
--- a/maven-enforcer.spec
+++ b/maven-enforcer.spec
@@ -1,6 +1,6 @@
 Name:           maven-enforcer
 Version:        1.1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Maven Enforcer
 
 Group:          Development/Libraries
@@ -119,12 +119,6 @@ install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
 cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
 
 
-%pre javadoc
-# workaround for rpm bug, can be removed in F-17
-[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
-rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
-
-
 %files
 %dir %{_javadir}/%{name}
 %{_mavenpomdir}/JPP-%{name}.pom
@@ -150,6 +144,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 
 
 %changelog
+* Mon Oct 15 2012 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.1.1-2
+- Remove RPM bug workaround
+
 * Fri Oct 12 2012 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.1.1-1
 - Update to upstream version 1.1.1
 - Convert patches to POM macro


More information about the scm-commits mailing list