diff --git a/.cvsignore b/.cvsignore index b3e944d..e19b034 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,3 @@ allegro-4.2.0.tar.gz allegro-4.2.1.tar.gz +allegro-4.2.2.tar.gz diff --git a/allegro-4.2.0-multilib.patch b/allegro-4.2.0-multilib.patch index 0c0507e..26e786b 100644 --- a/allegro-4.2.0-multilib.patch +++ b/allegro-4.2.0-multilib.patch @@ -1,16 +1,7 @@ ---- 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 +--- allegro-4.2.2/include/allegro/platform/alunixac.hin.multilib 2007-07-15 06:28:15.000000000 +0200 ++++ allegro-4.2.2/include/allegro/platform/alunixac.hin 2007-07-23 12:36:16.000000000 +0200 +@@ -59,10 +59,14 @@ + #undef ALLEGRO_ASM_PREFIX /* Define if assembler supports MMX. */ -#undef ALLEGRO_MMX @@ -18,14 +9,22 @@ +#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 + /* Define if target platform is Darwin. */ + #undef ALLEGRO_DARWIN +@@ -120,7 +124,9 @@ + #undef ALLEGRO_LINUX_VBEAF + + /* Define to enable Linux console VGA driver. */ +-#undef ALLEGRO_LINUX_VGA ++#ifdef __i386__ ++#define ALLEGRO_LINUX_VGA ++#endif + + /*---------------------------------------------------------------------------*/ + diff --git a/allegro.spec b/allegro.spec index 8dd7500..a17536f 100644 --- a/allegro.spec +++ b/allegro.spec @@ -1,6 +1,6 @@ Name: allegro -Version: 4.2.1 -Release: 3%{?dist} +Version: 4.2.2 +Release: 1%{?dist} Summary: A game programming library Summary(es): Una libreria de programacion de juegos @@ -12,12 +12,11 @@ Group: System Environment/Libraries License: Giftware URL: http://alleg.sourceforge.net/ Source: http://download.sourceforge.net/alleg/allegro-%{version}.tar.gz -Patch1: allegro-4.0.3-libdir.patch -Patch2: allegro-4.0.3-cfg.patch -Patch3: allegro-4.2.0-nostrip.patch -Patch4: allegro-4.2.0-noexecstack.patch -Patch5: allegro-4.2.0-multilib.patch -Patch6: allegro-4.2.1-noexecmod.patch +Patch1: allegro-4.0.3-cfg.patch +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 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 @@ -126,12 +125,11 @@ které jsou užitečné pro vývoj Allegro programů. %prep %setup -q -%patch1 -p1 -b .libdir -%patch2 -p1 -b .config -%patch3 -p1 -z .nostrip -%patch4 -p1 -z .noexecstack -%patch5 -p1 -z .multilib -%patch6 -p1 -z .noexecmod +%patch1 -p1 -b .config +%patch2 -p1 -z .nostrip +%patch3 -p1 -z .noexecstack +%patch4 -p1 -z .multilib +%patch5 -p1 -z .noexecmod %build @@ -241,6 +239,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jul 23 2007 Jindrich Novy 4.2.2-1 +- update to 4.2.2 +- drop .libdir patch +- sync .multilib patch + * Fri Jul 6 2007 Hans de Goede 4.2.1-3 - Silence output of chcon command in %post, because otherwise users get this: "chcon: can't apply partial context to unlabeled file" when installing with diff --git a/sources b/sources index 00c03d0..f8f8e46 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0a09d0144ee8652fb8fa00f6cbb324fe allegro-4.2.1.tar.gz +2b677f9ef772944b62251cf823dc24b6 allegro-4.2.2.tar.gz