- restore -qt4 suffixes

This commit is contained in:
Kevin Kofler 2008-06-14 02:32:46 +00:00
parent 7bb6c94cca
commit 1bbe97aef2
6 changed files with 21 additions and 9 deletions

View File

@ -1,7 +1,7 @@
[Desktop Entry] [Desktop Entry]
Name=Qt4 Assistant Name=Qt4 Assistant
Comment=Shows Qt4 documentation and examples Comment=Shows Qt4 documentation and examples
Exec=assistant Exec=assistant-qt4
Icon=assistant Icon=assistant
Terminal=false Terminal=false
Encoding=UTF-8 Encoding=UTF-8

View File

@ -2,7 +2,7 @@
Name=Qt4 Designer Name=Qt4 Designer
GenericName=Interface Designer GenericName=Interface Designer
Comment=Design GUIs for Qt4 applications Comment=Design GUIs for Qt4 applications
Exec=designer Exec=designer-qt4
Icon=designer Icon=designer
MimeType=application/x-designer; MimeType=application/x-designer;
Terminal=false Terminal=false

View File

@ -1,7 +1,7 @@
[Desktop Entry] [Desktop Entry]
Name=Qt4 Linguist Name=Qt4 Linguist
Comment=Add translations to Qt4 applications Comment=Add translations to Qt4 applications
Exec=linguist Exec=linguist-qt4
Icon=linguist4 Icon=linguist4
MimeType=application/x-linguist; MimeType=application/x-linguist;
Terminal=false Terminal=false

20
qt.spec
View File

@ -8,7 +8,7 @@ Name: qt
Name: qt4 Name: qt4
%endif %endif
Version: 4.4.0 Version: 4.4.0
Release: 8%{?dist} Release: 9%{?dist}
# GPLv2 exceptions(see GPL_EXCEPTIONS*.txt) # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
License: GPLv3 or GPLv2 with exceptions or QPL License: GPLv3 or GPLv2 with exceptions or QPL
@ -441,8 +441,17 @@ ln -s ../../share/doc/qt4 %{buildroot}%{_qt4_prefix}/doc
mkdir %{buildroot}%{_bindir} mkdir %{buildroot}%{_bindir}
pushd %{buildroot}%{_qt4_bindir} pushd %{buildroot}%{_qt4_bindir}
for i in * ; do for i in * ; do
mv $i ../../../bin/ case "${i}" in
ln -s ../../../bin/$i . assistant|designer|linguist|lrelease|lupdate|moc|qmake|qtconfig|qtdemo|uic)
mv $i ../../../bin/${i}-qt4
ln -s ../../../bin/${i}-qt4 .
ln -s ../../../bin/${i}-qt4 $i
;;
*)
mv $i ../../../bin/
ln -s ../../../bin/$i .
;;
esac
done done
popd popd
@ -760,7 +769,10 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
%changelog %changelog
* Fri Jun 13 2008 Than Ngo <than@redhat.com> - 4.4.0-8 * Sat Jun 14 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 4.4.0-9
- restore -qt4 suffixes
* Fri Jun 13 2008 Than Ngo <than@redhat.com> 4.4.0-8
- drop qt wrapper, make symlinks to /usr/bin - drop qt wrapper, make symlinks to /usr/bin
* Tue Jun 10 2008 Than Ngo <than@redhat.com> 4.4.0-7 * Tue Jun 10 2008 Than Ngo <than@redhat.com> 4.4.0-7

View File

@ -1,7 +1,7 @@
[Desktop Entry] [Desktop Entry]
Name=Qt4 Config Name=Qt4 Config
Comment=Configure Qt4 behavior, styles, fonts Comment=Configure Qt4 behavior, styles, fonts
Exec=qtconfig Exec=qtconfig-qt4
Icon=qt4-logo Icon=qt4-logo
Terminal=false Terminal=false
Encoding=UTF-8 Encoding=UTF-8

View File

@ -1,7 +1,7 @@
[Desktop Entry] [Desktop Entry]
Name=Qt4 Demo Name=Qt4 Demo
Comment=Show Qt4 demos and programming examples Comment=Show Qt4 demos and programming examples
Exec=qtdemo Exec=qtdemo-qt4
Icon=qt4-logo Icon=qt4-logo
Terminal=false Terminal=false
Encoding=UTF-8 Encoding=UTF-8