rpms/allegro/devel allegro-4.2.0-multilib.patch, 1.2, 1.3 allegro.spec, 1.58, 1.59

[Hans de Goede]

Author: jwrdegoede

Update of /cvs/pkgs/rpms/allegro/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv25493

Modified Files:
	allegro-4.2.0-multilib.patch allegro.spec 
Log Message:
* Mon Jun 21 2010 Hans de Goede <hdegoede at redhat.com> 4.2.3-2
- Fix multilib conflict in -devel (#603836)


allegro-4.2.0-multilib.patch:
 alunixac.hin |   12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

Index: allegro-4.2.0-multilib.patch
===================================================================
RCS file: /cvs/pkgs/rpms/allegro/devel/allegro-4.2.0-multilib.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- allegro-4.2.0-multilib.patch	23 Jul 2007 10:43:07 -0000	1.2
+++ allegro-4.2.0-multilib.patch	21 Jun 2010 13:46:29 -0000	1.3
@@ -6,13 +6,13 @@
  /* Define if assembler supports MMX. */
 -#undef ALLEGRO_MMX
 +#ifdef __i386__
-+#define ALLEGRO_MMX
++#define ALLEGRO_MMX 1
 +#endif
  
  /* Define if assembler supports SSE. */
 -#undef ALLEGRO_SSE
 +#ifdef __i386__
-+#define ALLEGRO_SSE
++#define ALLEGRO_SSE 1
 +#endif
  
  /* Define if target platform is Darwin. */
@@ -23,7 +23,7 @@
  /* Define to enable Linux console VGA driver. */
 -#undef ALLEGRO_LINUX_VGA
 +#ifdef __i386__
-+#define ALLEGRO_LINUX_VGA
++#define ALLEGRO_LINUX_VGA 1
 +#endif
  
  /*---------------------------------------------------------------------------*/


Index: allegro.spec
===================================================================
RCS file: /cvs/pkgs/rpms/allegro/devel/allegro.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- allegro.spec	5 Oct 2009 16:42:25 -0000	1.58
+++ allegro.spec	21 Jun 2010 13:46:29 -0000	1.59
@@ -1,6 +1,6 @@
 Name:           allegro
 Version:        4.2.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        A game programming library
 Summary(es):    Una libreria de programacion de juegos
@@ -290,6 +290,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jun 21 2010 Hans de Goede <hdegoede at redhat.com> 4.2.3-2
+- Fix multilib conflict in -devel (#603836)
+
 * Mon Oct  5 2009 Jindrich Novy <jnovy at redhat.com> 4.2.3-1
 - update to 4.2.3