From f3e079fa77e69c30bd1480efc82860c5bdb2ee0f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Nov 05 2014 06:35:01 +0000 Subject: Remove workaround for RPM bug #646523 --- diff --git a/bsh.spec b/bsh.spec index d28d521..36fff7c 100644 --- a/bsh.spec +++ b/bsh.spec @@ -30,7 +30,7 @@ Name: bsh Version: 1.3.0 -Release: 31%{?dist} +Release: 32%{?dist} Epoch: 0 Summary: Lightweight Scripting for Java License: (SPL or LGPLv2+) and Public Domain @@ -211,12 +211,6 @@ if [ $1 -eq 0 ] ; then /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : fi -# Workaround for RPM bug #646523 - can't change symlink to directory -# TODO: Remove this in F-22 -%pretrans javadoc -p -dir = "%{_javadocdir}/%{name}" -dummy = posix.readlink(dir) and os.remove(dir) - %posttrans utils /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : @@ -245,6 +239,9 @@ dummy = posix.readlink(dir) and os.remove(dir) %{_datadir}/icons/hicolor/*x*/apps/%{name}.png %changelog +* Wed Nov 5 2014 Mikolaj Izdebski - 0:1.3.0-32 +- Remove workaround for RPM bug #646523 + * Sat Jun 07 2014 Fedora Release Engineering - 0:1.3.0-31 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild