From d955e40407990b67978374b7e065095ff7e97089 Mon Sep 17 00:00:00 2001
From: Hans de Goede <jwrdegoede@fedoraproject.org>
Date: Jun 21 2010 13:46:29 +0000
Subject: - Fix multilib conflict in -devel (#603836)


---

diff --git a/allegro-4.2.0-multilib.patch b/allegro-4.2.0-multilib.patch
index 26e786b..81400ed 100644
--- a/allegro-4.2.0-multilib.patch
+++ b/allegro-4.2.0-multilib.patch
@@ -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
  
  /*---------------------------------------------------------------------------*/
diff --git a/allegro.spec b/allegro.spec
index 5e8e0c6..02a011f 100644
--- a/allegro.spec
+++ b/allegro.spec
@@ -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@redhat.com> 4.2.3-2
+- Fix multilib conflict in -devel (#603836)
+
 * Mon Oct  5 2009 Jindrich Novy <jnovy@redhat.com> 4.2.3-1
 - update to 4.2.3