rpms/qt
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rework %_bindir %_qt4_bindir links to be more qtchooser friendly

Browse Source
This commit is contained in:
Rex Dieter 2013-10-03 09:23:45 -05:00
parent db52875339
commit 58e8365063
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
qt.spec
View File

@ -29,7 +29,7 @@ Summary: Qt toolkit
Name: qt Name: qt
Epoch: 1 Epoch: 1
Version: 4.8.5 Version: 4.8.5
Release: 8%{?dist} Release: 9%{?dist}
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT
@ -707,19 +707,17 @@ rm -rf %{buildroot}%{_qt4_prefix}/doc
ln -s ../../share/doc/qt4 %{buildroot}%{_qt4_prefix}/doc ln -s ../../share/doc/qt4 %{buildroot}%{_qt4_prefix}/doc
%endif %endif
# let rpm handle binaries conflicts # hardlink files to %{_bindir}, add -qt4 postfix to not conflict
mkdir %{buildroot}%{_bindir} mkdir %{buildroot}%{_bindir}
pushd %{buildroot}%{_qt4_bindir} pushd %{buildroot}%{_qt4_bindir}
for i in * ; do for i in * ; do
case "${i}" in case "${i}" in
assistant|designer|linguist|lrelease|lupdate|moc|qmake|qtconfig|qtdemo|uic) assistant|designer|linguist|lrelease|lupdate|moc|qmake|qtconfig|qtdemo|uic)
mv $i ../../../bin/${i}-qt4 ln -v ${i} %{buildroot}%{_bindir}/${i}-qt4
ln -s ../../../bin/${i}-qt4 . ln -sv ${i} ${i}-qt4
ln -s ../../../bin/${i}-qt4 $i
;; ;;
*) *)
mv $i ../../../bin/ ln -v ${i} %{buildroot}%{_bindir}/${i}
ln -s ../../../bin/$i .
;; ;;
esac esac
done done
@ -1220,6 +1218,9 @@ fi
%changelog %changelog
* Thu Oct 03 2013 Rex Dieter <rdieter@fedoraproject.org> 4.8.5-9
- rework %%_bindir %%_qt4_bindir links to be more qtchooser friendly
* Thu Sep 12 2013 Rex Dieter <rdieter@fedoraproject.org> 4.8.5-8 * Thu Sep 12 2013 Rex Dieter <rdieter@fedoraproject.org> 4.8.5-8
- Keyboard shortcuts doesn't work for russian keyboard layout (#968367, QTBUG-32908) - Keyboard shortcuts doesn't work for russian keyboard layout (#968367, QTBUG-32908)