rpms/qt4/FC-4 qt4.spec,1.15,1.16

Author: rdieter

Update of /cvs/extras/rpms/qt4/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5035

Modified Files:
	qt4.spec 
Log Message:
* Mon Oct 23 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.5-2
- fix qm2ts conflict with qt-devel



Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-4/qt4.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- qt4.spec	23 Oct 2006 03:23:17 -0000	1.15
+++ qt4.spec	23 Oct 2006 23:06:49 -0000	1.16
@@ -5,7 +5,7 @@
 Summary: Qt toolkit
 Name:	 qt4
 Version: 4.1.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPL/QPL
 Group: 	 System Environment/Libraries
@@ -300,7 +300,7 @@
 pushd %{buildroot}%{qtdir}/bin
 for i in *; do
   case "${i}" in
-    assistant|designer|linguist|lrelease|lupdate|moc|qmake|qtconfig|qtdemo|uic)
+    assistant|designer|linguist|lrelease|lupdate|moc|qm2ts|qmake|qtconfig|qtdemo|uic)
       LINK="${i}-qt4"
       ln -s "${i}" "%{buildroot}%{qtdir}/bin/${LINK}"
       ;;
@@ -462,6 +462,9 @@
 
 
 %changelog
+* Mon Oct 23 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.5-2
+- fix qm2ts conflict with qt-devel
+
 * Sun Oct 22 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.5-1
 - 4.1.5