SPECS (AC-branch): qt.spec - qtkdeintegration patches; rel 9

[glen]

Author: glen                         Date: Mon Dec 17 22:33:15 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- qtkdeintegration patches; rel 9

---- Files affected:
SPECS:
   qt.spec (1.352.2.2.2.7 -> 1.352.2.2.2.8) 

---- Diffs:

================================================================
Index: SPECS/qt.spec
diff -u SPECS/qt.spec:1.352.2.2.2.7 SPECS/qt.spec:1.352.2.2.2.8
--- SPECS/qt.spec:1.352.2.2.2.7	Thu Dec  6 00:49:18 2007
+++ SPECS/qt.spec	Mon Dec 17 23:33:10 2007
@@ -17,8 +17,8 @@
 %ifnarch %{ix86} %{x8664} sparc sparcv9 alpha ppc
 %undefine	with_ibase
 %endif
-%define		_withsql	1
-%{!?with_sqlite:%{!?with_ibase:%{!?with_mysql:%{!?with_pgsql:%{!?with_odbc:%undefine _withsql}}}}}
+%define		with_sql	1
+%{!?with_sqlite:%{!?with_ibase:%{!?with_mysql:%{!?with_pgsql:%{!?with_odbc:%undefine with_sql}}}}}
 
 %define		_ver		3.3.8
 
@@ -28,7 +28,7 @@
 Summary(pt_BR.UTF-8):	Estrutura para rodar aplicações GUI Qt
 Name:		qt
 Version:	%{_ver}
-Release:	8
+Release:	9
 Epoch:		6
 License:	QPL v1 or GPL v2
 Group:		X11/Libraries
@@ -41,6 +41,9 @@
 Source5:	designer.png
 Source6:	assistant.png
 Source7:	linguist.png
+# generated using notes from kdebase-SuSE/qtkdeintegration/README
+Source8:	qtkdeintegration_x11.cpp
+Source9:	qtkdeintegration_x11_p.h
 
 # qt-copy patches
 # http://websvn.kde.org/branches/qt/3.3/qt-copy/patches/
@@ -92,6 +95,7 @@
 Patch14:	%{name}-x11-qfontdatabase_x11.patch
 Patch15:	%{name}-uic_colon_fix.patch
 Patch16:	%{name}-fvisibility.patch
+Patch17:	qtkdeintegration.patch
 URL:		http://www.trolltech.com/products/qt/
 %{?with_ibase:BuildRequires:	Firebird-devel >= 1.5.0}
 BuildRequires:	OpenGL-GLU-devel
@@ -725,6 +729,11 @@
 #%patch14 -p1
 %patch15 -p0
 %patch16 -p0
+%patch17 -p0
+
+# copy qt kde integration files
+cp %{SOURCE8} %{SOURCE9} src/kernel
+cp %{SOURCE9} include/private
 
 # change QMAKE_CFLAGS_RELEASE to build
 # properly optimized libs
@@ -757,9 +766,9 @@
 export PATH=$QTDIR/bin:$PATH
 export LD_LIBRARY_PATH=$QTDIR/%{_lib}:$LD_LIBRARY_PATH
 
-if [ "%{_lib}" != "lib" ] ; then
+%if "%{_lib}" != "lib"
 	ln -sf lib "%{_lib}"
-fi
+%endif
 
 # pass OPTFLAGS to build qmake itself with optimization
 export OPTFLAGS="%{rpmcxxflags}"
@@ -771,6 +780,9 @@
 ##################################
 
 DEFAULTOPT=" \
+%if "%{_lib}" != "lib"
+	-DUSE_LIB64_PATHES \
+%endif
 	-DQT_CLEAN_NAMESPACE \
 	-verbose \
 	-prefix %{_prefix} \
@@ -902,7 +914,7 @@
 rm -rf plugins-st
 mkdir plugins-st
 cp -R plugins/{imageformats,styles} plugins-st
-%{?_withsql:cp -R plugins/sqldrivers plugins-st}
+%{?with_sql:cp -R plugins/sqldrivers plugins-st}
 %{__make} clean
 %endif
 
@@ -1020,6 +1032,7 @@
 
 # We provide qt style classes as plugins,
 # so make corresponding changes to the qconfig.h.
+chmod u+w $RPM_BUILD_ROOT%{_includedir}/qt/qconfig.h
 
 cat >> $RPM_BUILD_ROOT%{_includedir}/qt/qconfig.h << EOF
 
@@ -1105,7 +1118,7 @@
 %dir %{_libdir}/%{name}/plugins-mt/imageformats
 %attr(755,root,root) %{_libdir}/%{name}/plugins-mt/imageformats/*.so
 %dir %{_libdir}/%{name}/plugins-mt/network
-%{?_withsql:%dir %{_libdir}/%{name}/plugins-mt/sqldrivers}
+%{?with_sql:%dir %{_libdir}/%{name}/plugins-mt/sqldrivers}
 %dir %{_libdir}/%{name}/plugins-mt/styles
 %attr(755,root,root) %{_libdir}/%{name}/plugins-mt/styles/*.so
 %dir %{_datadir}/qt
@@ -1192,7 +1205,7 @@
 %attr(755,root,root) %{_libdir}/libqt.so.*.*.*
 %dir %{_libdir}/%{name}/plugins-st
 %dir %{_libdir}/%{name}/plugins-st/network
-%{?_withsql:%dir %{_libdir}/%{name}/plugins-st/sqldrivers}
+%{?with_sql:%dir %{_libdir}/%{name}/plugins-st/sqldrivers}
 %dir %{_libdir}/%{name}/plugins-st/imageformats
 %attr(755,root,root) %{_libdir}/%{name}/plugins-st/imageformats/*.so
 %dir %{_libdir}/%{name}/plugins-st/styles
@@ -1299,6 +1312,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.352.2.2.2.8  2007-12-17 22:33:10  glen
+- qtkdeintegration patches; rel 9
+
 Revision 1.352.2.2.2.7  2007-12-05 23:49:18  glen
 - HEAD merge
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/qt.spec?r1=1.352.2.2.2.7&r2=1.352.2.2.2.8&f=u