Remove rpm bug workaround

This commit is contained in:
Mikolaj Izdebski 2014-06-30 12:12:23 +02:00
parent 7628cf91de
commit 637c72fc8a

View File

@ -92,11 +92,6 @@ install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
%add_maven_depmap %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 %files -f .mfiles
%doc COMPILE ISSUES README TODO CHANGES CONTRIBUTORS LICENSE STYLE %doc COMPILE ISSUES README TODO CHANGES CONTRIBUTORS LICENSE STYLE
# symlink, not in .mfiles # symlink, not in .mfiles
@ -107,6 +102,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%{_javadocdir}/%{name} %{_javadocdir}/%{name}
%changelog %changelog
* Mon Jun 30 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.0.8-16
- Remove rpm bug workaround
* Fri Jun 27 2014 Yaakov Selkowitz <yselkowi@redhat.com> - 0:2.0.8-16 * Fri Jun 27 2014 Yaakov Selkowitz <yselkowi@redhat.com> - 0:2.0.8-16
- Update for latest Java packaging guidelines (#1106816) - Update for latest Java packaging guidelines (#1106816)