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

ship /etc/xdg/qtchooser/5.conf alternative instead (of qt5.conf)

Browse Source
This commit is contained in:
Rex Dieter 2015-01-17 19:02:10 -06:00
parent dbe60f28b0
commit eb7261f470
1 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
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: 4%{?dist} Release: 5%{?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
@ -484,10 +484,10 @@ popd
%if 0%{?qtchooser} %if 0%{?qtchooser}
mkdir -p %{buildroot}%{_sysconfdir}/xdg/qtchooser mkdir -p %{buildroot}%{_sysconfdir}/xdg/qtchooser
pushd %{buildroot}%{_sysconfdir}/xdg/qtchooser pushd %{buildroot}%{_sysconfdir}/xdg/qtchooser
echo "%{_qt5_bindir}" > qt5-%{__isa_bits}.conf echo "%{_qt5_bindir}" > 5-%{__isa_bits}.conf
echo "%{_qt5_prefix}" >> qt5-%{__isa_bits}.conf echo "%{_qt5_prefix}" >> 5-%{__isa_bits}.conf
# alternatives targets # alternatives targets
touch default.conf qt5.conf touch default.conf 5.conf
popd popd
%endif %endif
@ -519,19 +519,31 @@ ctest --output-on-failure ||:
popd popd
%if 0%{?qtchooser}
%pre
# remove short-lived qt5.conf alternatives
%{_sbindir}/update-alternatives \
--remove qtchooser-qt5 \
%{_sysconfdir}/xdg/qtchooser/qt5-%{__isa_bits}.conf
%{_sbindir}/update-alternatives \
--remove qtchooser-default \
%{_sysconfdir}/xdg/qtchooser/qt5.conf
%endif
%post %post
/sbin/ldconfig /sbin/ldconfig
%if 0%{?qtchooser} %if 0%{?qtchooser}
%{_sbindir}/update-alternatives \ %{_sbindir}/update-alternatives \
--install %{_sysconfdir}/xdg/qtchooser/qt5.conf \ --install %{_sysconfdir}/xdg/qtchooser/5.conf \
qtchooser-qt5 \ qtchooser-5 \
%{_sysconfdir}/xdg/qtchooser/qt5-%{__isa_bits}.conf \ %{_sysconfdir}/xdg/qtchooser/5-%{__isa_bits}.conf \
%{priority} %{priority}
%{_sbindir}/update-alternatives \ %{_sbindir}/update-alternatives \
--install %{_sysconfdir}/xdg/qtchooser/default.conf \ --install %{_sysconfdir}/xdg/qtchooser/default.conf \
qtchooser-default \ qtchooser-default \
%{_sysconfdir}/xdg/qtchooser/qt5.conf \ %{_sysconfdir}/xdg/qtchooser/5.conf \
%{priority} %{priority}
%endif %endif
@ -540,12 +552,12 @@ popd
%if 0%{?qtchooser} %if 0%{?qtchooser}
if [ $1 -eq 0 ]; then if [ $1 -eq 0 ]; then
%{_sbindir}/update-alternatives \ %{_sbindir}/update-alternatives \
--remove qtchooser-qt5 \ --remove qtchooser-5 \
%{_sysconfdir}/xdg/qtchooser/qt5-%{__isa_bits}.conf %{_sysconfdir}/xdg/qtchooser/5-%{__isa_bits}.conf
%{_sbindir}/update-alternatives \ %{_sbindir}/update-alternatives \
--remove qtchooser-default \ --remove qtchooser-default \
%{_sysconfdir}/xdg/qtchooser/qt5.conf %{_sysconfdir}/xdg/qtchooser/5.conf
fi fi
%endif %endif
@ -812,6 +824,9 @@ fi
%changelog %changelog
* Sat Jan 17 2015 Rex Dieter <rdieter@fedoraproject.org> 5.4.0-5
- ship /etc/xdg/qtchooser/5.conf alternative instead (of qt5.conf)
* Wed Dec 17 2014 Rex Dieter <rdieter@fedoraproject.org> 5.4.0-4 * Wed Dec 17 2014 Rex Dieter <rdieter@fedoraproject.org> 5.4.0-4
- workaround 'make docs' crasher on el6 (QTBUG-43057) - workaround 'make docs' crasher on el6 (QTBUG-43057)