Remove workaround for RPM bug #646523

This commit is contained in:
Mikolaj Izdebski 2014-11-05 07:35:01 +01:00
parent 40a98cbfed
commit f3e079fa77

View File

@ -30,7 +30,7 @@
Name: bsh Name: bsh
Version: 1.3.0 Version: 1.3.0
Release: 31%{?dist} Release: 32%{?dist}
Epoch: 0 Epoch: 0
Summary: Lightweight Scripting for Java Summary: Lightweight Scripting for Java
License: (SPL or LGPLv2+) and Public Domain 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 || : /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi fi
# Workaround for RPM bug #646523 - can't change symlink to directory
# TODO: Remove this in F-22
%pretrans javadoc -p <lua>
dir = "%{_javadocdir}/%{name}"
dummy = posix.readlink(dir) and os.remove(dir)
%posttrans utils %posttrans utils
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : /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 %{_datadir}/icons/hicolor/*x*/apps/%{name}.png
%changelog %changelog
* Wed Nov 5 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.3.0-32
- Remove workaround for RPM bug #646523
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.3.0-31 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.3.0-31
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild