rpms/qt4/FC-6 .cvsignore, 1.13, 1.14 qconfig-multilib.h, 1.1, 1.2 qt4.spec, 1.29, 1.30 sources, 1.11, 1.12

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	.cvsignore qconfig-multilib.h qt4.spec sources 
Log Message:
* Thu Mar 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.2.3-3
- make /etc/rpm/macros.qt4 owned only by qt4-devel

* Thu Mar 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.2.3-2
- fix mkspecs/common availability (#232392)

* Tue Mar 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.2.3-1
- qt-4.2.3
- multilib: move all arch-specific mkspecs bits to %%qt4_prefix/mkspecs (#223663)
- +%%_sysconfdir/rpm/macros.qt4
- +%%config %%qt4_sysconfdir/Trolltech.conf

* Tue Mar 06 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.2.2-8
- multilib: qconfig.pri, /etc/profile.d/* (#223663)




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-6/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	6 Dec 2006 14:43:10 -0000	1.13
+++ .cvsignore	15 Mar 2007 18:32:58 -0000	1.14
@@ -2,3 +2,4 @@
 OLD/
 qt-x11-opensource-src-4.2.1.tar.gz
 qt-x11-opensource-src-4.2.2.tar.gz
+qt-x11-opensource-src-4.2.3.tar.gz


Index: qconfig-multilib.h
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-6/qconfig-multilib.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qconfig-multilib.h	5 Mar 2007 17:14:07 -0000	1.1
+++ qconfig-multilib.h	15 Mar 2007 18:32:58 -0000	1.2
@@ -9,6 +9,8 @@
 # include <QtCore/qconfig-ppc64.h>
 #elif defined(__ppc__) || defined(__powerpc__)
 # include <QtCore/qconfig-ppc.h>
+#elif defined(__sparc64__)
+# include <QtCore/qconfig-sparc64.h>
 #elif defined(__sparc__)
 # include <QtCore/qconfig-sparc.h>
 #else


Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-6/qt4.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- qt4.spec	5 Mar 2007 17:14:07 -0000	1.29
+++ qt4.spec	15 Mar 2007 18:32:58 -0000	1.30
@@ -12,8 +12,8 @@
 
 Summary: Qt toolkit
 Name:	 qt4
-Version: 4.2.2
-Release: 7%{?dist}
+Version: 4.2.3
+Release: 3%{?dist}
 
 License: GPL/QPL
 Group: 	 System Environment/Libraries
@@ -25,8 +25,10 @@
 %endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source1: Trolltech.conf
+
 # See http://bugzilla.redhat.com/223663
-ExclusiveArch: %{ix86} x86_64 ppc
+ExclusiveArch: %{ix86} x86_64 ppc ppc64 sparc sparc64
 Source5: qconfig-multilib.h
 
 # search for assistant-qt4 instead of (qt3's) assistant in $PATH 
@@ -39,6 +41,8 @@
 Source10: qt4-wrapper.sh
 Source11: qt4.sh
 Source12: qt4.csh
+# FIXME -> /etc/rpm/macros.qt4 ?
+Source13: qt4.macros
 
 Source20: assistant.desktop
 Source21: designer.desktop
@@ -63,19 +67,20 @@
 BuildRequires: dbus-devel >= 0.62
 %endif
 
-%define qt_dirname %{name} 
-%define qtdir %{_libdir}/%{qt_dirname}
+%define qtdir %{_libdir}/qt4
 # See http://bugzilla.redhat.com/196901
-%define qt_datadir %{_datadir}/%{qt_dirname}
-%define qt_docdir %{_docdir}/%{qt_dirname}
-%define qt_headerdir %{_includedir} 
-# Be careful about ever changing this, some 3rd-party libs install here (like qt4-qsa)
-#define qt_libdir %{qtdir}/%{_lib}
-%define qt_libdir %{_libdir}
-%define qt_sysconfdir %{_sysconfdir}
-%define qt_translationdir %{qt_datadir}/translations
+# 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
 
-%if "%{qt_libdir}" != "%{_libdir}"
+%if "%{qt4_libdir}" != "%{_libdir}"
 # needed for runtime, as well as pre,post
 Prereq:  /etc/ld.so.conf.d
 %endif
@@ -146,6 +151,8 @@
 Requires: libpng-devel
 Requires: libjpeg-devel
 Requires: pkgconfig
+# %{_sysconfdir}/rpm/macros.qt4
+Requires: rpm
 # Short-lived pkg, temporary 
 Obsoletes: %{name}-debug < %{version}-%{release}
 Obsoletes: %{name}-designer < %{version}-%{release}
@@ -236,12 +243,12 @@
   
 ## FIXME, http://bugzilla.redhat.com/230224
 # 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 INCDIR/LIBDIR directly 
+# 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 "%{qt_headerdir}" == "%{_includedir}"
+#if "%{qt4_headerdir}" == "%{_includedir}"
 #sed -i -e "s|^QMAKE_INCDIR_QT.*=.*|QMAKE_INCDIR_QT       =|" mkspecs/common/linux.conf
 #endif
-%if "%{qt_libdir}" == "%{_libdir}"
+%if "%{qt4_libdir}" == "%{_libdir}"
 sed -i -e "s|^QMAKE_LIBDIR_QT.*=.*|QMAKE_LIBDIR_QT       =|" mkspecs/common/linux.conf
 %endif
 
@@ -264,13 +271,15 @@
 
 # build shared, threaded (default) libraries
 echo yes | ./configure -v \
-  -prefix %{qtdir} \
-  -datadir %{qt_datadir} \
-  -docdir %{qt_docdir} \
-  -headerdir %{qt_headerdir} \
-  -libdir %{qt_libdir} \
-  -sysconfdir %{qt_sysconfdir} \
-  -translationdir %{qt_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 \
@@ -311,11 +320,6 @@
 
 make install INSTALL_ROOT=%{buildroot}
 
-## qt4.(sh|csh)
-install -p -m755 -D %{SOURCE11} %{buildroot}/etc/profile.d/qt4.sh
-install -p -m755 -D %{SOURCE12} %{buildroot}/etc/profile.d/qt4.csh
-sed -i -e "s|@@QMAKESPEC@@|%{platform}|" %{buildroot}/etc/profile.d/qt4.*
-
 # Add desktop file(s)
 desktop-file-install \
   --dir %{buildroot}%{_datadir}/applications \
@@ -327,37 +331,38 @@
 # safe ones
 for dep in -laudio -ldbus-1 -lglib-2.0 -lmng -ljpeg -lpng -lz -lfreetype -lm %{?mysql_ldflags} \
   -L%{_builddir}/qt-x11%{?preview}-opensource-src-%{version}%{?beta:-%{beta}}/lib ; do
-  sed -i -e "s|$dep ||g" %{buildroot}%{qt_libdir}/lib*.la ||:
-  sed -i -e "s|$dep ||g" %{buildroot}%{qt_libdir}/*.pc
-  sed -i -e "s|$dep ||g" %{buildroot}%{qt_libdir}/*.prl
+  sed -i -e "s|$dep ||g" %{buildroot}%{qt4_libdir}/lib*.la ||:
+  sed -i -e "s|$dep ||g" %{buildroot}%{qt4_libdir}/*.pc
+  sed -i -e "s|$dep ||g" %{buildroot}%{qt4_libdir}/*.prl
 done
 # riskier
 for dep in -lXrender -lXrandr -lXcursor -lXfixes -lXinerama -lXi -lXft -lXt -lfontconfig -lXext -lX11 -lSM -lICE -ldl -lpthread ; do
-  sed -i -e "s|$dep ||g" %{buildroot}%{qt_libdir}/lib*.la ||:
-  sed -i -e "s|$dep ||g" %{buildroot}%{qt_libdir}/*.pc
-  sed -i -e "s|$dep ||g" %{buildroot}%{qt_libdir}/*.prl
+  sed -i -e "s|$dep ||g" %{buildroot}%{qt4_libdir}/lib*.la ||:
+  sed -i -e "s|$dep ||g" %{buildroot}%{qt4_libdir}/*.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}%{qt_libdir}/*.prl
+sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" %{buildroot}%{qt4_libdir}/*.prl
 
 mkdir -p %{buildroot}%{_libdir}/pkgconfig/
-mv %{buildroot}%{qt_libdir}/*.pc %{buildroot}%{_libdir}/pkgconfig/
+mv %{buildroot}%{qt4_libdir}/*.pc %{buildroot}%{_libdir}/pkgconfig/
 
-# -doc make symbolic link to qt_docdir
+# -doc make symbolic link to qt4_docdir
 rm -rf %{buildroot}%{qtdir}/doc
-ln -s  ../../share/doc/%{name} %{buildroot}%{qtdir}/doc
+ln -s  ../../share/doc/qt %{buildroot}%{qtdir}/doc
 
-# put LICENSE.* files in %%qtdir, some apps' configure scripts expect to find them here
-install -p -m644 LICENSE.* %{buildroot}%{qtdir}/
+# put LICENSE.* files in %%qt4_prefix, some apps' configure scripts expect to find them here
+install -p -m644 LICENSE.* %{buildroot}%{qt4_prefix}/
 
 ## Make symlinks in %%_bindir
+%if "%{_bindir}" != "%{qt4_bindir}"
 mkdir -p %{buildroot}%{_bindir}
-pushd %{buildroot}%{qtdir}/bin 
+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}%{qtdir}/bin/${LINK}"
+      ln -s "${i}" "%{buildroot}%{qt4_bindir}/${LINK}"
       ;;
     *)
       LINK="${i}"
@@ -366,9 +371,10 @@
   install -p -m755 -D %{SOURCE10} %{buildroot}%{_bindir}/${LINK}
 done
 popd
+%endif
 
 # _debug lib symlinks (see bug #196513)
-pushd %{buildroot}%{qt_libdir}
+pushd %{buildroot}%{qt4_libdir}
 for lib in libQt*.so ; do
   ln -s $lib $(basename $lib .so)_debug.so
 done
@@ -378,30 +384,38 @@
 popd
 
 # .la files, die, die, die.
-rm -f %{buildroot}%{qt_libdir}/lib*.la
+rm -f %{buildroot}%{qt4_libdir}/lib*.la
 
 ## multilib: qconfig
-mv %{buildroot}%{qt_headerdir}/Qt/qconfig.h %{buildroot}%{qt_headerdir}/QtCore/qconfig-%{_arch}.h
-install -p -m644 -D %{SOURCE5}              %{buildroot}%{qt_headerdir}/QtCore/qconfig-multilib.h
-ln -sf qconfig-multilib.h                   %{buildroot}%{qt_headerdir}/QtCore/qconfig.h
-ln -sf ../QtCore/qconfig.h                  %{buildroot}%{qt_headerdir}/Qt/qconfig.h
-## mkspecs/default
-rm -f %{buildroot}%{qt_datadir}/mkspecs/default
-mkdir %{buildroot}%{qtdir}/mkspecs
-ln -s %{qt_datadir}/mkspecs/%{platform} %{buildroot}%{qtdir}/mkspecs/default
-# omit non-platform linux-g++*
-pushd %{buildroot}%{qt_datadir}/mkspecs
-for specdir in linux-g++* ; do
-  if [ "$specdir" != "%{platform}"]; then rm -rf "$specdir"; fi
-done
-popd
-
+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
+
+## multilib: mkspecs
+%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
+%endif
 
-%if "%{qt_libdir}" != "%{_libdir}"
+%if "%{qt4_libdir}" != "%{_libdir}"
 mkdir -p %{buildroot}/etc/ld.so.conf.d
-echo "%{qt_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
+
 
 %clean
 rm -rf %{buildroot}
@@ -416,58 +430,64 @@
 %defattr(-,root,root,-)
 %doc README* 
 %{!?beta:%doc OPENSOURCE-NOTICE.TXT}
-%{qtdir}/LICENSE.*
-%if "%{qt_libdir}" != "%{_libdir}"
+%{qt4_prefix}/LICENSE.*
+%if "%{qt4_libdir}" != "%{_libdir}"
 /etc/ld.so.conf.d/*
-%dir %{qt_libdir}
+%dir %{qt4_libdir}
 %endif
-%dir %{qtdir}
-%dir %{qtdir}/bin/
-%dir %{qt_datadir}
-%{qt_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"
-%{qt_libdir}/libQtDBus.so.*
+%{qt4_libdir}/libQtDBus.so.*
 %endif
-%{qt_libdir}/libQtNetwork.so.*
-%{qt_libdir}/libQtSql.so.*
-%{qt_libdir}/libQtTest.so.*
-%{qt_libdir}/libQtXml.so.*
-%dir %{qtdir}/plugins/
-%dir %{qtdir}/plugins/sqldrivers/
-%{qt_translationdir}/
+%{qt4_libdir}/libQtNetwork.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,-)
-%{qt_libdir}/libQt3Support.so.*
-%{qt_libdir}/libQtAssistantClient.so.*
-%{qt_libdir}/libQtDesigner.so.*
-%{qt_libdir}/libQtDesignerComponents.so.*
-%{qt_libdir}/libQtGui.so.*
-%{qt_libdir}/libQtOpenGL.so.*
-%{qt_libdir}/libQtSvg.so.*
-%{qtdir}/plugins/*
-%exclude %{qtdir}/plugins/designer
-%exclude %{qtdir}/plugins/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
-%{qtdir}/bin/qt*config*
+%{qt4_bindir}/qt*config*
 %{_bindir}/qt*config*
 %{_datadir}/applications/*qtconfig*.desktop
 
 %files devel
 %defattr(-,root,root,-)
-%config /etc/profile.d/*
-%{qtdir}/bin/lrelease*
-%{qtdir}/bin/lupdate*
-%{qtdir}/bin/moc*
+#config /etc/profile.d/*
+%{_sysconfdir}/rpm/macros.*
+%{qt4_bindir}/lrelease*
+%{qt4_bindir}/lupdate*
+%{qt4_bindir}/moc*
 %if "%{?qdbus}" == "-qdbus"
-%{qtdir}/bin/qdbus*
+%{qt4_bindir}/qdbus*
 %{_bindir}/qdbus*
 %endif
-%{qtdir}/bin/pixeltool*
-%{qtdir}/bin/qmake*
-%{qtdir}/bin/qt3to4
-%{qtdir}/bin/rcc*
-%{qtdir}/bin/uic*
+%{qt4_bindir}/pixeltool*
+%{qt4_bindir}/qmake*
+%{qt4_bindir}/qt3to4
+%{qt4_bindir}/rcc*
+%{qt4_bindir}/uic*
 %{_bindir}/lrelease*
 %{_bindir}/lupdate*
 %{_bindir}/pixeltool*
@@ -476,72 +496,85 @@
 %{_bindir}/qt3to4
 %{_bindir}/rcc*
 %{_bindir}/uic*
-%if "%{qt_headerdir}" != "%{_includedir}"
-%dir %{qt_headerdir}/
+%if "%{qt4_headerdir}" != "%{_includedir}"
+%dir %{qt4_headerdir}/
 %endif
-%{qt_headerdir}/*
-%{qt_datadir}/mkspecs/
-%{qtdir}/mkspecs/
-%{qt_datadir}/phrasebooks/
-%{qt_datadir}/q3porting.xml
-%{qt_libdir}/libQt*.so
+%{qt4_headerdir}/*
+%{qt4_datadir}/mkspecs/
+%{qt4_prefix}/mkspecs/
+%{qt4_datadir}/q3porting.xml
+%{qt4_libdir}/libQt*.so
 # remaining static lib: libQtUiTools.a 
-%{qt_libdir}/libQt*.a
-%{qt_libdir}/libQt*.prl
+%{qt4_libdir}/libQt*.a
+%{qt4_libdir}/libQt*.prl
 %{_libdir}/pkgconfig/*.pc
 # Qt designer
 %{_bindir}/designer*
-%{qtdir}/bin/designer*
-%dir %{qtdir}/plugins
-%{qtdir}/plugins/designer/
+%{qt4_bindir}/designer*
+%{qt4_plugindir}/designer/
 %{_datadir}/applications/*designer*.desktop
 # Qt Linguist
-%{qtdir}/bin/linguist*
+%{qt4_bindir}/linguist*
 %{_bindir}/linguist*
 %{_datadir}/applications/*linguist*.desktop
 
 %files doc
 %defattr(-,root,root,-)
-%dir %{qt_docdir}/
-%{qt_docdir}/html
-%{qtdir}/doc
-%{qtdir}/demos/
-%{qtdir}/examples/
+%dir %{qt4_docdir}/
+%{qt4_docdir}/html
+%{qt4_prefix}/doc
+%{qt4_prefix}/demos/
+%{qt4_prefix}/examples/
 # Qt Assistant
-%{qtdir}/bin/assistant*
+%{qt4_bindir}/assistant*
 %{_bindir}/assistant*
 %{_datadir}/applications/*assistant*.desktop
 # Qt Demo
-%{qtdir}/bin/qt*demo*
+%{qt4_bindir}/qt*demo*
 %{_bindir}/qt*demo*
 %{_datadir}/applications/*qtdemo*.desktop
 
 %if "%{?odbc}" == "-plugin-sql-odbc"
 %files odbc 
 %defattr(-,root,root,-)
-%{qtdir}/plugins/sqldrivers/libqsqlodbc*
+%{qt4_plugindir}/sqldrivers/libqsqlodbc*
 %endif
 
 %if "%{?psql}" == "-plugin-sql-psql"
 %files postgresql 
 %defattr(-,root,root,-)
-%{qtdir}/plugins/sqldrivers/libqsqlpsql*
+%{qt4_plugindir}/sqldrivers/libqsqlpsql*
 %endif
 
 %if "%{?mysql}" == "-plugin-sql-mysql"
 %files mysql 
 %defattr(-,root,root,-)
-%{qtdir}/plugins/sqldrivers/libqsqlmysql*
+%{qt4_plugindir}/sqldrivers/libqsqlmysql*
 %endif
 
 %if "%{?sqlite}" == "-plugin-sql-sqlite"
 %files sqlite 
 %defattr(-,root,root,-)
-%{qtdir}/plugins/sqldrivers/libqsqlite*
+%{qt4_plugindir}/sqldrivers/libqsqlite*
 %endif
 
 
 %changelog
+* Thu Mar 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.2.3-3
+- make /etc/rpm/macros.qt4 owned only by qt4-devel
+
+* Thu Mar 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.2.3-2
+- fix mkspecs/common availability (#232392)
+
+* Tue Mar 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.2.3-1
+- qt-4.2.3
+- multilib: move all arch-specific mkspecs bits to %%qt4_prefix/mkspecs (#223663)
+- +%%_sysconfdir/rpm/macros.qt4
+- +%%config %%qt4_sysconfdir/Trolltech.conf
+
+* Tue Mar 06 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.2.2-8
+- multilib: qconfig.pri, /etc/profile.d/* (#223663)
+
 * Mon Mar 05 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.2.2-7
 - fixup qconfig-multilib.h for powerpc/powerpc64 (#223663)
 - include qt-copy's 0154-qdbuscpp2xml-moc_path.diff (#230875)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-6/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	6 Dec 2006 14:43:10 -0000	1.11
+++ sources	15 Mar 2007 18:32:58 -0000	1.12
@@ -1 +1 @@
-19f6374fe7924e33775cb87ee02669cb  qt-x11-opensource-src-4.2.2.tar.gz
+13f12bf58a32ebf15837fcd605cb3c99  qt-x11-opensource-src-4.2.3.tar.gz