rpms/qt4/devel qt4.spec,1.39,1.40

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	qt4.spec 
Log Message:
* Thu Mar 22 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.2.3-6
- -system-sqlite, BR: sqlite-devel
- drop mysql_config hackery



Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/devel/qt4.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- qt4.spec	21 Mar 2007 20:50:32 -0000	1.39
+++ qt4.spec	23 Mar 2007 14:47:45 -0000	1.40
@@ -13,7 +13,7 @@
 Summary: Qt toolkit
 Name:	 qt4
 Version: 4.2.3
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 License: GPL/QPL
 Group: 	 System Environment/Libraries
@@ -105,19 +105,14 @@
 %if 0%{?fedora} > 4 || 0%{?rhel} > 4
 %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} %{?x_deps_GL_hack}
+BuildRequires: %{x_deps}
 
 %if "%{?nas}" == "-system-nas-sound"
 BuildRequires: nas-devel
 %endif
 
 %if "%{?mysql}" != "-no-sql-mysql"
-# mysql-devel < 4 build fails on 4.1.3+, not sure why... yet.  -- Rex
 BuildRequires: mysql-devel >= 4.0
-# If we get mysql3 to work, use mysql_config --cflags instead -- Rex
-%global mysql_include $(mysql_config --include 2> /dev/null || echo "-I%{_includedir}/mysql")
-%global mysql_libs    $(mysql_config --libs 2> /dev/null || echo "-L%{_libdir}/mysql")
-%global mysql_ldflags $(echo %{mysql_libs} | perl -pi -e "s, -l/?\\\S+,,g")
 %endif
 
 %if "%{?psql}" != "-no-sql-psql"
@@ -129,8 +124,8 @@
 %endif
 
 %if "%{?sqlite:1}" != "-no-sql-sqlite"
-# FIXME: currently BR not used, uses 3rd-party internal sources
-#BuildRequires: sqlite-devel
+%define _system_sqlite -system-sqlite
+BuildRequires: sqlite-devel
 %endif
 
 Obsoletes: %{name}-config < %{version}-%{release}
@@ -306,10 +301,10 @@
   -glib \
   %{?qdbus} %{!?qdbus:-no-qdbus} \
   %{?nas} %{!?nas:-no-nas-sound} \
-  %{?mysql} %{?mysql_include} %{?mysql_ldflags} \
+  %{?mysql} \
   %{?psql} \
   %{?odbc} \
-  %{?sqlite} 
+  %{?sqlite} %{?_system_sqlite}
 
 make %{?_smp_mflags}
 
@@ -329,7 +324,7 @@
 # strip extraneous dirs/libraries -- Rex
 # safe ones
 glib2_libs=$(pkg-config --libs glib-2.0 gthread-2.0)
-for dep in -laudio -ldbus-1 -lfreetype -lfontconfig ${glib2_libs} -lmng -ljpeg -lpng -lm -lz %{?mysql_ldflags} \
+for dep in -laudio -ldbus-1 -lfreetype -lfontconfig ${glib2_libs} -lmng -ljpeg -lpng -lm -lz \
   -L%{_builddir}/qt-x11%{?preview}-opensource-src-%{version}%{?beta:-%{beta}}/lib ; do
   sed -i -e "s|$dep ||g" %{buildroot}%{qt4_libdir}/lib*.la ||:
   sed -i -e "s|$dep ||g" %{buildroot}%{qt4_libdir}/*.pc
@@ -560,6 +555,10 @@
 
 
 %changelog
+* Thu Mar 22 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.2.3-6
+- -system-sqlite, BR: sqlite-devel
+- drop mysql_config hackery
+
 * Wed Mar 21 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.2.3-5
 - strip (all) glib2 libs from .pc files
 - prepend _ to rpm macros