rpms/qt4/devel qt4.spec,1.53,1.54

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	qt4.spec 
Log Message:
try using a %%check section that more closely resembles something that might actually work.



Index: qt4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/devel/qt4.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- qt4.spec	3 Jul 2007 14:04:50 -0000	1.53
+++ qt4.spec	3 Jul 2007 14:39:14 -0000	1.54
@@ -11,7 +11,7 @@
 Summary: Qt toolkit
 Name:	 qt4
 Version: 4.3.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 License: GPL
 Group: 	 System Environment/Libraries
@@ -422,16 +422,17 @@
 %check
 # verify %%_qt_* vs qmake -query equivalents
 ERR=0
-QMAKE=%{buildroot}{%_qt4_bindir}/qmake
+PATH=%{buildroot}%{_qt4_bindir}:$PATH
+export PATH
 set -x
-test "%{_qt4_prefix}" == "$($QMAKE -query QT_INSTALL_PREFIX)" || ERR=1
-test "%{_qt4_bindir}" == "$($QMAKE -query QT_INSTALL_BINS)" || ERR=1
-test "%{_qt4_datadir}" == "$($QMAKE -query QT_INSTALL_DATA)" || ERR=1
-test "%{_qt4_docdir}" == "$($QMAKE -query QT_INSTALL_DOCS)" || ERR=1
-test "%{_qt4_headerdir}" == "$($QMAKE -query QT_INSTALL_HEADERS)" || ERR=1 
-test "%{_qt4_libdir}" == "$($QMAKE -query QT_INSTALL_LIBS)" || ERR=1 
-test "%{_qt4_plugindir}" == "$($QMAKE -query QT_INSTALL_PLUGINS)" || ERR=1
-test "%{_qt4_sysconfdir}" == "$($QMAKE -query QT_INSTALL_CONFIGURATION)" || ERR=1
+test "%{_qt4_prefix}" == "$(qmake -query QT_INSTALL_PREFIX)" || ERR=1
+test "%{_qt4_bindir}" == "$(qmake -query QT_INSTALL_BINS)" || ERR=1
+test "%{_qt4_datadir}" == "$(qmake -query QT_INSTALL_DATA)" || ERR=1
+test "%{_qt4_docdir}" == "$(qmake -query QT_INSTALL_DOCS)" || ERR=1
+test "%{_qt4_headerdir}" == "$(qmake -query QT_INSTALL_HEADERS)" || ERR=1 
+test "%{_qt4_libdir}" == "$(qmake -query QT_INSTALL_LIBS)" || ERR=1 
+test "%{_qt4_plugindir}" == "$(qmake -query QT_INSTALL_PLUGINS)" || ERR=1
+test "%{_qt4_sysconfdir}" == "$(qmake -query QT_INSTALL_CONFIGURATION)" || ERR=1
 exit $ERR
 
 
@@ -579,7 +580,7 @@
 
 
 %changelog
-* Thu Jun 28 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.0-6
+* Thu Jun 28 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.0-7
 - prepare for possible rename qt4 -> qt (+Provides: qt4)
 - make _qt4_* macro usage consistent (with %%check's)