diff --git a/allegro-4.0.3-libdir.patch b/allegro-4.0.3-libdir.patch index 3672a83..051555f 100644 --- a/allegro-4.0.3-libdir.patch +++ b/allegro-4.0.3-libdir.patch @@ -1,16 +1,19 @@ ---- 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 +diff -up allegro-4.2.2/misc/allegro-config.in.multilib2 allegro-4.2.2/misc/allegro-config.in +--- allegro-4.2.2/misc/allegro-config.in.multilib2 2007-07-22 09:45:47.000000000 +0200 ++++ allegro-4.2.2/misc/allegro-config.in 2007-07-24 21:27:21.000000000 +0200 +@@ -16,15 +16,22 @@ exec_prefix=$prefix exec_prefix_set=no include_prefix=@INCLUDE_PREFIX@ + include_path=@includedir@ +-lib_path=@libdir@ + bin_path=@bindir@ +arch=$(/bin/arch) +if [ "$arch" = "x86_64" -o "$arch" = "s390x" -o "$arch" = "ppc64" \ + -o "$arch" = "ia64" ]; +then -+ libdir="/usr/lib64" ++ lib_path="/usr/lib64" +else -+ libdir="/usr/lib" ++ lib_path="/usr/lib" +fi static_libs=@LINK_WITH_STATIC_LIBS@ @@ -23,23 +26,3 @@ allegro_libs="@LIBS@" allegro_frameworks="@FRAMEWORKS@" allegro_cflags="" -@@ -178,7 +186,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 -@@ -192,8 +200,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" diff --git a/allegro.spec b/allegro.spec index a17536f..f61a16f 100644 --- a/allegro.spec +++ b/allegro.spec @@ -1,6 +1,6 @@ Name: allegro Version: 4.2.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A game programming library Summary(es): Una libreria de programacion de juegos @@ -17,6 +17,7 @@ Patch2: allegro-4.2.0-nostrip.patch Patch3: allegro-4.2.0-noexecstack.patch Patch4: allegro-4.2.0-multilib.patch Patch5: allegro-4.2.1-noexecmod.patch +Patch6: allegro-4.0.3-libdir.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 @@ -130,6 +131,7 @@ které jsou užitečné pro vývoj Allegro programů. %patch3 -p1 -z .noexecstack %patch4 -p1 -z .multilib %patch5 -p1 -z .noexecmod +%patch6 -p1 -z .multilib2 %build @@ -239,6 +241,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Jul 24 2007 Hans de Goede 4.2.2-2 +- sync .libdir patch to 4.2.2 and use it again for multilib devel goodness + (make allegro-devel i386 and x86_64 parallel installable again) + * Mon Jul 23 2007 Jindrich Novy 4.2.2-1 - update to 4.2.2 - drop .libdir patch