rpms/qt4/devel qt4.macros.qmake, NONE, 1.1 qt4-wrapper.sh, 1.3, 1.4 qt4.macros, 1.3, 1.4 qt4.spec, 1.55, 1.56
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Wed Jul 18 17:32:09 UTC 2007
Author: rdieter
Update of /cvs/pkgs/rpms/qt4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23632
Modified Files:
qt4-wrapper.sh qt4.macros qt4.spec
Added Files:
qt4.macros.qmake
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
--- NEW FILE qt4.macros.qmake ---
## use (qmake) runtime
# assumes %_qt4_qmake prereq, which can't depend on %_qt4_bindir, arg
%_qt4_qmake /usr/bin/qmake-qt4
%_qt4_bindir %(%{_qt4_qmake} -query QT_INSTALL_BINS)
%_qt4_datadir %(%{_qt4_qmake} -query QT_INSTALL_DATA)
%_qt4_demosdir %(%{_qt4_qmake} -query QT_INSTALL_DEMOS)
%_qt4_examplesdir %(%{_qt4_qmake} -query QT_INSTALL_EXAMPLES)
%_qt4_docdir %(%{_qt4_qmake} -query QT_INSTALL_DOCS)
%_qt4_headerdir %(%{_qt4_qmake} -query QT_INSTALL_HEADERS)
%_qt4_libdir %(%{_qt4_qmake} -query QT_INSTALL_LIBS)
%_qt4_plugindir %(%{_qt4_qmake} -query QT_INSTALL_PLUGINS)
%_qt4_prefix %(%{_qt4_qmake} -query QT_INSTALL_PREFIX)
%_qt4_sysconfdir %(%{_qt4_qmake} -query QT_INSTALL_CONFIGURATION)
%_qt4_translationdir %(%{_qt4_qmake} -query QT_INSTALL_TRANSLATIONS)
%_qt4_version %(%{_qt4_qmake} -query QT_VERSION)
Index: qt4-wrapper.sh
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/devel/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 18 Jul 2007 17:31:36 -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/devel/qt4.macros,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- qt4.macros 24 Jun 2007 00:02:18 -0000 1.3
+++ qt4.macros 18 Jul 2007 17:31:36 -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/devel/qt4.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- qt4.spec 5 Jul 2007 08:00:38 -0000 1.55
+++ qt4.spec 18 Jul 2007 17:31:36 -0000 1.56
@@ -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,6 +24,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if "%{name}" != "qt4"
+Epoch: 1
Obsoletes: qt4 < %{version}-%{release}
Provides: qt4 = %{version}-%{release}
%endif
@@ -31,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
@@ -45,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
@@ -74,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
@@ -274,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} \
@@ -418,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
@@ -428,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
@@ -543,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*
@@ -580,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
More information about the scm-commits
mailing list