rpms/qt4/devel .cvsignore, 1.6, 1.7 qt4.spec, 1.19, 1.20 sources, 1.4, 1.5 needs.rebuild, 1.1, NONE

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	.cvsignore qt4.spec sources 
Removed Files:
	needs.rebuild 
Log Message:
* 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



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qt4/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	1 Aug 2006 15:28:13 -0000	1.6
+++ .cvsignore	28 Aug 2006 12:09:06 -0000	1.7
@@ -1,5 +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
-qt41.spec
-
+qt-x11-opensource-src-4.2.0-snapshot-20060821.tar.bz2


Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/devel/qt4.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- qt4.spec	7 Aug 2006 12:32:20 -0000	1.19
+++ qt4.spec	28 Aug 2006 12:09:06 -0000	1.20
@@ -2,18 +2,21 @@
 # Fedora Review
 # http://bugzilla.redhat.com/188180
 
-%define beta tp1
-%define preview -preview
+#define beta tp1
+#define preview -preview
+
+%define snap 20060821
+%define beta snapshot-%{snap}
 
 Summary: Qt toolkit
 Name:	 qt4
 Version: 4.2.0
-Release: 0.5.%{beta}%{?dist}
+Release: 0.6.%{snap}%{?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.gz
+Source0: ftp://ftp.trolltech.com/qt/source/qt-x11%{?preview}-opensource-src-%{version}%{?beta:-%{beta}}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # search for assistant-qt4 instead of (qt3's) assistant in $PATH 
@@ -79,7 +82,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}
 
@@ -225,6 +228,11 @@
 
 %build
 
+# There's a bug in the 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
+
 # build shared, threaded (default) libraries
 echo yes | ./configure -v \
   -prefix %{qtdir} \
@@ -244,6 +252,7 @@
   -qt-gif \
   -no-reduce-exports \
   -no-rpath \
+  -no-separate-debug-info \
   -sm \
   -stl \
   -system-libmng \
@@ -252,6 +261,7 @@
   -system-zlib \
   -tablet \
   -xcursor \
+  -xfixes \
   -xinerama \
   -xshape \
   -xrandr \
@@ -260,9 +270,9 @@
   -glib \
   %{?qdbus} %{!?qdbus:-no-qdbus} \
   %{?nas} %{!?nas:-no-nas-sound} \
-  %{?mysql}  %{?mysql_include} %{?mysql_ldflags} \
-  %{?psql}   \
-  %{?odbc}   \
+  %{?mysql} %{?mysql_include} %{?mysql_ldflags} \
+  %{?psql} \
+  %{?odbc} \
   %{?sqlite} 
 
 make %{?_smp_mflags}
@@ -313,7 +323,7 @@
 pushd %{buildroot}%{qtdir}/bin 
 for i in *; do
   case "$i" in
-    qt3to4|uic3|rcc)
+    dbusxml2cpp|qt3to4|uic3|rcc)
       LINK=$i
       ;;
     *)
@@ -355,7 +365,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README* changes*
+%doc README* 
 %{!?beta:%doc OPENSOURCE-NOTICE.TXT}
 %{qtdir}/LICENSE.*
 %if "%{qt_libdir}" != "%{_libdir}"
@@ -402,6 +412,10 @@
 %{qtdir}/bin/qm2ts*
 %{_bindir}/qm2ts*
 %endif
+%if "%{?qdbus}" == "-qdbus"
+%{qtdir}/bin/dbusxml2cpp
+%{_bindir}/dbusxml2cpp
+%endif
 %{qtdir}/bin/qmake*
 %{qtdir}/bin/qt3to4
 %{qtdir}/bin/rcc*
@@ -480,6 +494,11 @@
 
 
 %changelog
+* 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
+
 * Mon Aug 07 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.2.0-0.5.tp1
 - fix empty -debuginfo
 - use $RPM_OPT_FLAGS


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qt4/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	1 Aug 2006 15:28:13 -0000	1.4
+++ sources	28 Aug 2006 12:09:06 -0000	1.5
@@ -1 +1 @@
-099a99d1b72b4be752fe0e211bc32dcf  qt-x11-preview-opensource-src-4.2.0-tp1.tar.gz
+9d83d8455859c582e1796126e0918bd4  qt-x11-opensource-src-4.2.0-snapshot-20060821.tar.bz2


--- needs.rebuild DELETED ---