rpms/qt4/F-7 qt4-wrapper.sh, 1.3, 1.4 qt4.macros, 1.3, 1.4 qt4.spec, 1.46, 1.47

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/qt4/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16245

Modified Files:
	qt4-wrapper.sh qt4.macros qt4.spec 
Log Message:
* Sun Jul 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.0-9
- multilib broken: qconfig.h (#248768)
- +%_qt4_demosdir,%_qt4_examplesdir
- + Qt.pc, provide pkgconfig access to qt4 macros/variables



Index: qt4-wrapper.sh
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/F-7/qt4-wrapper.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- qt4-wrapper.sh	8 Jun 2006 19:37:04 -0000	1.3
+++ qt4-wrapper.sh	21 Jul 2007 05:12:49 -0000	1.4
@@ -1,7 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 if [ -z "$QT4DIR" ] ; then
-  QT4DIR="`/usr/bin/pkg-config --variable=prefix QtCore 2>/dev/null || /bin/rpm --eval "%{_libdir}/qt4"`"
+  # rpm is more correct multilib-wise, provided /etc/rpm/platform doesn't get in the way.
+  QT4DIR="$(/bin/rpm --eval "%{_libdir}/qt4" 2>/dev/null || /usr/bin/pkg-config --variable=prefix QtCore )"
   export QT4DIR
 fi
 


Index: qt4.macros
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/F-7/qt4.macros,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- qt4.macros	6 Jul 2007 14:31:12 -0000	1.3
+++ qt4.macros	21 Jul 2007 05:12:49 -0000	1.4
@@ -1,11 +1,13 @@
 
-%_qt4_prefix	%{_libdir}/qt4	
 %_qt4_bindir	%{_qt4_prefix}/bin
-%_qt4_datadir	%{_datadir}/qt4	
-%_qt4_docdir	%{_docdir}/qt4	
-%_qt4_headerdir	%{_includedir}
+%_qt4_datadir   %{_datadir}/qt4
+%_qt4_demosdir	%{_qt4_prefix}/demos	
+%_qt4_docdir    %{_docdir}/qt4
+%_qt4_examples 	%{_qt4_prefix}/examples	
+%_qt4_headerdir %{_includedir}
 %_qt4_libdir	%{_libdir}
 %_qt4_plugindir	%{_qt4_prefix}/plugins
-%_qt4_sysconfdir	%{_sysconfdir}
-%_qt4_translationdir	%{_qt4_datadir}/translations	
-
+%_qt4_prefix    %{_libdir}/qt4
+%_qt4_qmake	%{_qt4_bindir}/qmake
+%_qt4_sysconfdir        %{_sysconfdir}
+%_qt4_translationdir    %{_qt4_datadir}/translations


Index: qt4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/F-7/qt4.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- qt4.spec	6 Jul 2007 14:31:12 -0000	1.46
+++ qt4.spec	21 Jul 2007 05:12:49 -0000	1.47
@@ -11,7 +11,7 @@
 Summary: Qt toolkit
 Name:	 qt4
 Version: 4.3.0
-Release: 8%{?dist}
+Release: 9%{?dist}
 
 License: GPL
 Group: 	 System Environment/Libraries
@@ -24,7 +24,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if "%{name}" != "qt4"
-#Epoch: 1
+Epoch: 1
 Obsoletes: qt4 < %{version}-%{release}
 Provides:  qt4 = %{version}-%{release}
 %endif
@@ -32,7 +32,7 @@
 Source1: Trolltech.conf
 
 # See http://bugzilla.redhat.com/223663
-%define multilib_arches x86_64 %{ix86} ppc64 ppc s390 s390x sparc64 sparc
+%define multilib_archs x86_64 %{ix86} ppc64 ppc s390 s390x sparc64 sparc
 Source5: qconfig-multilib.h
 
 # search for assistant-qt4 instead of (qt3's) assistant in $PATH 
@@ -46,6 +46,8 @@
 Source12: qt4.csh
 # /etc/rpm/macros.qt4
 Source13: qt4.macros
+# alternative implementation, using qmake -query ... calls to extract values
+Source14: qt4.macros.qmake
 
 Source20: assistant.desktop
 Source21: designer.desktop
@@ -75,7 +77,9 @@
 %define _qt4_prefix 	%{_libdir}/qt4
 %define _qt4_bindir	%{_qt4_prefix}/bin
 %define _qt4_datadir 	%{_datadir}/qt4
+%define _qt4_demosdir	%{_qt4_prefix}/demos
 %define _qt4_docdir	%{_docdir}/qt4
+%define _qt4_examplesdir %{_qt4_prefix}/examples
 %define _qt4_headerdir 	%{_includedir} 
 %define _qt4_libdir	%{_libdir}
 %define _qt4_plugindir	%{_qt4_prefix}/plugins
@@ -275,7 +279,9 @@
   -prefix %{_qt4_prefix} \
   -bindir %{_qt4_bindir} \
   -datadir %{_qt4_datadir} \
+  -demosdir %{_qt4_demosdir} \
   -docdir %{_qt4_docdir} \
+  -examplesdir %{_qt4_examplesdir} \
   -headerdir %{_qt4_headerdir} \
   -libdir %{_qt4_libdir} \
   -plugindir %{_qt4_plugindir} \
@@ -419,6 +425,26 @@
 # Trolltech.conf
 install -p -m644 -D %{SOURCE1} %{buildroot}%{_qt4_sysconfdir}/Trolltech.conf
 
+# Qt path
+cat >%{buildroot}%{_libdir}/pkgconfig/Qt.pc<<EOF
+prefix=%{_qt4_prefix}
+bindir=%{_qt4_bindir}
+datadir=%{_qt4_datadir}
+demosdir=%{qt4_demosdir}
+docdir=%{_qt4_docdir}
+examplesdir=%{_qt4_examplesdir}
+headerdir=%{_qt4_headerdir}
+libdir=%{_qt4_libdir}
+plugindir=%{_qt4_plugindir}
+qmake=%{_qt4_bindir}/qmake
+sysconfdir=%{_qt4_sysconfdir}
+translationdir=%{_qt4_translationdir}
+
+Name: Qt
+Description: Qt Configuration
+Version: %{version}
+EOF
+
 
 %check
 # verify %%_qt_* vs qmake -query equivalents
@@ -429,11 +455,14 @@
 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_demosdir}" == "$(qmake -query QT_INSTALL_DEMOS)" || ERR=1
 test "%{_qt4_docdir}" == "$(qmake -query QT_INSTALL_DOCS)" || ERR=1
+test "%{_qt4_examplesdir}" == "$(qmake -query QT_INSTALL_EXAMPLES)" || 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_translationdir}" == "$(qmake -query QT_INSTALL_TRANSLATIONS)" || ERR=1
 exit $ERR
 
 
@@ -544,8 +573,8 @@
 %dir %{_qt4_docdir}/
 %{_qt4_docdir}/html
 %{_qt4_prefix}/doc
-%{_qt4_prefix}/demos/
-%{_qt4_prefix}/examples/
+%{_qt4_demosdir}/
+%{_qt4_examplesdir}/
 # Qt Assistant
 %{_qt4_bindir}/assistant*
 %{_bindir}/assistant*
@@ -581,6 +610,11 @@
 
 
 %changelog
+* Sun Jul 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.0-9
+- multilib broken: qconfig.h (#248768)
+- +%%_qt4_demosdir,%%_qt4_examplesdir
+- + Qt.pc, provide pkgconfig access to qt4 macros/variables
+
 * Thu Jul 05 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.0-8
 - fix %%_qt4_prefix/doc symlink