rpms/qt4/devel qconfig-multilib.h,1.2,1.3 qt4.spec,1.33,1.34

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	qconfig-multilib.h qt4.spec 
Log Message:
support (fully): ppc64, sparc, sparc64 too (for multilib)



Index: qconfig-multilib.h
===================================================================
RCS file: /cvs/extras/rpms/qt4/devel/qconfig-multilib.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qconfig-multilib.h	5 Mar 2007 14:13:05 -0000	1.2
+++ qconfig-multilib.h	9 Mar 2007 13:04:57 -0000	1.3
@@ -9,8 +9,10 @@
 # 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
-# error arch unsupported, see http://bugzilla.redhat.com/223663
+# error arch unsupported, see bugzilla.redhat.com/223663
 #endif


Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/devel/qt4.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- qt4.spec	5 Mar 2007 14:13:05 -0000	1.33
+++ qt4.spec	9 Mar 2007 13:04:57 -0000	1.34
@@ -13,7 +13,7 @@
 Summary: Qt toolkit
 Name:	 qt4
 Version: 4.2.2
-Release: 7%{?dist}
+Release: 8%{?dist}
 
 License: GPL/QPL
 Group: 	 System Environment/Libraries
@@ -26,7 +26,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # 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 
@@ -312,9 +312,9 @@
 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.*
+install -p -m755 -D %{SOURCE11} %{buildroot}/etc/profile.d/qt4-%{_arch}.sh
+install -p -m755 -D %{SOURCE12} %{buildroot}/etc/profile.d/qt4-%{_arch}.csh
+sed -i -e "s|@@QMAKESPEC@@|%{platform}|" %{buildroot}/etc/profile.d/*
 
 # Add desktop file(s)
 desktop-file-install \
@@ -424,6 +424,7 @@
 %dir %{qtdir}
 %dir %{qtdir}/bin/
 %dir %{qt_datadir}
+%{qt_datadir}/phrasebooks/
 %{qt_libdir}/libQtCore.so.*
 %if "%{?qdbus}" == "-qdbus"
 %{qt_libdir}/libQtDBus.so.*
@@ -482,7 +483,6 @@
 %{qt_headerdir}/*
 %{qt_datadir}/mkspecs/
 %{qtdir}/mkspecs/
-%{qt_datadir}/phrasebooks/
 %{qt_datadir}/q3porting.xml
 %{qt_libdir}/libQt*.so
 # remaining static lib: libQtUiTools.a 
@@ -542,6 +542,9 @@
 
 
 %changelog
+* 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)