From 637c72fc8a048be804b929b8cedfdf5e1cfada28 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 30 Jun 2014 12:12:23 +0200 Subject: [PATCH] Remove rpm bug workaround --- jakarta-oro.spec | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/jakarta-oro.spec b/jakarta-oro.spec index ffb2ec1..308bb20 100644 --- a/jakarta-oro.spec +++ b/jakarta-oro.spec @@ -92,11 +92,6 @@ install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir} install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom %add_maven_depmap -%pre javadoc -# workaround for rpm bug, can be removed in F-18 -[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \ -rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : - %files -f .mfiles %doc COMPILE ISSUES README TODO CHANGES CONTRIBUTORS LICENSE STYLE # symlink, not in .mfiles @@ -107,6 +102,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : %{_javadocdir}/%{name} %changelog +* Mon Jun 30 2014 Mikolaj Izdebski - 0:2.0.8-16 +- Remove rpm bug workaround + * Fri Jun 27 2014 Yaakov Selkowitz - 0:2.0.8-16 - Update for latest Java packaging guidelines (#1106816)