rpms/allegro/devel allegro-4.2.0-multilib.patch, NONE, 1.1 allegro-4.0.3-libdir.patch, 1.1, 1.2 allegro.spec, 1.36, 1.37

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/allegro/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16497

Modified Files:
	allegro-4.0.3-libdir.patch allegro.spec 
Added Files:
	allegro-4.2.0-multilib.patch 
Log Message:
* Sun Oct 15 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 4.2.0-18
- Multilib devel goodness (make allegro-devel i386 and x86_64 parallel
  installable)


allegro-4.2.0-multilib.patch:

--- NEW FILE allegro-4.2.0-multilib.patch ---
--- allegro-4.2.0/include/allegro/platform/alunixac.hin~	2006-10-15 18:45:00.000000000 +0200
+++ allegro-4.2.0/include/allegro/platform/alunixac.hin	2006-10-15 18:45:00.000000000 +0200
@@ -49,19 +49,25 @@
 #undef ALLEGRO_LINUX_VBEAF
 
 /* Define to enable Linux console VGA driver. */
-#undef ALLEGRO_LINUX_VGA
+#ifdef __i386__
+#define ALLEGRO_LINUX_VGA
+#endif
 
 /* Define if target machine is little endian. */
 #undef ALLEGRO_LITTLE_ENDIAN
 
 /* Define if assembler supports MMX. */
-#undef ALLEGRO_MMX
+#ifdef __i386__
+#define ALLEGRO_MMX
+#endif
 
 /* Define for Unix platforms, to use C convention for bank switching. */
 #undef ALLEGRO_NO_ASM
 
 /* Define if assembler supports SSE. */
-#undef ALLEGRO_SSE
+#ifdef __i386__
+#define ALLEGRO_SSE
+#endif
 
 /* Define if constructor attribute is supported. */
 #undef ALLEGRO_USE_CONSTRUCTOR

allegro-4.0.3-libdir.patch:

Index: allegro-4.0.3-libdir.patch
===================================================================
RCS file: /cvs/extras/rpms/allegro/devel/allegro-4.0.3-libdir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- allegro-4.0.3-libdir.patch	13 Feb 2005 22:10:46 -0000	1.1
+++ allegro-4.0.3-libdir.patch	15 Oct 2006 17:13:04 -0000	1.2
@@ -1,14 +1,29 @@
---- misc/allegro-config.in~	2003-04-19 10:08:10.000000000 +0300
-+++ misc/allegro-config.in	2005-02-13 23:31:31.602523235 +0200
-@@ -15,6 +15,7 @@
+--- allegro-4.2.0/misc/allegro-config.in.libdir	2005-11-05 17:40:11.000000000 +0100
++++ allegro-4.2.0/misc/allegro-config.in	2006-10-15 18:38:46.000000000 +0200
+@@ -15,13 +15,21 @@
  exec_prefix=$prefix
  exec_prefix_set=no
  include_prefix=@INCLUDE_PREFIX@
-+libdir=@libdir@
++arch=$(/bin/arch)
++if [ "$arch" = "x86_64" -o "$arch" = "s390x" -o "$arch" = "ppc64" \
++    -o "$arch" = "ia64" ];
++then
++    libdir="/usr/lib64"
++else
++    libdir="/usr/lib"
++fi
  
  static_libs=@LINK_WITH_STATIC_LIBS@
  lib_type=@LIB_TO_LINK@
-@@ -162,7 +163,7 @@
+ 
+ accepts_frameworks=no
+ 
+-allegro_ldflags="@LDFLAGS@"
++allegro_ldflags="-Wl,--export-dynamic "
+ allegro_libs="@LIBS@"
+ allegro_frameworks="@FRAMEWORKS@"
+ allegro_cflags=""
+@@ -178,7 +186,7 @@
  fi
  
  if test "$echo_libs" = "yes"; then
@@ -17,7 +32,7 @@
     if test "$static_libs" = "yes"; then
        echo $libdirs $allegro_ldflags -l${lib_type} $allegro_libs
     else
-@@ -172,8 +173,8 @@
+@@ -192,8 +200,8 @@
  
  if test "$echo_env" = "yes"; then
     echo "export PATH=\$PATH:$prefix/bin"


Index: allegro.spec
===================================================================
RCS file: /cvs/extras/rpms/allegro/devel/allegro.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- allegro.spec	2 Sep 2006 06:36:24 -0000	1.36
+++ allegro.spec	15 Oct 2006 17:13:04 -0000	1.37
@@ -1,6 +1,6 @@
 Name:           allegro
 Version:        4.2.0
-Release:        17%{?dist}
+Release:        18%{?dist}
 
 Summary:        A game programming library
 Summary(es):    Una libreria de programacion de juegos
@@ -23,6 +23,7 @@
 Patch9:         allegro-4.2.0-no-execheap.patch
 Patch10:        allegro-4.2.0-nicevsync.patch
 Patch11:        allegro-4.2.0-noexecstack.patch
+Patch12:        allegro-4.2.0-multilib.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  esound-devel, texinfo, perl, arts-devel
 BuildRequires:  xorg-x11-proto-devel, libX11-devel, libXext-devel, libXt-devel
@@ -127,7 +128,7 @@
 
 %prep
 %setup -q
-%patch1 -p0 -b .libdir
+%patch1 -p1 -b .libdir
 %patch2 -p1 -b .config
 %patch3 -p1 -z .nostrip
 %patch4 -p1 -z .digmid
@@ -138,6 +139,7 @@
 %patch9 -p1 -z .execheap
 %patch10 -p1 -z .nicevsync
 %patch11 -p1 -z .noexecstack
+%patch12 -p1 -z .multilib
 
 
 %build
@@ -228,6 +230,10 @@
 
 
 %changelog
+* Sun Oct 15 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 4.2.0-18
+- Multilib devel goodness (make allegro-devel i386 and x86_64 parallel
+  installable)
+
 * Sat Sep  2 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 4.2.0-17
 - FE6 Rebuild