rpms/qt4/FC-4 .cvsignore, 1.6, 1.7 qt4.spec, 1.12, 1.13 qtconfig.desktop, 1.2, 1.3

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	.cvsignore qt4.spec qtconfig.desktop 
Log Message:
* Wed Oct 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.4-11.1
- (re)enable -system-nas-sound on FC-4/x86_64



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	26 Jul 2006 03:23:28 -0000	1.6
+++ .cvsignore	11 Oct 2006 14:47:31 -0000	1.7
@@ -1,5 +1,4 @@
 clog
+OLD/
 qt-x11-opensource-src-4.1.4.tar.gz
-qt-x11-preview-opensource-src-4.2.0-tp1.tar.gz
-qt42.spec
-
+qt-x11-opensource-src-4.2.0.tar.gz


Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-4/qt4.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- qt4.spec	26 Jul 2006 03:23:28 -0000	1.12
+++ qt4.spec	11 Oct 2006 14:47:31 -0000	1.13
@@ -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: 11%{?dist}.1
 
 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
@@ -27,26 +27,16 @@
 ## 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 
 # 
-%if "%{?fedora}" > "4"
+#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
+#endif
 
 %define qt_dirname %{name} 
 %define qtdir %{_libdir}/%{qt_dirname}
@@ -310,12 +300,12 @@
 pushd %{buildroot}%{qtdir}/bin 
 for i in *; do
   case "$i" in
-    qt3to4|uic3|rcc)
-      LINK=$i
+    assistant|designer|linguist|lrelease|lupdate|moc|qmake|qtconfig|qtdemo|uic)
+      LINK=${i}-qt4
       ;;
     *)
-      LINK=${i}-qt4
-      ln -s $i %{buildroot}%{qtdir}/bin/${LINK}	
+      LINK=${i}
+      ln -s $i %{buildroot}%{qtdir}/bin/${LINK}
       ;;
   esac
   install -p -m755 -D %{SOURCE10} %{buildroot}%{_bindir}/${LINK}
@@ -472,6 +462,16 @@
 
 
 %changelog
+* Wed Oct 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.4-11.1
+- (re)enable -system-nas-sound on FC-4/x86_64
+
+* Mon Aug 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.4-11
+- backout xfixes mod(s), only applicable to 4.2 branch
+- cleanup bindir renames
+
+* Mon 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: qtconfig.desktop
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-4/qtconfig.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qtconfig.desktop	5 Jul 2006 11:38:56 -0000	1.2
+++ qtconfig.desktop	11 Oct 2006 14:47:31 -0000	1.3
@@ -5,4 +5,4 @@
 Terminal=false
 Encoding=UTF-8
 Type=Application
-Categories=Qt;Application;Development;
+Categories=Qt;Application;AdvancedSettings;Settings;