rpms/qt4/FC-5 qt4.spec,1.6,1.7

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/qt4/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4742

Modified Files:
	qt4.spec 
Log Message:
* Fri Jun 09 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.3-8
- qmake.conf: undefine QMAKE_STRIP to get useful -debuginfo (bug #193602)
- move (not symlink) .pc files into %_libdir/pkgconfig



Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-5/qt4.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- qt4.spec	8 Jun 2006 19:37:43 -0000	1.6
+++ qt4.spec	9 Jun 2006 19:48:22 -0000	1.7
@@ -2,7 +2,7 @@
 Summary: Qt GUI toolkit
 Name:	 qt4
 Version: 4.1.3
-Release: 7%{?dist}
+Release: 8%{?dist}
 
 License: GPL/QPL
 Group: 	 System Environment/Libraries
@@ -152,9 +152,6 @@
 
 %patch1 -p1 -b .assistant4
 
-
-%build
-
 # drop -fexceptions from $RPM_OPT_FLAGS
 RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
 # use $RPM_OPT_FLAGS for our platform
@@ -165,12 +162,19 @@
 %endif
 sed -i -e "s|-O2|$RPM_OPT_FLAGS|g" mkspecs/%{platform}/qmake.conf
 
+# undefine QMAKE_STRIP, so we get useful -debuginfo pkgs
+sed -i -e "s|^QMAKE_STRIP.*=.*|QMAKE_STRIP             =|" mkspecs/linux-g++*/qmake.conf
+#sed -i  -e "s|= strip$|= |g" mkspecs/linux-g++*/qmake.conf
+
 # set correct lib path
 if [ "%{_lib}" == "lib64" ] ; then
   sed -i -e "s,/usr/lib /lib,/usr/%{_lib} /%{_lib},g" config.tests/{unix,x11}/*.test
   sed -i -e "s,/lib /usr/lib,/%{_lib} /usr/%{_lib},g" config.tests/{unix,x11}/*.test
 fi
 
+
+%build
+
 # build shared, threaded (default) libraries
 echo yes | ./configure -v \
   -no-rpath \
@@ -232,11 +236,7 @@
 sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" %{buildroot}%{qt_libdir}/*.prl
 
 mkdir -p %{buildroot}%{_libdir}/pkgconfig/
-pushd  %{buildroot}%{_libdir}/pkgconfig
-for i in ../%{qt_dirname}/%{_lib}/*.pc ; do
-  [ -f "$i" ] && ln -s  $i .
-done
-popd
+mv %{buildroot}/%{qt_libdir}/*.pc %{buildroot}%{_libdir}/pkgconfig/
 
 # -doc make symbolic link to qt_docdir
 rm -rf %{buildroot}%{qtdir}/doc
@@ -341,7 +341,7 @@
 %{qt_libdir}/lib*.a
 %{qt_libdir}/lib*.prl
 %{qtdir}/phrasebooks/
-%{qt_libdir}/*.pc
+#{qt_libdir}/*.pc
 %{_libdir}/pkgconfig/*.pc
 %{qtdir}/q3porting.xml
 # Qt designer
@@ -391,6 +391,10 @@
 
 
 %changelog
+* Fri Jun 09 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.3-8
+- qmake.conf: undefine QMAKE_STRIP to get useful -debuginfo (bug #193602)
+- move (not symlink) .pc files into %%_libdir/pkgconfig
+
 * Thu Jun 08 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.3-7
 - *really* fix qt4-wrapper.sh for good this time.