From bf54c3c2c94d0a4c804c2a28bc3b8aa5ec20f848 Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Dec 16 2005 09:29:20 +0000 Subject: - update dependencies for the new modular X - disable _smp_mflags to workaround build failure caused by bad dependencies --- diff --git a/allegro.spec b/allegro.spec index b39d115..be43151 100644 --- a/allegro.spec +++ b/allegro.spec @@ -16,7 +16,7 @@ Patch1: allegro-4.0.3-libdir.patch Patch2: allegro-4.0.3-cfg.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: esound-devel, texinfo, perl, arts-devel -BuildRequires: libX11-devel +BuildRequires: libX11-devel, libXext-devel, libXau, libXdmcp %description Allegro is a cross-platform library intended for use in computer games @@ -45,7 +45,8 @@ Summary(fr): Une librairie de programmation de jeux Summary(it): Una libreria per la programmazione di videogiochi Summary(cz): Knihovna pro programování her Group: Development/Libraries -Requires: %{name} = %{version}-%{release}, XFree86-devel +Requires: %{name} = %{version}-%{release}, libX11-devel +Requires: libXext-devel, libXau, libXdmcp Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -125,9 +126,11 @@ které jsou užitečné pro vývoj Allegro programů. %endif --enable-svgalib=no %ifnarch %{ix86} -make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -DALLEGRO_USE_C -I%{_includedir}/kde/artsc" +#make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -DALLEGRO_USE_C -I%{_includedir}/kde/artsc" +make CFLAGS="$RPM_OPT_FLAGS -DALLEGRO_USE_C -I%{_includedir}/kde/artsc" %else -make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/kde/artsc" +#make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/kde/artsc" +make CFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/kde/artsc" %endif MKDATA_PRELOAD=../../lib/unix/liballeg-%{version}.so \ DAT=../../tools/dat sh misc/mkdata.sh @@ -201,8 +204,10 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Sat Nov 19 2005 Jindrich Novy 4.2.0-2 +* Fri Dec 16 2005 Jindrich Novy 4.2.0-2 - update dependencies for the new modular X +- disable _smp_mflags to workaround build failure caused + by bad dependencies * Wed May 25 2005 Jindrich Novy 4.2.0-1 - update to 4.2.0