rpms/qt4/devel .cvsignore, 1.7, 1.8 qt4.spec, 1.20, 1.21 sources, 1.5, 1.6

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	.cvsignore qt4.spec sources 
Log Message:
* Fri Sep 08 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.2.0-0.7.rc1
- 4.2.0-rc1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qt4/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	28 Aug 2006 12:09:06 -0000	1.7
+++ .cvsignore	8 Sep 2006 15:28:22 -0000	1.8
@@ -3,3 +3,4 @@
 qt-x11-opensource-src-4.1.4.tar.gz
 qt-x11-preview-opensource-src-4.2.0-tp1.tar.gz
 qt-x11-opensource-src-4.2.0-snapshot-20060821.tar.bz2
+qt-x11-opensource-src-4.2.0-rc1.tar.gz


Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/devel/qt4.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- qt4.spec	28 Aug 2006 12:09:06 -0000	1.20
+++ qt4.spec	8 Sep 2006 15:28:22 -0000	1.21
@@ -2,21 +2,21 @@
 # Fedora Review
 # http://bugzilla.redhat.com/188180
 
-#define beta tp1
+%define beta rc1
 #define preview -preview
 
-%define snap 20060821
-%define beta snapshot-%{snap}
+#define snap 20060821
+#define beta snapshot-%{snap}
 
 Summary: Qt toolkit
 Name:	 qt4
 Version: 4.2.0
-Release: 0.6.%{snap}%{?dist}
+Release: 0.7.%{beta}%{?dist}
 
 License: GPL/QPL
 Group: 	 System Environment/Libraries
 Url:   	 http://www.trolltech.com/products/qt/
-Source0: ftp://ftp.trolltech.com/qt/source/qt-x11%{?preview}-opensource-src-%{version}%{?beta:-%{beta}}.tar.bz2
+Source0: ftp://ftp.trolltech.com/qt/source/qt-x11%{?preview}-opensource-src-%{version}%{?beta:-%{beta}}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # search for assistant-qt4 instead of (qt3's) assistant in $PATH 
@@ -33,16 +33,13 @@
 ## optional plugin bits
 # set to -no-sql-<driver> to disable
 # set to -qt-sql-<driver> to enable *in* qt library
-%define mysql  -no-sql-mysql
-%if "%{?fedora}" > "3"
+#if "%{?fedora}" > "3" || "%{?rhel}" > "3"
 %define mysql  -plugin-sql-mysql
-%endif
-%if "%{?rhel}" > "3"
-%define mysql  -plugin-sql-mysql
-%endif
+#endif
 %define odbc   -plugin-sql-odbc 
 %define psql   -plugin-sql-psql 
 %define sqlite -plugin-sql-sqlite 
+
 # undefine to disable these
 %define nas     -system-nas-sound
 %if "%{?fedora}" > "5"
@@ -322,13 +319,13 @@
 mkdir -p %{buildroot}%{_bindir}
 pushd %{buildroot}%{qtdir}/bin 
 for i in *; do
-  case "$i" in
-    dbusxml2cpp|qt3to4|uic3|rcc)
-      LINK=$i
+  case "${i}" in
+    assistant|designer|linguist|lrelease|lupdate|moc|qmake|qtconfig|qtdemo|uic)
+      LINK="${i}-qt4"
+      ln -s "${i}" "%{buildroot}%{qtdir}/bin/${LINK}"
       ;;
     *)
-      LINK=${i}-qt4
-      ln -s $i %{buildroot}%{qtdir}/bin/${LINK}	
+      LINK="${i}"
       ;;
   esac
   install -p -m755 -D %{SOURCE10} %{buildroot}%{_bindir}/${LINK}
@@ -413,15 +410,17 @@
 %{_bindir}/qm2ts*
 %endif
 %if "%{?qdbus}" == "-qdbus"
-%{qtdir}/bin/dbusxml2cpp
-%{_bindir}/dbusxml2cpp
+%{qtdir}/bin/dbus*
+%{_bindir}/dbus*
 %endif
+%{qtdir}/bin/pixeltool*
 %{qtdir}/bin/qmake*
 %{qtdir}/bin/qt3to4
 %{qtdir}/bin/rcc*
 %{qtdir}/bin/uic*
 %{_bindir}/lrelease*
 %{_bindir}/lupdate*
+%{_bindir}/pixeltool*
 %{_bindir}/moc*
 %{_bindir}/qmake*
 %{_bindir}/qt3to4
@@ -437,7 +436,7 @@
 %{qt_libdir}/libQtDesigner.so.*
 %{qt_libdir}/libQtDesignerComponents.so.*
 %{qt_libdir}/libQt*.so
-# 2 remaining static libs: libQtAssistantClient.a libQtUiTools.a 
+# remaining static lib: libQtUiTools.a 
 %{qt_libdir}/libQt*.a
 %{qt_libdir}/libQt*.prl
 %{_libdir}/pkgconfig/*.pc
@@ -494,10 +493,13 @@
 
 
 %changelog
+* Fri Sep 08 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.2.0-0.7.rc1
+- 4.2.0-rc1
+
 * Fri Aug 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.2.0-0.6.20060821
 - update to 4.2.0-snapshot-20060821 (same as today's qt-copy)
 - -no-separate-debug-info
-- BR: libXfixes-devel
+- - ./configure -xfixes, BR: libXfixes-devel
 
 * Mon Aug 07 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.2.0-0.5.tp1
 - fix empty -debuginfo


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qt4/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	28 Aug 2006 12:09:06 -0000	1.5
+++ sources	8 Sep 2006 15:28:22 -0000	1.6
@@ -1 +1 @@
-9d83d8455859c582e1796126e0918bd4  qt-x11-opensource-src-4.2.0-snapshot-20060821.tar.bz2
+abea80e4ec7fe232db63c125c74e917d  qt-x11-opensource-src-4.2.0-rc1.tar.gz