rpms/compat-wxGTK26/devel compat-wxGTK26-setup.h, NONE, 1.1 compat-wxGTK26.spec, 1.19, 1.20

[Michael Schwendt]

Author: mschwendt

Update of /cvs/extras/rpms/compat-wxGTK26/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21890

Modified Files:
	compat-wxGTK26.spec 
Added Files:
	compat-wxGTK26-setup.h 
Log Message:
* Tue Mar 24 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.6.4-6
- resolve multi-arch conflict in wx/setup.h



--- NEW FILE compat-wxGTK26-setup.h ---
/* Avoid setup.h header conflicts on multi-arch platforms.
 * Any special arch handled here must also be handled in the 
 * RPM package .spec file. */
#if defined(__i386__)
  #include <wx/setup-i386.h>
#elif defined(__x86_64__)
  #include <wx/setup-x86_64.h>
#elif defined(__powerpc64__)
  #include <wx/setup-powerpc64.h>
#elif defined(__powerpc__)
  #include <wx/setup-ppc.h>
#elif defined(__sparc__) && defined (__arch64__)
  #include <wx/setup-sparc64.h>
#elif defined(__sparc__)
  #include <wx/setup-sparc.h>
#else
  #include <wx/setup-basearch.h>
#endif


Index: compat-wxGTK26.spec
===================================================================
RCS file: /cvs/extras/rpms/compat-wxGTK26/devel/compat-wxGTK26.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- compat-wxGTK26.spec	24 Mar 2009 10:43:12 -0000	1.19
+++ compat-wxGTK26.spec	24 Mar 2009 20:18:35 -0000	1.20
@@ -9,6 +9,7 @@
 Group:          System Environment/Libraries
 URL:            http://www.wxwidgets.org/
 Source0:        http://dl.sf.net/wxwindows/wxGTK-%{version}.tar.bz2
+Source1:        compat-wxGTK26-setup.h
 Patch1:         wxGTK-2.6.3-locale-compat.patch
 Patch2:         wxGTK-2.6.3-gtk-crash.patch
 Patch3:         wxGTK-2.6.3-g_thread_init.patch
@@ -92,11 +93,11 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make DESTDIR=$RPM_BUILD_ROOT install
-make DESTDIR=$RPM_BUILD_ROOT install -C contrib/src/stc
-make DESTDIR=$RPM_BUILD_ROOT install -C contrib/src/ogl
-make DESTDIR=$RPM_BUILD_ROOT install -C contrib/src/gizmos
-make DESTDIR=$RPM_BUILD_ROOT install -C contrib/src/animate
+make DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" install
+make DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" install -C contrib/src/stc
+make DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" install -C contrib/src/ogl
+make DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" install -C contrib/src/gizmos
+make DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" install -C contrib/src/animate
 
 # Don't want these.
 rm -rf ${RPM_BUILD_ROOT}%{_datadir}/bakefile
@@ -114,6 +115,32 @@
   mkdir -p ${RPM_BUILD_ROOT}%{_prefix}/lib
   mv ${RPM_BUILD_ROOT}%{_libdir}/wx ${RPM_BUILD_ROOT}%{_prefix}/lib
 fi
+# Rename setup.h to setup-${arch}.h and
+# install a setup.h that picks the right header based on ifdef.
+# See Source1 file.
+setuph=$(find ${RPM_BUILD_ROOT}%{_libdir}/wx -name setup.h)
+arch=basearch
+%ifarch %ix86
+arch=i386
+%endif
+%ifarch x86_64
+arch=x86_64
+%endif
+%ifarch ppc
+arch=ppc
+%endif
+%ifarch ppc64
+arch=ppc64
+%endif
+%ifarch sparc
+arch=sparc
+%endif
+%ifarch sparc64
+arch=sparc64
+%endif
+newsetuph=${setuph%%.h}-${arch}.h
+mv $setuph $newsetuph
+install -p -m0644 %{SOURCE1} $setuph
 
 # Deal with conflicting files.
 cd ${RPM_BUILD_ROOT}%{_bindir}
@@ -166,9 +193,7 @@
 
 %changelog
 * Tue Mar 24 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.6.4-6
-- remove patch, as with g++ 4.4.0-0.29 it is not reproducible:
-- ambiguity resolution for wxString operator[] usage in wx/filename.h
-  (#491779)
+- resolve multi-arch conflict in wx/setup.h
 
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6.4-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild