rpms/qt5-qtbase
6
0
Fork 0
Code Issues Pull Requests Releases Activity

fix %pre scriptlet

Browse Source
This commit is contained in:
Rex Dieter 2015-01-18 07:08:06 -06:00
parent 0f0a212bed
commit 7c71c29833
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
qt5-qtbase.spec
View File

@ -33,7 +33,7 @@
Summary: Qt5 - QtBase components Summary: Qt5 - QtBase components
Name: qt5-qtbase Name: qt5-qtbase
Version: 5.4.0 Version: 5.4.0
Release: 5%{?dist} Release: 6%{?dist}
# See LGPL_EXCEPTIONS.txt, for exception details # See LGPL_EXCEPTIONS.txt, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions License: LGPLv2 with exceptions or GPLv3 with exceptions
@ -521,15 +521,17 @@ popd
%if 0%{?qtchooser} %if 0%{?qtchooser}
%pre %pre
if [ $1 -gt 1 ] ; then
# remove short-lived qt5.conf alternatives # remove short-lived qt5.conf alternatives
%{_sbindir}/update-alternatives \ %{_sbindir}/update-alternatives \
--remove qtchooser-qt5 \ --remove qtchooser-qt5 \
%{_sysconfdir}/xdg/qtchooser/qt5-%{__isa_bits}.conf %{_sysconfdir}/xdg/qtchooser/qt5-%{__isa_bits}.conf >& /dev/null ||:
%{_sbindir}/update-alternatives \ %{_sbindir}/update-alternatives \
--remove qtchooser-default \ --remove qtchooser-default \
%{_sysconfdir}/xdg/qtchooser/qt5.conf %{_sysconfdir}/xdg/qtchooser/qt5.conf >& /dev/null ||:
%endif %endif
fi
%post %post
/sbin/ldconfig /sbin/ldconfig
@ -824,6 +826,9 @@ fi
%changelog %changelog
* Sun Jan 18 2015 Rex Dieter <rdieter@fedoraproject.org> 5.4.0-6
- fix %%pre scriptlet
* Sat Jan 17 2015 Rex Dieter <rdieter@fedoraproject.org> 5.4.0-5 * Sat Jan 17 2015 Rex Dieter <rdieter@fedoraproject.org> 5.4.0-5
- ship /etc/xdg/qtchooser/5.conf alternative instead (of qt5.conf) - ship /etc/xdg/qtchooser/5.conf alternative instead (of qt5.conf)