rpms/qt4/FC-5 .cvsignore, 1.5, 1.6 qt4.spec, 1.14, 1.15 sources, 1.3, 1.4

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	.cvsignore qt4.spec sources 
Log Message:
* Fri Aug 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.4-9
- ./configure -xfixes, BR: libXfixes-devel



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	16 Jul 2006 13:35:46 -0000	1.5
+++ .cvsignore	28 Aug 2006 12:16:49 -0000	1.6
@@ -1,4 +1,5 @@
 clog
+qt41.spec
 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


Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-5/qt4.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- qt4.spec	20 Jul 2006 23:19:54 -0000	1.14
+++ qt4.spec	28 Aug 2006 12:16:49 -0000	1.15
@@ -1,11 +1,11 @@
 
 # Fedora Review
-# http://bugzilla.redhat.com/bugzilla/188180
+# http://bugzilla.redhat.com/188180
 
 Summary: Qt toolkit
 Name:	 qt4
 Version: 4.1.4
-Release: 8%{?dist}
+Release: 9%{?dist}
 
 License: GPL/QPL
 Group: 	 System Environment/Libraries
@@ -13,7 +13,7 @@
 Source0:  ftp://ftp.troll.no/qt/source/qt-x11-opensource-src-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# search for assistant4 instead of (qt3's) assistant in $PATH 
+# search for assistant-qt4 instead of (qt3's) assistant in $PATH 
 Patch1: qt-x11-opensource-src-4.1.2-assistant4.patch
 
 Source10: qt4-wrapper.sh
@@ -28,17 +28,22 @@
 # 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"
-%define mysql  -plugin-sql-mysql
-%endif
-%if "%{?rhel}" > "3"
+%if "%{?fedora}" > "3" || "%{?rhel}" > "3"
 %define mysql  -plugin-sql-mysql
 %endif
 %define odbc   -plugin-sql-odbc 
 %define psql   -plugin-sql-psql 
 %define sqlite -plugin-sql-sqlite 
 # 
+%if "%{?fedora}" > "4"
+%define nas     -system-nas-sound
+%endif
+%if "%{?fedora}" == "4"
+# nas unavailable on fc4/x86_64
+%ifnarch x86_64
 %define nas     -system-nas-sound
+%endif
+%endif
 
 %define qt_dirname %{name} 
 %define qtdir %{_libdir}/%{qt_dirname}
@@ -71,7 +76,7 @@
 
 %define x_deps libGL-devel libGLU-devel
 %if "%{?fedora}" > "4"
-%define x_deps libICE-devel libSM-devel libXcursor-devel libXext-devel libXft-devel libXi-devel libXinerama-devel libXrandr-devel libXrender-devel libXt-devel libX11-devel xorg-x11-proto-devel libGL-devel libGLU-devel
+%define x_deps libICE-devel libSM-devel libXcursor-devel libXext-devel libXfixes-devel libXft-devel libXi-devel libXinerama-devel libXrandr-devel libXrender-devel libXt-devel libX11-devel xorg-x11-proto-devel libGL-devel libGLU-devel
 %endif
 BuildRequires: %{x_deps}
 
@@ -243,6 +248,7 @@
   -system-zlib \
   -tablet \
   -xcursor \
+  -xfixes \
   -xinerama \
   -xshape \
   -xrandr \
@@ -464,6 +470,9 @@
 
 
 %changelog
+* Fri Aug 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.4-9
+- ./configure -xfixes, BR: libXfixes-devel
+
 * Thu Jul 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.4-8
 - strip -laudio, -lglib-2.0 from .pc files
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	23 Jun 2006 18:35:57 -0000	1.3
+++ sources	28 Aug 2006 12:16:49 -0000	1.4
@@ -1 +1,2 @@
 88f8c9c4622108baca2950baac3c02d6  qt-x11-opensource-src-4.1.4.tar.gz
+099a99d1b72b4be752fe0e211bc32dcf  qt-x11-preview-opensource-src-4.2.0-tp1.tar.gz