rpms/qt4/devel qconfig-multilib.h,1.3,1.4 qt4.spec,1.48,1.49

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	qconfig-multilib.h qt4.spec 
Log Message:
* Thu Jun 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.0-3
- cleanup qconfig.h/multilib bits, add s390x/s390



Index: qconfig-multilib.h
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/devel/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	14 Jun 2007 16:36:59 -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.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/devel/qt4.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- qt4.spec	30 May 2007 19:06:47 -0000	1.48
+++ qt4.spec	14 Jun 2007 16:36:59 -0000	1.49
@@ -11,7 +11,7 @@
 Summary: Qt toolkit
 Name:	 qt4
 Version: 4.3.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPL
 Group: 	 System Environment/Libraries
@@ -26,7 +26,7 @@
 Source1: Trolltech.conf
 
 # See http://bugzilla.redhat.com/223663
-ExclusiveArch: i386 x86_64 ppc ppc64 sparc sparc64
+%define multilib_arches x86_64 i386 ppc64 ppc s390 s390x sparc64 sparc
 Source5: qconfig-multilib.h
 
 # search for assistant-qt4 instead of (qt3's) assistant in $PATH 
@@ -104,7 +104,7 @@
 %if 0%{?fedora} > 4 || 0%{?rhel} > 4
 %define x_deps libICE-devel libSM-devel libXcursor-devel libXext-devel libXfixes-devel libXft-devel libXi-devel libXinerama-devel libXrandr-devel libXrender-devel libXt-devel libX11-devel xorg-x11-proto-devel libGL-devel libGLU-devel
 %endif
-BuildRequires: %{x_deps} %{?x_deps_GL_hack}
+BuildRequires: %{x_deps}
 
 %if "%{?nas}" == "-system-nas-sound"
 BuildRequires: nas-devel
@@ -378,11 +378,13 @@
 # .la files, die, die, die.
 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
+%endif
 
 ## multilib: mkspecs
 %if "%{qt4_datadir}" != "%{qt4_prefix}"
@@ -553,6 +555,9 @@
 
 
 %changelog
+* Thu Jun 30 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)