rpms/allegro/devel allegro-4.0.3-cfg.patch, NONE, 1.1 allegro-4.0.3-libdir.patch, NONE, 1.1 allegro.spec, 1.6, 1.7

[Ville Skytta (scop)]

Author: scop

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

Modified Files:
	allegro.spec 
Added Files:
	allegro-4.0.3-cfg.patch allegro-4.0.3-libdir.patch 
Log Message:
Fix x86_64 build, improve default config.

allegro-4.0.3-cfg.patch:

--- NEW FILE allegro-4.0.3-cfg.patch ---
--- allegro.cfg~	2003-04-19 10:06:46.000000000 +0300
+++ allegro.cfg	2005-02-13 23:41:13.339829153 +0200
@@ -529,22 +529,21 @@
 
 
 # edit these shell commands to whatever helper programs you want to use...
-data = start /w notepad
-bmp = start /w "c:\program files\accessories\mspaint.exe"
-rle = start /w "c:\program files\accessories\mspaint.exe"
-cmp = start /w "c:\program files\accessories\mspaint.exe"
-xcmp = start /w "c:\program files\accessories\mspaint.exe"
-pal = start /w "c:\program files\accessories\mspaint.exe"
-font = start /w "c:\program files\accessories\mspaint.exe"
-samp = start /w "c:\program files\cooledit\cool.exe"
-midi = start /w "c:\program files\cakewalk\wincake.exe"
+# data = start /w notepad
+# bmp = start /w "c:\program files\accessories\mspaint.exe"
+# rle = start /w "c:\program files\accessories\mspaint.exe"
+# cmp = start /w "c:\program files\accessories\mspaint.exe"
+# xcmp = start /w "c:\program files\accessories\mspaint.exe"
+# pal = start /w "c:\program files\accessories\mspaint.exe"
+# font = start /w "c:\program files\accessories\mspaint.exe"
+# samp = start /w "c:\program files\cooledit\cool.exe"
+# midi = start /w "c:\program files\cakewalk\wincake.exe"
 
 # or if you are using Linux you might prefer something more like:
-#
-# data = xterm -e fed -b
-# bmp = gimp
-# rle = gimp
-# cmp = gimp
-# xcmp = gimp
-# pal = gimp
-# font = gimp
+data = xterm -e vim -b
+bmp = gimp
+rle = gimp
+cmp = gimp
+xcmp = gimp
+pal = gimp
+font = gimp

allegro-4.0.3-libdir.patch:

--- NEW FILE allegro-4.0.3-libdir.patch ---
--- 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 @@
 exec_prefix=$prefix
 exec_prefix_set=no
 include_prefix=@INCLUDE_PREFIX@
+libdir=@libdir@
 
 static_libs=@LINK_WITH_STATIC_LIBS@
 lib_type=@LIB_TO_LINK@
@@ -162,7 +163,7 @@
 fi
 
 if test "$echo_libs" = "yes"; then
-   libdirs=-L${exec_prefix}/lib
+   libdirs=-L${libdir}
    if test "$static_libs" = "yes"; then
       echo $libdirs $allegro_ldflags -l${lib_type} $allegro_libs
    else
@@ -172,8 +173,8 @@
 
 if test "$echo_env" = "yes"; then
    echo "export PATH=\$PATH:$prefix/bin"
-   echo "export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:$prefix/lib"
-   echo "export LIBRARY_PATH=\$LIBRARY_PATH:$prefix/lib"
+   echo "export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:$libdir"
+   echo "export LIBRARY_PATH=\$LIBRARY_PATH:$libdir"
    echo "export C_INCLUDE_PATH=\$C_INCLUDE_PATH:$prefix/include"
    echo "export CPLUS_INCLUDE_PATH=\$CPLUS_INCLUDE_PATH:$prefix/include"
    echo "export OBJC_INCLUDE_PATH=\$OBJC_INCLUDE_PATH:$prefix/include"


Index: allegro.spec
===================================================================
RCS file: /cvs/extras/rpms/allegro/devel/allegro.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- allegro.spec	13 Feb 2005 19:45:27 -0000	1.6
+++ allegro.spec	13 Feb 2005 22:10:46 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           allegro
 Version:        4.0.3
-Release:        8
+Release:        9
 Epoch:          0
 Summary:        A game programming library
 Summary(es):    Una libreria de programacion de juegos
@@ -13,6 +13,8 @@
 Source:         http://download.sourceforge.net/alleg/allegro-4.0.3.tar.gz
 Patch0:         %{name}-4.0.3-mmaptest.patch
 Patch1:         %{name}-4.0.3-novga.patch
+Patch2:         %{name}-4.0.3-libdir.patch
+Patch3:         %{name}-4.0.3-cfg.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  XFree86-devel, esound-devel, texinfo, perl, arts-devel
 
@@ -97,6 +99,8 @@
 %setup -q
 %patch0 -p1 -b .mmaptest
 %patch1 -p1 -b .novga
+%patch2 -p0 -b .libdir
+%patch3 -p0 -b .cfg
 %{__perl} -pi -e \
   's|\$TARGET_ARCH\s+-O\S+|\$RPM_OPT_FLAGS| ; s|LDFLAGS="-s |LDFLAGS="|' \
   configure
@@ -104,7 +108,7 @@
 
 %build
 %configure \
-%ifnarch %{ix86} x86_64 ia64
+%ifnarch %{ix86}
   --enable-vga=no --enable-vbeaf=no \
 %endif
   --enable-svgalib=no
@@ -179,6 +183,11 @@
 
 
 %changelog
+* Sun Feb 13 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:4.0.3-9
+- Disable vga and vbeaf on all non-%%{ix86}.
+- Fix lib paths in allegro-config for 64-bit archs.
+- Use *nix commands in allegrorc's [grabber] section.
+
 * Sun Feb 13 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:4.0.3-8
 - Build without vga and vbeaf on non-x86-like archs.
 - Apply upstream patch to fix build without vga.