rpms/qt4/FC-5 qt4-wrapper.sh,1.2,1.3 qt4.spec,1.5,1.6

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	qt4-wrapper.sh qt4.spec 
Log Message:
* Thu Jun 08 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.3-7
- *really* fix qt4-wrapper.sh for good this time.



Index: qt4-wrapper.sh
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-5/qt4-wrapper.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qt4-wrapper.sh	29 May 2006 20:10:11 -0000	1.2
+++ qt4-wrapper.sh	8 Jun 2006 19:37:43 -0000	1.3
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 if [ -z "$QT4DIR" ] ; then
-  QT4DIR="`/usr/bin/pkg-config --variable=prefix QtCore 2>/dev/null || rpm -q --eval "%{_libdir}/qt4"`"
+  QT4DIR="`/usr/bin/pkg-config --variable=prefix QtCore 2>/dev/null || /bin/rpm --eval "%{_libdir}/qt4"`"
   export QT4DIR
 fi
 


Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-5/qt4.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- qt4.spec	29 May 2006 20:10:11 -0000	1.5
+++ qt4.spec	8 Jun 2006 19:37:43 -0000	1.6
@@ -2,7 +2,7 @@
 Summary: Qt GUI toolkit
 Name:	 qt4
 Version: 4.1.3
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 License: GPL/QPL
 Group: 	 System Environment/Libraries
@@ -391,6 +391,9 @@
 
 
 %changelog
+* Thu Jun 08 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.3-7
+- *really* fix qt4-wrapper.sh for good this time.
+
 * Mon May 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.3-6
 - make qt4-wrapper.sh use rpm when pkg-config/qt4-devel isn't
   installed (#193369)