Clean up bogosity in multilib stub header support

conffile.h

@@ -4,13 +4,14 @@
  * identical.  Hence, this file is architecture-independent and calls
  * in an arch-dependent file that will appear in just one RPM.
  *
+ * To avoid breaking arches not explicitly supported by Red Hat, we
+ * use this indirection file *only* on known multilib arches.
+ *
  * Note: this may well fail if user tries to use gcc's -I- option.
  * But that option is deprecated anyway.
  */
 #if defined(__x86_64__)
 #include "CONFFILE_x86_64.h"
-#elif defined(__ia64__)
-#include "CONFFILE_ia64.h"
 #elif defined(__i386__)
 #include "CONFFILE_i386.h"
 #elif defined(__ppc64__) || defined(__powerpc64__)

unixODBC.spec

@@ -1,7 +1,7 @@
 Summary: A complete ODBC driver manager for Linux
 Name: unixODBC
 Version: 2.2.14
-Release: 6%{?dist}
+Release: 7%{?dist}
 Group: System Environment/Libraries
 URL: http://www.unixODBC.org/
 # Programs are GPL, libraries are LGPL, except News Server library is GPL.
@@ -111,7 +111,7 @@ desktop-file-install --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE2}
 # multilib header hacks
 # we only apply this to known Red Hat multilib arches, per bug #181335
 case `uname -i` in
-  i386 | x86_64 | ppc | ppc64 | s390 | s390x | sparc | sparcv9 | sparc64 )
+  i386 | x86_64 | ppc | ppc64 | s390 | s390x | sparc | sparc64 )
     mv $RPM_BUILD_ROOT%{_includedir}/unixodbc_conf.h $RPM_BUILD_ROOT%{_includedir}/unixodbc_conf_`uname -i`.h
     rm -f unixodbc_conf.h
     sed s/CONFFILE/unixodbc_conf/ %{SOURCE4} >unixodbc_conf.h
@@ -183,6 +183,10 @@ rm -rf $RPM_BUILD_ROOT
 %postun -p /sbin/ldconfig
 
 %changelog
+* Thu Oct 15 2009 Tom Lane <tgl@redhat.com> 2.2.14-7
+- Clean up bogosity in multilib stub header support: ia64 should not be
+  listed (it's not multilib), sparcv9 isn't a possible uname -i output
+
 * Fri Aug 21 2009 Tom Lane <tgl@redhat.com> 2.2.14-6
 - Switch to building against qt4, not qt3.  This means the DataManager,
   DataManagerII, and odbctest applications are gone.