rpms/qt/devel assistant.desktop, 1.2, 1.3 designer.desktop, 1.2, 1.3 linguist.desktop, 1.2, 1.3 qt.spec, 1.189, 1.190 qtconfig.desktop, 1.3, 1.4 qtdemo.desktop, 1.2, 1.3

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17537/devel

Modified Files:
	assistant.desktop designer.desktop linguist.desktop qt.spec 
	qtconfig.desktop qtdemo.desktop 
Log Message:
* Sat Jun 14 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.4.0-9
- restore -qt4 suffixes


Index: assistant.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/assistant.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- assistant.desktop	13 Jun 2008 17:21:51 -0000	1.2
+++ assistant.desktop	14 Jun 2008 02:32:46 -0000	1.3
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=Qt4 Assistant 
 Comment=Shows Qt4 documentation and examples
-Exec=assistant
+Exec=assistant-qt4
 Icon=assistant
 Terminal=false
 Encoding=UTF-8


Index: designer.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/designer.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- designer.desktop	13 Jun 2008 17:21:51 -0000	1.2
+++ designer.desktop	14 Jun 2008 02:32:46 -0000	1.3
@@ -2,7 +2,7 @@
 Name=Qt4 Designer
 GenericName=Interface Designer
 Comment=Design GUIs for Qt4 applications
-Exec=designer
+Exec=designer-qt4
 Icon=designer
 MimeType=application/x-designer;
 Terminal=false


Index: linguist.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/linguist.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linguist.desktop	13 Jun 2008 17:21:51 -0000	1.2
+++ linguist.desktop	14 Jun 2008 02:32:46 -0000	1.3
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=Qt4 Linguist 
 Comment=Add translations to Qt4 applications
-Exec=linguist
+Exec=linguist-qt4
 Icon=linguist4
 MimeType=application/x-linguist;
 Terminal=false


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- qt.spec	13 Jun 2008 20:37:56 -0000	1.189
+++ qt.spec	14 Jun 2008 02:32:46 -0000	1.190
@@ -8,7 +8,7 @@
 Name:    qt4
 %endif
 Version: 4.4.0
-Release: 8%{?dist}
+Release: 9%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv3 or GPLv2 with exceptions or QPL
@@ -441,8 +441,17 @@
 mkdir %{buildroot}%{_bindir}
 pushd %{buildroot}%{_qt4_bindir}
 for i in * ; do
-  mv $i ../../../bin/
-  ln -s ../../../bin/$i .
+  case "${i}" in
+    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
 popd
 
@@ -760,7 +769,10 @@
 
 
 %changelog
-* Fri Jun 13 2008 Than Ngo <than at redhat.com> -  4.4.0-8
+* Sat Jun 14 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.4.0-9
+- restore -qt4 suffixes
+
+* Fri Jun 13 2008 Than Ngo <than at redhat.com> 4.4.0-8
 - drop qt wrapper, make symlinks to /usr/bin
 
 * Tue Jun 10 2008 Than Ngo <than at redhat.com> 4.4.0-7


Index: qtconfig.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qtconfig.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- qtconfig.desktop	13 Jun 2008 17:21:51 -0000	1.3
+++ qtconfig.desktop	14 Jun 2008 02:32:46 -0000	1.4
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=Qt4 Config 
 Comment=Configure Qt4 behavior, styles, fonts
-Exec=qtconfig
+Exec=qtconfig-qt4
 Icon=qt4-logo
 Terminal=false
 Encoding=UTF-8


Index: qtdemo.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qtdemo.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qtdemo.desktop	13 Jun 2008 17:21:51 -0000	1.2
+++ qtdemo.desktop	14 Jun 2008 02:32:46 -0000	1.3
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=Qt4 Demo 
 Comment=Show Qt4 demos and programming examples
-Exec=qtdemo
+Exec=qtdemo-qt4
 Icon=qt4-logo
 Terminal=false
 Encoding=UTF-8