rpms/qt/F-9 qconfig-multilib.h,1.1,1.2 qt.spec,1.169,1.170

[Tom Callaway (spot)]

Author: spot

Update of /cvs/pkgs/rpms/qt/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25260

Modified Files:
	qconfig-multilib.h qt.spec 
Log Message:
fix sparc64 multilib header


Index: qconfig-multilib.h
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-9/qconfig-multilib.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qconfig-multilib.h	12 Mar 2008 23:38:15 -0000	1.1
+++ qconfig-multilib.h	18 May 2008 14:17:34 -0000	1.2
@@ -16,7 +16,7 @@
 # include <QtCore/qconfig-s390x.h>
 #elif defined(__s390__)
 # include <QtCore/qconfig-s390.h> 
-#elif defined(__sparc64__)
+#elif defined(__sparc__) && defined (__arch64__)
 # include <QtCore/qconfig-sparc64.h>
 #elif defined(__sparc__)
 # include <QtCore/qconfig-sparc.h>


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-9/qt.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- qt.spec	18 May 2008 03:35:46 -0000	1.169
+++ qt.spec	18 May 2008 14:17:34 -0000	1.170
@@ -8,7 +8,7 @@
 Name:    qt4
 %endif
 Version: 4.3.4
-Release: 12%{?dist}
+Release: 13%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv3 or GPLv2 with exceptions or QPL
@@ -709,6 +709,9 @@
 
 
 %changelog
+* Sun May 18 2008 Tom "spot" Callaway <tcallawa at redhat.com> 4.3.4-13
+- fix sparc64 multilib header
+
 * Sat May 17 2008 Tom "spot" Callaway <tcallawa at redhat.com> 4.3.4-12
 - fix sparc64 compile, the 64bit sparc conditional in src/corelib/tools/qvector.h 
   applies to linux as well as solaris