rpms/qt4/devel .cvsignore, 1.8, 1.9 qt4.spec, 1.22, 1.23 sources, 1.6, 1.7

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	.cvsignore qt4.spec sources 
Log Message:
* Thu Sep 28 2006 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.2.0-0.9.20060927
- update to 4.2.0-snapshot-20060927
- update QDBus executable names
- -x11: exclude plugins/designer (which belong to -devel)
- BuildConflicts: qt4-devel
- drop -fno-strict-aliasing hack (fc5+)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qt4/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	8 Sep 2006 15:28:22 -0000	1.8
+++ .cvsignore	28 Sep 2006 15:31:48 -0000	1.9
@@ -1,6 +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
 qt-x11-opensource-src-4.2.0-rc1.tar.gz
+qt-x11-opensource-src-4.2.0-snapshot-20060927.tar.bz2


Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/devel/qt4.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- qt4.spec	27 Sep 2006 15:38:49 -0000	1.22
+++ qt4.spec	28 Sep 2006 15:31:48 -0000	1.23
@@ -2,21 +2,27 @@
 # Fedora Review
 # http://bugzilla.redhat.com/188180
 
-%define beta rc1
+#define beta rc1
 #define preview -preview
+#define rel %{beta}
 
-#define snap 20060821
-#define beta snapshot-%{snap}
+%define snap 20060927
+%define beta snapshot-%{snap}
+%define rel  %{snap}
 
 Summary: Qt toolkit
 Name:	 qt4
 Version: 4.2.0
-Release: 0.8.%{beta}%{?dist}
+Release: 0.9.%{rel}%{?dist}
 
 License: GPL/QPL
 Group: 	 System Environment/Libraries
 Url:   	 http://www.trolltech.com/products/qt/
+%if "%{?snap:1}" == "1"
+Source0: ftp://ftp.trolltech.com/qt/snapshots/qt-x11-opensource-src-%{version}%{?beta:-%{beta}}.tar.bz2
+%else
 Source0: ftp://ftp.trolltech.com/qt/source/qt-x11%{?preview}-opensource-src-%{version}%{?beta:-%{beta}}.tar.gz
+%endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # search for assistant-qt4 instead of (qt3's) assistant in $PATH 
@@ -42,6 +48,7 @@
 
 # undefine to disable these
 %define nas     -system-nas-sound
+# watch http://bugzilla.redhat.com/207923 so we may be able to include this on FC-5 someday
 %if "%{?fedora}" > "5"
 %define qdbus	-qdbus
 BuildRequires: dbus-devel >= 0.62
@@ -109,6 +116,8 @@
 #BuildRequires: sqlite-devel
 %endif
 
+BuildConflicts: qt4-devel
+
 Obsoletes: %{name}-config < %{version}-%{release}
 Provides:  %{name}-config = %{version}-%{release}
 
@@ -199,10 +208,13 @@
 
 # drop -fexceptions from $RPM_OPT_FLAGS
 RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
+
+## Looks like we don't need this anymore -- Rex
 # add -fno-strict-aliasing, for now (fc6+)
-%if "%{?fedora}" > "4"
-RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
-%endif
+#if "%{?fedora}" > "5"
+#RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
+#endif
+
 # use $RPM_OPT_FLAGS for our platform
 %if "%{_lib}" == "lib64"
 %define platform linux-g++-64
@@ -225,7 +237,7 @@
 
 %build
 
-# There's a bug in the build somewhere, but we'll hack around it here for now -- Rex
+# There's a bug in the qdbus build somewhere, but we'll hack around it here for now -- Rex
 %if "%{?qdbus}" == "-qdbus"
 LD_RUN_PATH=$(pwd)/lib;export LD_RUN_PATH
 %endif
@@ -394,6 +406,7 @@
 %{qt_libdir}/libQtAssistantClient.so.*
 %endif
 %{qtdir}/plugins/*
+%exclude %{qtdir}/plugins/designer
 %exclude %{qtdir}/plugins/sqldrivers
 #-config bits
 %{qtdir}/bin/qt*config*
@@ -410,8 +423,8 @@
 %{_bindir}/qm2ts*
 %endif
 %if "%{?qdbus}" == "-qdbus"
-%{qtdir}/bin/dbus*
-%{_bindir}/dbus*
+%{qtdir}/bin/qdbus*
+%{_bindir}/qdbus*
 %endif
 %{qtdir}/bin/pixeltool*
 %{qtdir}/bin/qmake*
@@ -493,6 +506,13 @@
 
 
 %changelog
+* Thu Sep 28 2006 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.2.0-0.9.20060927
+- update to 4.2.0-snapshot-20060927
+- update QDBus executable names
+- -x11: exclude plugins/designer (which belong to -devel)
+- BuildConflicts: qt4-devel
+- drop -fno-strict-aliasing hack (fc5+)
+
 * Wed Sep 27 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.2.0-0.8.rc1
 - qtconfig.desktop: Categories=+AdvancedSettings;Settings
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qt4/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	8 Sep 2006 15:28:22 -0000	1.6
+++ sources	28 Sep 2006 15:31:48 -0000	1.7
@@ -1 +1 @@
-abea80e4ec7fe232db63c125c74e917d  qt-x11-opensource-src-4.2.0-rc1.tar.gz
+3b50147f1f6ab2efabd0b47587d67ab0  qt-x11-opensource-src-4.2.0-snapshot-20060927.tar.bz2