rpms/qt4/FC-4 qt4-wrapper.sh,1.1,1.2 qt4.spec,1.3,1.4

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	qt4-wrapper.sh qt4.spec 
Log Message:
* 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)



Index: qt4-wrapper.sh
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-4/qt4-wrapper.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qt4-wrapper.sh	24 May 2006 14:06:14 -0000	1.1
+++ qt4-wrapper.sh	29 May 2006 20:10:28 -0000	1.2
@@ -1,13 +1,13 @@
 #!/bin/sh
 
 if [ -z "$QT4DIR" ] ; then
-  QT4DIR="`/usr/bin/pkg-config --variable=prefix QtCore`"
-
-  if ! echo ${PATH} | /bin/grep -q $QT4DIR/bin ; then
-   PATH=${QT4DIR}/bin:${PATH}
-  fi
+  QT4DIR="`/usr/bin/pkg-config --variable=prefix QtCore 2>/dev/null || rpm -q --eval "%{_libdir}/qt4"`"
+  export QT4DIR
+fi
 
-  export QT4DIR PATH
+if ! echo ${PATH} | /bin/grep -q $QT4DIR/bin ; then
+ PATH=${QT4DIR}/bin:${PATH}
+ export PATH
 fi
 
 exec $QT4DIR/bin/`basename $0` ${1+"$@"}


Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-4/qt4.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- qt4.spec	26 May 2006 20:42:19 -0000	1.3
+++ qt4.spec	29 May 2006 20:10:28 -0000	1.4
@@ -2,7 +2,7 @@
 Summary: Qt GUI toolkit
 Name:	 qt4
 Version: 4.1.3
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 License: GPL/QPL
 Group: 	 System Environment/Libraries
@@ -391,6 +391,10 @@
 
 
 %changelog
+* 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)
+
 * Fri May 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.3-5
 - strip -lXi from .pc files (#193258)
 - simplify sql plugin builds via %%buildSQL macro