rpms/mysqlclient10/devel my_config.h, 1.1, 1.2 mysqlclient10.spec, 1.10, 1.11

[fedora-cvs-commits at redhat.com]

Author: tgl

Update of /cvs/dist/rpms/mysqlclient10/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1042

Modified Files:
	my_config.h mysqlclient10.spec 
Log Message:
fix my_config.h for 64-bit and ppc platforms


Index: my_config.h
===================================================================
RCS file: /cvs/dist/rpms/mysqlclient10/devel/my_config.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- my_config.h	15 Dec 2005 00:00:02 -0000	1.1
+++ my_config.h	15 Dec 2005 19:44:41 -0000	1.2
@@ -7,24 +7,18 @@
  * Note: this may well fail if user tries to use gcc's -I- option.
  * But that option is deprecated anyway.
  */
-#ifdef __i386__
-#include "my_config_i386.h"
-#endif
-#ifdef __x86_64__
+#if defined(__x86_64__)
 #include "my_config_x86_64.h"
-#endif
-#ifdef __ia64__
+#elif defined(__ia64__)
 #include "my_config_ia64.h"
-#endif
-#ifdef __ppc__
-#include "my_config_ppc.h"
-#endif
-#ifdef __ppc64__
+#elif defined(__i386__)
+#include "my_config_i386.h"
+#elif defined(__ppc64__) || defined(__powerpc64__)
 #include "my_config_ppc64.h"
-#endif
-#ifdef __s390__
-#include "my_config_s390.h"
-#endif
-#ifdef __s390x__
+#elif defined(__ppc__) || defined(__powerpc__)
+#include "my_config_ppc.h"
+#elif defined(__s390x__)
 #include "my_config_s390x.h"
+#elif defined(__s390__)
+#include "my_config_s390.h"
 #endif


Index: mysqlclient10.spec
===================================================================
RCS file: /cvs/dist/rpms/mysqlclient10/devel/mysqlclient10.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mysqlclient10.spec	15 Dec 2005 04:52:58 -0000	1.10
+++ mysqlclient10.spec	15 Dec 2005 19:44:41 -0000	1.11
@@ -1,6 +1,6 @@
 Name: mysqlclient10
 Version: 3.23.58
-Release: 8
+Release: 9
 Summary: Backlevel MySQL shared libraries.
 License: LGPL
 Group: Applications/Databases
@@ -151,6 +151,9 @@
 %{_libdir}
 
 %changelog
+* Thu Dec 15 2005 Tom Lane <tgl at redhat.com> 3.23.58-9
+- fix my_config.h for 64-bit and ppc platforms
+
 * Wed Dec 14 2005 Tom Lane <tgl at redhat.com> 3.23.58-8
 - oops, looks like we want uname -i not uname -m