SPECS: qt4.spec - use xfixes, iconv - build static QtDBus - dubug ...

[pascalek]

Author: pascalek                     Date: Fri Oct  6 10:49:51 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use xfixes, iconv
- build static QtDBus
- dubug problem fixed (with -no-separate-deubg-info)

---- Files affected:
SPECS:
   qt4.spec (1.100 -> 1.101) 

---- Diffs:

================================================================
Index: SPECS/qt4.spec
diff -u SPECS/qt4.spec:1.100 SPECS/qt4.spec:1.101
--- SPECS/qt4.spec:1.100	Fri Oct  6 10:05:36 2006
+++ SPECS/qt4.spec	Fri Oct  6 12:49:46 2006
@@ -89,6 +89,7 @@
 BuildRequires:	xorg-lib-libXinerama-devel
 BuildRequires:	xorg-lib-libXrandr-devel
 BuildRequires:	xorg-lib-libXrender-devel
+BuildRequires:	xorg-lib-libXfixes-devel
 %endif
 %{?with_AC:BuildRequires:	X11-devel}
 BuildRequires:	zlib-devel
@@ -987,6 +988,9 @@
 	%{?with_AC:-L/usr/X11R6/lib} \
 	-qt3support \
 	-fontconfig \
+	-iconv \
+	-no-separate-debug-info \
+	-%{!?with_AC:no-}xfixes \
 	-nis \
 	-sm \
 	-tablet \
@@ -1014,6 +1018,7 @@
 %{__make} -C src
 %{__make} -C tools/assistant/lib
 %{__make} -C tools/designer
+%{__make} -C tools/qdbus/src
 if [ ! -d staticlib ]; then
 	mkdir staticlib
 	cp -a lib/*.a staticlib
@@ -1064,9 +1069,6 @@
 %{__make} install \
 	INSTALL_ROOT=$RPM_BUILD_ROOT
 
-# XXX: change config(?) or make install to omit installing these and don't strip ELFs
-find $RPM_BUILD_ROOT -name '*.debug' | xargs rm -f
-
 # kill -L/inside/builddir from *.la and *.pc (bug #77152)
 %{__sed} -i -e "s,-L$PWD/lib,,g" $RPM_BUILD_ROOT%{_libdir}/*.{la,pc,prl}
 
@@ -1546,6 +1548,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.101  2006/10/06 10:49:46  pascalek
+- use xfixes, iconv
+- build static QtDBus
+- dubug problem fixed (with -no-separate-deubg-info)
+
 Revision 1.100  2006/10/06 08:05:36  qboosh
 - added some new files
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/qt4.spec?r1=1.100&r2=1.101&f=u