rpms/qt4/devel qconfig-multilib.h, NONE, 1.1 qt4.csh, NONE, 1.1 qt4.sh, NONE, 1.1 qt4.spec, 1.30, 1.31 qconfig.h, 1.1, NONE

Wed Feb 28 17:28:33 UTC 2007

Author: rdieter

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

Modified Files:
	qt4.spec 
Added Files:
	qconfig-multilib.h qt4.csh qt4.sh 
Removed Files:
	qconfig.h 
Log Message:
* Wed Feb 28 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.2.2-5
- fixup qconfig-multilib.h (#223663)
- qt4.(sh|csh): define QMAKESPEC (#223663)
- null'ify QMAKE_LIBDIR_QT, leave QMAKE_INCDIR_QT alone for now. (#230224)

--- NEW FILE qconfig-multilib.h ---
/* qconfig.h */
/* hack for multilib'ing */

#if defined(__x86_64__)
# include <QtCore/qconfig-x86_64.h>
#elif defined(__i386__)
# include <QtCore/qconfig-i386.h>
#elif defined(__ppc64__)
# include <QtCore/qconfig-ppc64.h>
#elif defined(__ppc__)
# include <QtCore/qconfig-ppc.h>
#elif defined(__sparc__)
# include <QtCore/qconfig-sparc.h>
#else
# error arch unsupported, see http://bugzilla.redhat.com/223663
#endif


--- NEW FILE qt4.csh ---
# Qt4 initialization script (csh)

if ( $?QMAKESPEC ) then
   exit
endif

setenv QMAKESPEC @@QMAKESPEC@@ 



--- NEW FILE qt4.sh ---
# Qt4 initialization script (sh)

if [ -z "$QMAKESPEC" ] ; then
  QMAKESPEC=@@QMAKESPEC@@ 
  export QMAKESPEC

fi



Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/devel/qt4.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- qt4.spec	27 Feb 2007 19:13:39 -0000	1.30
+++ qt4.spec	28 Feb 2007 17:28:01 -0000	1.31
@@ -13,7 +13,7 @@
 Summary: Qt toolkit
 Name:	 qt4
 Version: 4.2.2
-Release: 3%{?dist}
+Release: 5%{?dist}
 
 License: GPL/QPL
 Group: 	 System Environment/Libraries
@@ -27,14 +27,16 @@
 
 # See http://bugzilla.redhat.com/223663
 ExclusiveArch: %{ix86} x86_64 ppc
-Source5: qconfig.h
+Source5: qconfig-multilib.h
 
 # search for assistant-qt4 instead of (qt3's) assistant in $PATH 
 Patch1: qt-x11-opensource-src-4.1.2-assistant4.patch
-# look in PrefixPath/mkspecs too
+# multilib hacks 
 Patch2: qt-x11-opensource-src-4.2.2-multilib.patch
 
 Source10: qt4-wrapper.sh
+Source11: qt4.sh
+Source12: qt4.csh
 
 Source20: assistant.desktop
 Source21: designer.desktop
@@ -124,8 +126,6 @@
 #BuildRequires: sqlite-devel
 %endif
 
-#BuildConflicts: qt4-devel
-
 Obsoletes: %{name}-config < %{version}-%{release}
 Provides:  %{name}-config = %{version}-%{release}
 
@@ -214,7 +214,7 @@
 
 %patch1 -p1 -b .assistant4
 # don't use -b on mkspec files, else they get installed too.
-%patch2 -p1 
+%patch2 -p1
 
 # drop -fexceptions from $RPM_OPT_FLAGS
 RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
@@ -225,18 +225,22 @@
 %else
 %define platform linux-g++
 %endif
-#grep -- '-O2' mkspecs/common/g++.conf | sed -e "s|-O2|$RPM_OPT_FLAGS|g" >> mkspecs/common/g++-optflags.conf
-sed -i -e "s|-O2|$RPM_OPT_FLAGS|g" mkspecs/%{platform}/qmake.conf
-## FIXME(?)
+sed -i \
+  -e "s|-O2|$RPM_OPT_FLAGS|g" \
+  -e "s|g++.conf|g++-multilib.conf|g" mkspecs/%{platform}/qmake.conf
+sed -e "s|^QMAKE_CFLAGS_RELEASE|#QMAKE_CFLAGS_RELEASE|g" \
+ mkspecs/common/g++.conf > mkspecs/common/g++-multilib.conf
+  
+## 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 
 # (e.g. PyQt4, texmaker), and don't cope with null values
 #if "%{qt_headerdir}" == "%{_includedir}"
 #sed -i -e "s|^QMAKE_INCDIR_QT.*=.*|QMAKE_INCDIR_QT       =|" mkspecs/common/linux.conf
 #endif
-#if "%{qt_libdir}" == "%{_libdir}"
-#sed -i -e "s|^QMAKE_LIBDIR_QT.*=.*|QMAKE_LIBDIR_QT       =|" mkspecs/common/linux.conf
-#endif
+%if "%{qt_libdir}" == "%{_libdir}"
+sed -i -e "s|^QMAKE_LIBDIR_QT.*=.*|QMAKE_LIBDIR_QT       =|" mkspecs/common/linux.conf
+%endif
 
 # undefine QMAKE_STRIP, so we get useful -debuginfo pkgs
 sed -i -e "s|^QMAKE_STRIP.*=.*|QMAKE_STRIP             =|" mkspecs/common/linux.conf 
@@ -304,6 +308,11 @@
 
 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 \
@@ -325,6 +334,7 @@
   sed -i -e "s|$dep ||g" %{buildroot}%{qt_libdir}/*.pc
   sed -i -e "s|$dep ||g" %{buildroot}%{qt_libdir}/*.prl
 done
+# nuke dandling reference(s) to %buildroot
 sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" %{buildroot}%{qt_libdir}/*.prl
 
 mkdir -p %{buildroot}%{_libdir}/pkgconfig/
@@ -368,10 +378,10 @@
 rm -f %{buildroot}%{qt_libdir}/lib*.la
 
 ## multilib: qconfig
-mv %{buildroot}%{qt_headerdir}/Qt/qconfig.h %{buildroot}%{qt_headerdir}/Qt/qconfig-%{_arch}.h
-install -p -m644 -D %{SOURCE5} %{buildroot}%{qt_headerdir}/Qt/qconfig.h
-mv %{buildroot}%{qt_headerdir}/QtCore/qconfig.h %{buildroot}%{qt_headerdir}/QtCore/qconfig-%{_arch}.h
-install -p -m644 -D %{SOURCE5} %{buildroot}%{qt_headerdir}/QtCore/qconfig.h
+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
@@ -442,13 +452,10 @@
 
 %files devel
 %defattr(-,root,root,-)
+%config /etc/profile.d/*
 %{qtdir}/bin/lrelease*
 %{qtdir}/bin/lupdate*
 %{qtdir}/bin/moc*
-%if "%{version}" < "4.2.0"
-%{qtdir}/bin/qm2ts*
-%{_bindir}/qm2ts*
-%endif
 %if "%{?qdbus}" == "-qdbus"
 %{qtdir}/bin/qdbus*
 %{_bindir}/qdbus*
@@ -532,6 +539,11 @@
 
 
 %changelog
+* Wed Feb 28 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.2.2-5
+- fixup qconfig-multilib.h (#223663)
+- qt4.(sh|csh): define QMAKESPEC (#223663)
+- null'ify QMAKE_LIBDIR_QT, leave QMAKE_INCDIR_QT alone for now. (#230224)
+
 * Tue Feb 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.2.2-3
 - drop ./configure -no-reduce-exports (ie, support visibility) 
 - multilib issues (#223663)


--- qconfig.h DELETED ---


