rpms/allegro/devel allegro.spec,1.17,1.18

[Jindrich Novy (jnovy)]

Author: jnovy

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

Modified Files:
	allegro.spec 
Log Message:
* Fri Dec 16 2005 Jindrich Novy <jnovy at redhat.com> 4.2.0-2
- update dependencies for the new modular X
- disable _smp_mflags to workaround build failure caused
  by bad dependencies




Index: allegro.spec
===================================================================
RCS file: /cvs/extras/rpms/allegro/devel/allegro.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- allegro.spec	19 Nov 2005 08:09:07 -0000	1.17
+++ allegro.spec	16 Dec 2005 09:29:20 -0000	1.18
@@ -16,7 +16,7 @@
 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(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 @@
 %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 @@
 
 
 %changelog
-* Sat Nov 19 2005 Jindrich Novy <jnovy at redhat.com> 4.2.0-2
+* Fri Dec 16 2005 Jindrich Novy <jnovy at redhat.com> 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 <jnovy at redhat.com> 4.2.0-1
 - update to 4.2.0