rpms/qt4/devel qt4.spec,1.12,1.13

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/qt4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25316

Modified Files:
	qt4.spec 
Log Message:
sync 4.2.0'isms



Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/devel/qt4.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- qt4.spec	29 Jun 2006 20:52:13 -0000	1.12
+++ qt4.spec	5 Jul 2006 11:37:58 -0000	1.13
@@ -27,7 +27,13 @@
 ## optional plugin bits
 # set to -no-sql-<driver> to disable
 # set to -qt-sql-<driver> to enable *in* qt library
-%define mysql  -plugin-sql-mysql 
+%define mysql  -no-sql-mysql 
+%if "%{?fedora}" > "3"
+%define mysql  -plugin-sql-mysql
+%endif
+%if "%{?rhel}" > "3"
+%define mysql  -plugin-sql-mysql
+%endif
 %define odbc   -plugin-sql-odbc 
 %define psql   -plugin-sql-psql 
 %define sqlite -plugin-sql-sqlite 
@@ -325,7 +331,8 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README* changes* OPENSOURCE-NOTICE.TXT
+%doc README* changes*
+%{!?beta:%doc OPENSOURCE-NOTICE.TXT}
 %{qtdir}/LICENSE.*
 %if "%{qt_libdir}" != "%{_libdir}"
 /etc/ld.so.conf.d/*
@@ -362,7 +369,10 @@
 %{qtdir}/bin/lrelease*
 %{qtdir}/bin/lupdate*
 %{qtdir}/bin/moc*
+%if "%{version}" < "4.2.0"
 %{qtdir}/bin/qm2ts*
+%{_bindir}/qm2ts*
+%endif
 %{qtdir}/bin/qmake*
 %{qtdir}/bin/qt3to4
 %{qtdir}/bin/rcc*
@@ -370,7 +380,6 @@
 %{_bindir}/lrelease*
 %{_bindir}/lupdate*
 %{_bindir}/moc*
-%{_bindir}/qm2ts*
 %{_bindir}/qmake*
 %{_bindir}/qt3to4
 %{_bindir}/rcc*