rpms/qt/devel qt.spec,1.190,1.191 qt4-wrapper.sh,1.2,1.3

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27488

Modified Files:
	qt.spec qt4-wrapper.sh 
Log Message:
* Sat Jun 14 2008 Rex Dieter <rdieter at fedoraproject.org> 4.4.0-10
- strip -lsqlite3 from .pc files (#451490)



Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- qt.spec	14 Jun 2008 02:32:46 -0000	1.190
+++ qt.spec	14 Jun 2008 21:38:08 -0000	1.191
@@ -8,7 +8,7 @@
 Name:    qt4
 %endif
 Version: 4.4.0
-Release: 9%{?dist}
+Release: 10%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv3 or GPLv2 with exceptions or QPL
@@ -416,8 +416,8 @@
 # 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 -lssl -lcrypto \
-  -L%{_builddir}/qt-x11%{?preview}-all-opensource-src-%{version}%{?pre}/lib ; do
+for dep in -laudio -ldbus-1 -lfreetype -lfontconfig ${glib2_libs} -lmng -ljpeg -lpng -lm -lz -lssl -lcrypto -lsqlite3 \
+  -L%{_builddir}/qt-x11%{?preview}-opensource-src-%{version}%{?pre}/lib -L/usr/X11R6/%{_lib} ; do
   sed -i -e "s|$dep ||g" %{buildroot}%{_qt4_libdir}/lib*.la ||:
   sed -i -e "s|$dep ||g" %{buildroot}%{_qt4_libdir}/pkgconfig/*.pc
   sed -i -e "s|$dep ||g" %{buildroot}%{_qt4_libdir}/*.prl
@@ -769,6 +769,9 @@
 
 
 %changelog
+* Sat Jun 14 2008 Rex Dieter <rdieter at fedoraproject.org> 4.4.0-10
+- strip -lsqlite3 from .pc files (#451490)
+
 * Sat Jun 14 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.4.0-9
 - restore -qt4 suffixes
 


Index: qt4-wrapper.sh
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt4-wrapper.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qt4-wrapper.sh	10 Jun 2008 13:18:11 -0000	1.2
+++ qt4-wrapper.sh	14 Jun 2008 21:38:08 -0000	1.3
@@ -1,4 +1,4 @@
-#! /bin/bash
+! /bin/bash
 #
 # In multilib environments there is a preferred architecture, 64 bit over 32 bit in x86_64,
 # 32 bit over 64 bit in ppc64. When a conflict is found between two packages corresponding