Solve merge request

This commit is contained in:
Josef Ridky 2018-01-16 11:27:54 +01:00
commit abf4f75706

View File

@ -522,20 +522,6 @@ popd
%endif
make check
%post
update-desktop-database &> /dev/null || :
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%postun
update-desktop-database &> /dev/null || :
if [ $1 -eq 0 ] ; then
touch --no-create %{_datadir}/icons/hicolor &>/dev/null
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
@ -666,6 +652,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
* Tue Jan 16 2018 Josef Ridky <jridky@redhat.com> - 2:2.8.22-4
- Fix dependencies for F28+ (ghostscript-devel => libgs-devel) #1534656
* Fri Jan 05 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2:2.8.22-3.1
- Remove obsolete scriptlets
* Thu Jan 04 2018 Josef Ridky <jridky@redhat.com> - 2:2.8.22-3
- Fix for CVE-2017-17784, CVE-2017-17785, CVE-2017-17786,
CVE-2017-17787, CVE-2017-17788 and CVE-2017-17789 (#1529149)