rpms/SDL/devel SDL_config.h,NONE,1.1 SDL.spec,1.49,1.50

[fedora-cvs-commits at redhat.com]

Author: twoerner

Update of /cvs/dist/rpms/SDL/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13752

Modified Files:
	SDL.spec 
Added Files:
	SDL_config.h 
Log Message:
[tw]
- fixed multilib conflicts for SDL (#212288)




--- NEW FILE SDL_config.h ---
/*
    SDL - Simple DirectMedia Layer
    Copyright (C) 1997-2006 Sam Lantinga

    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
    License as published by the Free Software Foundation; either
    version 2.1 of the License, or (at your option) any later version.

    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.

    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

    Sam Lantinga
    slouken at libsdl.org
*/

/*
 * This SDL_config.h is a wrapper include file for the original SDL_config.h, 
 * which has been renamed to SDL_config-<arch>.h. There are conflicts for the 
 * original SDL_config.h on multilib systems, which result from arch-specific
 * configuration options. Please do not use the arch-specific file directly.
 *
 * Copyright (C) 2006 Red Hat, Inc.
 * Thomas Woerner <twoerner at redhat.com>
 */

#ifdef SDL_config_wrapper_h
#error "SDL_config_wrapper_h should not be defined!"
#endif
#define SDL_config_wrapper_h

#if defined(__i386__)
#include "SDL_config-i386.h"
#elif defined(__x86_64__)
#include "SDL_config-x86_64.h"
#elif defined(__powerpc__)
#include "SDL_config-ppc.h"
#elif defined(__powerpc64__)
#include "SDL_config-ppc64.h"
#elif defined(__s390__)
#include "SDL_config-s390.h"
#elif defined(__s390x__)
#include "SDL_config-s390x.h"
#elif defined(__ia64__)
#include "SDL_config-ia64.h"
#else
#error "The SDL-devel package is not usable with the architecture."
#endif

#undef SDL_config_wrapper_h


Index: SDL.spec
===================================================================
RCS file: /cvs/dist/rpms/SDL/devel/SDL.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- SDL.spec	26 Jul 2006 16:06:17 -0000	1.49
+++ SDL.spec	27 Oct 2006 16:52:17 -0000	1.50
@@ -1,8 +1,9 @@
 Summary: A cross-platform multimedia library.
 Name: SDL
 Version: 1.2.10
-Release: 6.2
+Release: 8
 Source: http://www.libsdl.org/release/%{name}-%{version}.tar.gz
+Source2: SDL_config.h
 Patch0: SDL-1.2.10-byteorder.patch
 Patch17: SDL-1.2.10-libdir.patch
 Patch19: SDL-1.2.10-preferalsa.patch
@@ -73,6 +74,17 @@
 export tagname=CC
 make install DESTDIR=%{buildroot}
 
+# Rename SDL_config.h to SDL_config-<arch>.h to avoid file conflicts on
+# multilib systems and install SDL_config.h wrapper
+basearch=%{_arch}
+# always use i386 for iX86
+%ifarch %{ix86}
+basearch=i386
+%endif
+# Rename SDL_config.h
+mv %{buildroot}/%{_includedir}/SDL/SDL_config.h %{buildroot}/%{_includedir}/SDL/SDL_config-${basearch}.h
+install -m644 %{SOURCE2} %{buildroot}/%{_includedir}/SDL/SDL_config.h
+
 # remove libtool .la file
 rm -f %{buildroot}%{_libdir}/*.la
 
@@ -100,6 +112,9 @@
 %{_mandir}/man3/SDL*.3*
 
 %changelog
+* Fri Oct 27 2006 Thomas Woerner <twoerner at redhat.com> 1.2.10-8
+- fixed multilib conflicts for SDL (#212288)
+
 * Wed Jul 26 2006 Thomas Woerner <twoerner at redhat.com> 1.2.10-6.2
 - setting the X11 lib and include paths hard to get shared X11 support on all
   architectures