rpms/qt4/F-7 assistant.desktop, 1.3, 1.4 designer.desktop, 1.2, 1.3 linguist.desktop, 1.2, 1.3 qconfig-multilib.h, 1.3, 1.4 qt4.macros, 1.2, 1.3 qt4.spec, 1.45, 1.46 qtconfig.desktop, 1.3, 1.4 qtdemo.desktop, 1.2, 1.3
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Fri Jul 6 14:31:47 UTC 2007
Author: rdieter
Update of /cvs/pkgs/rpms/qt4/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2736
Modified Files:
assistant.desktop designer.desktop linguist.desktop
qconfig-multilib.h qt4.macros qt4.spec qtconfig.desktop
qtdemo.desktop
Log Message:
* Thu Jul 05 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.0-8
- fix %%_qt4_prefix/doc symlink
* 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)
* Sat Jun 23 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.0-5
- fix rpm macros, (%%_qt_plugindir, %%_qt4_translationdir}
* Thu Jun 21 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.0-4
- .desktop Category cleanup
* Thu Jun 21 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.0-3
- cleanup qconfig.h/multilib bits, add s390x/s390
Index: assistant.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/F-7/assistant.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- assistant.desktop 29 Jun 2006 20:52:13 -0000 1.3
+++ assistant.desktop 6 Jul 2007 14:31:12 -0000 1.4
@@ -6,4 +6,4 @@
Terminal=false
Encoding=UTF-8
Type=Application
-Categories=Qt;Application;Development;
+Categories=Qt;Development;Documentation;
Index: designer.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/F-7/designer.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- designer.desktop 29 Jun 2006 20:52:13 -0000 1.2
+++ designer.desktop 6 Jul 2007 14:31:12 -0000 1.3
@@ -8,4 +8,4 @@
Terminal=false
Encoding=UTF-8
Type=Application
-Categories=Qt;Application;Development;
+Categories=Qt;Development;
Index: linguist.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/F-7/linguist.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linguist.desktop 29 Jun 2006 20:52:13 -0000 1.2
+++ linguist.desktop 6 Jul 2007 14:31:12 -0000 1.3
@@ -7,4 +7,4 @@
Terminal=false
Encoding=UTF-8
Type=Application
-Categories=Qt;Application;Development;
+Categories=Qt;Development;
Index: qconfig-multilib.h
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/F-7/qconfig-multilib.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- qconfig-multilib.h 9 Mar 2007 13:04:57 -0000 1.3
+++ qconfig-multilib.h 6 Jul 2007 14:31:12 -0000 1.4
@@ -1,18 +1,27 @@
/* qconfig.h */
-/* hack for multilib'ing */
+/* This file is here to prevent a file conflict on multiarch systems. A
+ * conflict will occur because qconfig.h has arch-specific definitions.
+ *
+ * DO NOT INCLUDE THE NEW FILE DIRECTLY -- ALWAYS INCLUDE THIS ONE INSTEAD. */
#if defined(__x86_64__)
# include <QtCore/qconfig-x86_64.h>
#elif defined(__i386__)
# include <QtCore/qconfig-i386.h>
-#elif defined(__ppc64__) || defined(__powerpc64__)
+#elif defined(__powerpc64__)
# include <QtCore/qconfig-ppc64.h>
-#elif defined(__ppc__) || defined(__powerpc__)
+#elif defined(__powerpc__)
# include <QtCore/qconfig-ppc.h>
+#elif defined(__s390x__)
+# include <QtCore/qconfig-s390x.h>
+#elif defined(__s390__)
+# include <QtCore/qconfig-s390.h>
#elif defined(__sparc64__)
# include <QtCore/qconfig-sparc64.h>
#elif defined(__sparc__)
# include <QtCore/qconfig-sparc.h>
#else
-# error arch unsupported, see bugzilla.redhat.com/223663
+/* Should never reach this point, if so see bugzilla.redhat.com/223663 */
+#error "This qt4-devel package does not work your architecture?"
#endif
+
Index: qt4.macros
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/F-7/qt4.macros,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qt4.macros 21 Mar 2007 20:47:50 -0000 1.2
+++ qt4.macros 6 Jul 2007 14:31:12 -0000 1.3
@@ -1,11 +1,11 @@
%_qt4_prefix %{_libdir}/qt4
-%_qt4_bindir %{qt4_prefix}/bin
+%_qt4_bindir %{_qt4_prefix}/bin
%_qt4_datadir %{_datadir}/qt4
%_qt4_docdir %{_docdir}/qt4
-%_qt4_headerdir %{_includedir}
-%_qt4_libdir %{_libdir}
-%_qt4_plugindir %{qt4_prefix}/plugins
+%_qt4_headerdir %{_includedir}
+%_qt4_libdir %{_libdir}
+%_qt4_plugindir %{_qt4_prefix}/plugins
%_qt4_sysconfdir %{_sysconfdir}
-%_qt4_translationdir %{qt4_datadir}/translations
+%_qt4_translationdir %{_qt4_datadir}/translations
Index: qt4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/F-7/qt4.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- qt4.spec 4 Jun 2007 15:06:38 -0000 1.45
+++ qt4.spec 6 Jul 2007 14:31:12 -0000 1.46
@@ -11,7 +11,7 @@
Summary: Qt toolkit
Name: qt4
Version: 4.3.0
-Release: 2%{?dist}
+Release: 8%{?dist}
License: GPL
Group: System Environment/Libraries
@@ -23,10 +23,16 @@
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%if "%{name}" != "qt4"
+#Epoch: 1
+Obsoletes: qt4 < %{version}-%{release}
+Provides: qt4 = %{version}-%{release}
+%endif
+
Source1: Trolltech.conf
# See http://bugzilla.redhat.com/223663
-ExclusiveArch: i386 x86_64 ppc ppc64 sparc sparc64
+%define multilib_arches x86_64 %{ix86} ppc64 ppc s390 s390x sparc64 sparc
Source5: qconfig-multilib.h
# search for assistant-qt4 instead of (qt3's) assistant in $PATH
@@ -38,7 +44,7 @@
Source10: qt4-wrapper.sh
Source11: qt4.sh
Source12: qt4.csh
-# FIXME -> /etc/rpm/macros.qt4 ?
+# /etc/rpm/macros.qt4
Source13: qt4.macros
Source20: assistant.desktop
@@ -64,20 +70,19 @@
BuildRequires: dbus-devel >= 0.62
%endif
-%define qtdir %{_libdir}/qt4
# See http://bugzilla.redhat.com/196901
# these should match contents of SOURCE13:
-%define qt4_prefix %{_libdir}/qt4
-%define qt4_bindir %{qt4_prefix}/bin
-%define qt4_datadir %{_datadir}/qt4
-%define qt4_docdir %{_docdir}/qt4
-%define qt4_headerdir %{_includedir}
-%define qt4_libdir %{_libdir}
-%define qt4_plugindir %{qt4_prefix}/plugins
-%define qt4_sysconfdir %{_sysconfdir}
-%define qt4_translationdir %{qt4_datadir}/translations
+%define _qt4_prefix %{_libdir}/qt4
+%define _qt4_bindir %{_qt4_prefix}/bin
+%define _qt4_datadir %{_datadir}/qt4
+%define _qt4_docdir %{_docdir}/qt4
+%define _qt4_headerdir %{_includedir}
+%define _qt4_libdir %{_libdir}
+%define _qt4_plugindir %{_qt4_prefix}/plugins
+%define _qt4_sysconfdir %{_sysconfdir}
+%define _qt4_translationdir %{_qt4_datadir}/translations
-%if "%{qt4_libdir}" != "%{_libdir}"
+%if "%{_qt4_libdir}" != "%{_libdir}"
# needed for runtime, as well as pre,post
Prereq: /etc/ld.so.conf.d
%endif
@@ -154,6 +159,10 @@
Requires: rpm
Obsoletes: %{name}-designer < %{version}-%{release}
Provides: %{name}-designer = %{version}-%{release}
+%if "%{name}" != "qt4"
+Obsoletes: qt4-devel < %{version}-%{release}
+Provides: qt4-devel = %{version}-%{release}
+%endif
%description devel
This package contains the files necessary to develop
applications using the Qt toolkit. Includes:
@@ -242,10 +251,10 @@
# On the surface, looks like a good idea to strip -I/usr/include, -L/usr/lib,
# but it turns out qmake-consuming apps expect/use QMAKE_INCDIR_QT directly
# (e.g. PyQt4, texmaker), and don't cope with null values
-#if "%{qt4_headerdir}" == "%{_includedir}"
+#if "%{_qt4_headerdir}" == "%{_includedir}"
#sed -i -e "s|^QMAKE_INCDIR_QT.*=.*|QMAKE_INCDIR_QT =|" mkspecs/common/linux.conf
#endif
-%if "%{qt4_libdir}" == "%{_libdir}"
+%if "%{_qt4_libdir}" == "%{_libdir}"
sed -i -e "s|^QMAKE_LIBDIR_QT.*=.*|QMAKE_LIBDIR_QT =|" mkspecs/common/linux.conf
%endif
@@ -263,15 +272,15 @@
# build shared, threaded (default) libraries
echo yes | ./configure -v \
- -prefix %{qt4_prefix} \
- -bindir %{qt4_bindir} \
- -datadir %{qt4_datadir} \
- -docdir %{qt4_docdir} \
- -headerdir %{qt4_headerdir} \
- -libdir %{qt4_libdir} \
- -plugindir %{qt4_plugindir} \
- -sysconfdir %{qt4_sysconfdir} \
- -translationdir %{qt4_translationdir} \
+ -prefix %{_qt4_prefix} \
+ -bindir %{_qt4_bindir} \
+ -datadir %{_qt4_datadir} \
+ -docdir %{_qt4_docdir} \
+ -headerdir %{_qt4_headerdir} \
+ -libdir %{_qt4_libdir} \
+ -plugindir %{_qt4_plugindir} \
+ -sysconfdir %{_qt4_sysconfdir} \
+ -translationdir %{_qt4_translationdir} \
-platform %{platform} \
-release \
-shared \
@@ -326,35 +335,35 @@
glib2_libs=$(pkg-config --libs glib-2.0 gthread-2.0)
for dep in -laudio -ldbus-1 -lfreetype -lfontconfig ${glib2_libs} -lmng -ljpeg -lpng -lm -lz \
-L%{_builddir}/qt-x11%{?preview}-opensource-src-%{version}%{?beta:-%{beta}}/lib ; do
- sed -i -e "s|$dep ||g" %{buildroot}%{qt4_libdir}/lib*.la ||:
- sed -i -e "s|$dep ||g" %{buildroot}%{qt4_libdir}/pkgconfig/*.pc
- sed -i -e "s|$dep ||g" %{buildroot}%{qt4_libdir}/*.prl
+ sed -i -e "s|$dep ||g" %{buildroot}%{_qt4_libdir}/lib*.la ||:
+ sed -i -e "s|$dep ||g" %{buildroot}%{_qt4_libdir}/pkgconfig/*.pc
+ sed -i -e "s|$dep ||g" %{buildroot}%{_qt4_libdir}/*.prl
done
# riskier
for dep in -lXrender -lXrandr -lXcursor -lXfixes -lXinerama -lXi -lXft -lXt -lXext -lX11 -lSM -lICE -ldl -lpthread ; do
- sed -i -e "s|$dep ||g" %{buildroot}%{qt4_libdir}/lib*.la ||:
- sed -i -e "s|$dep ||g" %{buildroot}%{qt4_libdir}/pkgconfig/*.pc
- sed -i -e "s|$dep ||g" %{buildroot}%{qt4_libdir}/*.prl
+ sed -i -e "s|$dep ||g" %{buildroot}%{_qt4_libdir}/lib*.la ||:
+ sed -i -e "s|$dep ||g" %{buildroot}%{_qt4_libdir}/pkgconfig/*.pc
+ sed -i -e "s|$dep ||g" %{buildroot}%{_qt4_libdir}/*.prl
done
# nuke dandling reference(s) to %buildroot
-sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" %{buildroot}%{qt4_libdir}/*.prl
+sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" %{buildroot}%{_qt4_libdir}/*.prl
-# -doc make symbolic link to qt4_docdir
-rm -rf %{buildroot}%{qtdir}/doc
-ln -s ../../share/doc/qt %{buildroot}%{qtdir}/doc
+# -doc make symbolic link to _qt4_docdir
+rm -rf %{buildroot}%{_qt4_prefix}/doc
+ln -s ../../share/doc/qt4 %{buildroot}%{_qt4_prefix}/doc
-# put LICENSE.* files in %%qt4_prefix, some apps' configure scripts expect to find them here
-install -p -m644 LICENSE.GPL %{buildroot}%{qt4_prefix}/
+# put LICENSE.* files in %%_qt4_prefix, some apps' configure scripts expect to find them here
+install -p -m644 LICENSE.GPL %{buildroot}%{_qt4_prefix}/
## Make symlinks in %%_bindir
-%if "%{_bindir}" != "%{qt4_bindir}"
+%if "%{_bindir}" != "%{_qt4_bindir}"
mkdir -p %{buildroot}%{_bindir}
-pushd %{buildroot}%{qt4_bindir}
+pushd %{buildroot}%{_qt4_bindir}
for i in *; do
case "${i}" in
assistant|designer|linguist|lrelease|lupdate|moc|qmake|qtconfig|qtdemo|uic)
LINK="${i}-qt4"
- ln -s "${i}" "%{buildroot}%{qt4_bindir}/${LINK}"
+ ln -s "${i}" "%{buildroot}%{_qt4_bindir}/${LINK}"
;;
*)
LINK="${i}"
@@ -366,7 +375,7 @@
%endif
# _debug lib symlinks (see bug #196513)
-pushd %{buildroot}%{qt4_libdir}
+pushd %{buildroot}%{_qt4_libdir}
for lib in libQt*.so ; do
ln -s $lib $(basename $lib .so)_debug.so
done
@@ -376,37 +385,56 @@
popd
# .la files, die, die, die.
-rm -f %{buildroot}%{qt4_libdir}/lib*.la
+rm -f %{buildroot}%{_qt4_libdir}/lib*.la
+%ifarch %{multilib_archs}
## multilib: qconfig
-mv %{buildroot}%{qt4_headerdir}/Qt/qconfig.h %{buildroot}%{qt4_headerdir}/QtCore/qconfig-%{_arch}.h
-install -p -m644 -D %{SOURCE5} %{buildroot}%{qt4_headerdir}/QtCore/qconfig-multilib.h
-ln -sf qconfig-multilib.h %{buildroot}%{qt4_headerdir}/QtCore/qconfig.h
-ln -sf ../QtCore/qconfig.h %{buildroot}%{qt4_headerdir}/Qt/qconfig.h
+mv %{buildroot}%{_qt4_headerdir}/Qt/qconfig.h %{buildroot}%{_qt4_headerdir}/QtCore/qconfig-%{_arch}.h
+install -p -m644 -D %{SOURCE5} %{buildroot}%{_qt4_headerdir}/QtCore/qconfig-multilib.h
+ln -sf qconfig-multilib.h %{buildroot}%{_qt4_headerdir}/QtCore/qconfig.h
+ln -sf ../QtCore/qconfig.h %{buildroot}%{_qt4_headerdir}/Qt/qconfig.h
+%endif
## multilib: mkspecs
-%if "%{qt4_datadir}" != "%{qt4_prefix}"
+%if "%{_qt4_datadir}" != "%{_qt4_prefix}"
# qt4.(sh|csh), QMAKESPEC
#install -p -m755 -D %{SOURCE11} %{buildroot}/etc/profile.d/%{name}-%{_arch}.sh
#install -p -m755 -D %{SOURCE12} %{buildroot}/etc/profile.d/%{name}-%{_arch}.csh
#sed -i -e "s|@@QMAKESPEC@@|%{platform}|" %{buildroot}/etc/profile.d/%{name}-%{_arch}.*
# mkspecs
-mkdir %{buildroot}%{qt4_prefix}/mkspecs
-mv %{buildroot}%{qt4_datadir}/mkspecs/{default,linux-g++*,qconfig.pri} \
- %{buildroot}%{qt4_prefix}/mkspecs/
-ln -s %{qt4_datadir}/mkspecs/common %{buildroot}%{qt4_prefix}/mkspecs/common
+mkdir %{buildroot}%{_qt4_prefix}/mkspecs
+mv %{buildroot}%{_qt4_datadir}/mkspecs/{default,linux-g++*,qconfig.pri} \
+ %{buildroot}%{_qt4_prefix}/mkspecs/
+ln -s %{_qt4_datadir}/mkspecs/common %{buildroot}%{_qt4_prefix}/mkspecs/common
%endif
-%if "%{qt4_libdir}" != "%{_libdir}"
+%if "%{_qt4_libdir}" != "%{_libdir}"
mkdir -p %{buildroot}/etc/ld.so.conf.d
-echo "%{qt4_libdir}" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf
+echo "%{_qt4_libdir}" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf
%endif
# rpm macros
install -p -m644 -D %{SOURCE13} %{buildroot}%{_sysconfdir}/rpm/macros.qt4
# Trolltech.conf
-install -p -m644 -D %{SOURCE1} %{buildroot}%{qt4_sysconfdir}/Trolltech.conf
+install -p -m644 -D %{SOURCE1} %{buildroot}%{_qt4_sysconfdir}/Trolltech.conf
+
+
+%check
+# verify %%_qt_* vs qmake -query equivalents
+ERR=0
+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
+exit $ERR
%clean
@@ -422,46 +450,46 @@
%defattr(-,root,root,-)
%doc README*
%{!?beta:%doc OPENSOURCE-NOTICE.TXT}
-%{qt4_prefix}/LICENSE.*
-%if "%{qt4_libdir}" != "%{_libdir}"
+%{_qt4_prefix}/LICENSE.*
+%if "%{_qt4_libdir}" != "%{_libdir}"
/etc/ld.so.conf.d/*
-%dir %{qt4_libdir}
+%dir %{_qt4_libdir}
%endif
-%dir %{qt4_prefix}
-%dir %{qt4_bindir}
-%dir %{qt4_datadir}
-%if "%{qt4_sysconfdir}" != "%{_sysconfdir}"
-%dir %{qt4_sysconfdir}
-%endif
-%config(noreplace) %{qt4_sysconfdir}/Trolltech.conf
-%{qt4_datadir}/phrasebooks/
-%{qt4_libdir}/libQtCore.so.*
+%dir %{_qt4_prefix}
+%dir %{_qt4_bindir}
+%dir %{_qt4_datadir}
+%if "%{_qt4_sysconfdir}" != "%{_sysconfdir}"
+%dir %{_qt4_sysconfdir}
+%endif
+%config(noreplace) %{_qt4_sysconfdir}/Trolltech.conf
+%{_qt4_datadir}/phrasebooks/
+%{_qt4_libdir}/libQtCore.so.*
%if "%{?qdbus}" == "-qdbus"
-%{qt4_libdir}/libQtDBus.so.*
+%{_qt4_libdir}/libQtDBus.so.*
%endif
-%{qt4_libdir}/libQtNetwork.so.*
-%{qt4_libdir}/libQtScript.so.*
-%{qt4_libdir}/libQtSql.so.*
-%{qt4_libdir}/libQtTest.so.*
-%{qt4_libdir}/libQtXml.so.*
-%dir %{qt4_plugindir}
-%dir %{qt4_plugindir}/sqldrivers/
-%{qt4_translationdir}/
+%{_qt4_libdir}/libQtNetwork.so.*
+%{_qt4_libdir}/libQtScript.so.*
+%{_qt4_libdir}/libQtSql.so.*
+%{_qt4_libdir}/libQtTest.so.*
+%{_qt4_libdir}/libQtXml.so.*
+%dir %{_qt4_plugindir}
+%dir %{_qt4_plugindir}/sqldrivers/
+%{_qt4_translationdir}/
%files x11
%defattr(-,root,root,-)
-%{qt4_libdir}/libQt3Support.so.*
-%{qt4_libdir}/libQtAssistantClient.so.*
-%{qt4_libdir}/libQtDesigner.so.*
-%{qt4_libdir}/libQtDesignerComponents.so.*
-%{qt4_libdir}/libQtGui.so.*
-%{qt4_libdir}/libQtOpenGL.so.*
-%{qt4_libdir}/libQtSvg.so.*
-%{qt4_plugindir}/*
-%exclude %{qt4_plugindir}/designer
-%exclude %{qt4_plugindir}/sqldrivers
+%{_qt4_libdir}/libQt3Support.so.*
+%{_qt4_libdir}/libQtAssistantClient.so.*
+%{_qt4_libdir}/libQtDesigner.so.*
+%{_qt4_libdir}/libQtDesignerComponents.so.*
+%{_qt4_libdir}/libQtGui.so.*
+%{_qt4_libdir}/libQtOpenGL.so.*
+%{_qt4_libdir}/libQtSvg.so.*
+%{_qt4_plugindir}/*
+%exclude %{_qt4_plugindir}/designer
+%exclude %{_qt4_plugindir}/sqldrivers
#-config bits
-%{qt4_bindir}/qt*config*
+%{_qt4_bindir}/qt*config*
%{_bindir}/qt*config*
%{_datadir}/applications/*qtconfig*.desktop
@@ -469,18 +497,18 @@
%defattr(-,root,root,-)
#config /etc/profile.d/*
%{_sysconfdir}/rpm/macros.*
-%{qt4_bindir}/lrelease*
-%{qt4_bindir}/lupdate*
-%{qt4_bindir}/moc*
+%{_qt4_bindir}/lrelease*
+%{_qt4_bindir}/lupdate*
+%{_qt4_bindir}/moc*
%if "%{?qdbus}" == "-qdbus"
-%{qt4_bindir}/qdbus*
+%{_qt4_bindir}/qdbus*
%{_bindir}/qdbus*
%endif
-%{qt4_bindir}/pixeltool*
-%{qt4_bindir}/qmake*
-%{qt4_bindir}/qt3to4
-%{qt4_bindir}/rcc*
-%{qt4_bindir}/uic*
+%{_qt4_bindir}/pixeltool*
+%{_qt4_bindir}/qmake*
+%{_qt4_bindir}/qt3to4
+%{_qt4_bindir}/rcc*
+%{_qt4_bindir}/uic*
%{_bindir}/lrelease*
%{_bindir}/lupdate*
%{_bindir}/pixeltool*
@@ -489,70 +517,86 @@
%{_bindir}/qt3to4
%{_bindir}/rcc*
%{_bindir}/uic*
-%if "%{qt4_headerdir}" != "%{_includedir}"
-%dir %{qt4_headerdir}/
+%if "%{_qt4_headerdir}" != "%{_includedir}"
+%dir %{_qt4_headerdir}/
%endif
-%{qt4_headerdir}/*
-%{qt4_datadir}/mkspecs/
-%{qt4_prefix}/mkspecs/
-%{qt4_datadir}/q3porting.xml
-%{qt4_libdir}/libQt*.so
+%{_qt4_headerdir}/*
+%{_qt4_datadir}/mkspecs/
+%{_qt4_prefix}/mkspecs/
+%{_qt4_datadir}/q3porting.xml
+%{_qt4_libdir}/libQt*.so
# remaining static lib: libQtUiTools.a
-%{qt4_libdir}/libQt*.a
-%{qt4_libdir}/libQt*.prl
+%{_qt4_libdir}/libQt*.a
+%{_qt4_libdir}/libQt*.prl
%{_libdir}/pkgconfig/*.pc
# Qt designer
%{_bindir}/designer*
-%{qt4_bindir}/designer*
-%{qt4_plugindir}/designer/
+%{_qt4_bindir}/designer*
+%{_qt4_plugindir}/designer/
%{_datadir}/applications/*designer*.desktop
# Qt Linguist
-%{qt4_bindir}/linguist*
+%{_qt4_bindir}/linguist*
%{_bindir}/linguist*
%{_datadir}/applications/*linguist*.desktop
%files doc
%defattr(-,root,root,-)
-%dir %{qt4_docdir}/
-%{qt4_docdir}/html
-%{qt4_prefix}/doc
-%{qt4_prefix}/demos/
-%{qt4_prefix}/examples/
+%dir %{_qt4_docdir}/
+%{_qt4_docdir}/html
+%{_qt4_prefix}/doc
+%{_qt4_prefix}/demos/
+%{_qt4_prefix}/examples/
# Qt Assistant
-%{qt4_bindir}/assistant*
+%{_qt4_bindir}/assistant*
%{_bindir}/assistant*
%{_datadir}/applications/*assistant*.desktop
# Qt Demo
-%{qt4_bindir}/qt*demo*
+%{_qt4_bindir}/qt*demo*
%{_bindir}/qt*demo*
%{_datadir}/applications/*qtdemo*.desktop
%if "%{?odbc}" == "-plugin-sql-odbc"
%files odbc
%defattr(-,root,root,-)
-%{qt4_plugindir}/sqldrivers/libqsqlodbc*
+%{_qt4_plugindir}/sqldrivers/libqsqlodbc*
%endif
%if "%{?psql}" == "-plugin-sql-psql"
%files postgresql
%defattr(-,root,root,-)
-%{qt4_plugindir}/sqldrivers/libqsqlpsql*
+%{_qt4_plugindir}/sqldrivers/libqsqlpsql*
%endif
%if "%{?mysql}" == "-plugin-sql-mysql"
%files mysql
%defattr(-,root,root,-)
-%{qt4_plugindir}/sqldrivers/libqsqlmysql*
+%{_qt4_plugindir}/sqldrivers/libqsqlmysql*
%endif
%if "%{?sqlite}" == "-plugin-sql-sqlite"
%files sqlite
%defattr(-,root,root,-)
-%{qt4_plugindir}/sqldrivers/libqsqlite*
+%{_qt4_plugindir}/sqldrivers/libqsqlite*
%endif
%changelog
+* Thu Jul 05 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.0-8
+- fix %%_qt4_prefix/doc symlink
+
+* 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)
+
+* Sat Jun 23 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.0-5
+- fix rpm macros, (%%_qt_plugindir, %%_qt4_translationdir}
+
+* Thu Jun 21 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.0-4
+- .desktop Category cleanup
+
+* Thu Jun 21 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.0-3
+- cleanup qconfig.h/multilib bits, add s390x/s390
+
* Wed May 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.0-2
- ExclusiveArch: %%ix86 -> i386 (for koji)
Index: qtconfig.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/F-7/qtconfig.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- qtconfig.desktop 27 Sep 2006 15:38:49 -0000 1.3
+++ qtconfig.desktop 6 Jul 2007 14:31:12 -0000 1.4
@@ -5,4 +5,4 @@
Terminal=false
Encoding=UTF-8
Type=Application
-Categories=Qt;Application;AdvancedSettings;Settings;
+Categories=Qt;Settings;
Index: qtdemo.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/F-7/qtdemo.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qtdemo.desktop 29 Jun 2006 20:52:13 -0000 1.2
+++ qtdemo.desktop 6 Jul 2007 14:31:12 -0000 1.3
@@ -5,4 +5,4 @@
Terminal=false
Encoding=UTF-8
Type=Application
-Categories=Qt;Application;Development;
+Categories=Qt;Development;
More information about the scm-commits
mailing list