From: Paweł Sikora Date: Sun, 3 Oct 2004 14:06:31 +0000 (+0000) Subject: - s/XFree86X11/, cosmetics. X-Git-Tag: auto/th/foobillard-3_0a-1~6 X-Git-Url: https://git.pld-linux.org/?p=packages%2Ffoobillard.git;a=commitdiff_plain;h=daff38d3f8834514755f1683d81e63a74551c31c - s/XFree86X11/, cosmetics. Changed files: foobillard.spec -> 1.22 --- diff --git a/foobillard.spec b/foobillard.spec index 7e94d53..208b0fd 100644 --- a/foobillard.spec +++ b/foobillard.spec @@ -18,7 +18,7 @@ Source2: %{name}.xpm URL: http://foobillard.sunsite.dk/ BuildRequires: OpenGL-devel %{!?with_glut:BuildRequires: SDL-devel} -%{?with_nvidia:BuildRequires: XFree86-driver-nvidia} +%{?with_nvidia:BuildRequires: X11-driver-nvidia-devel} BuildRequires: autoconf BuildRequires: automake BuildRequires: freetype-devel @@ -26,7 +26,7 @@ BuildRequires: freetype-devel BuildRequires: intltool BuildRequires: libtool Requires: OpenGL -%{?with_nvidia:Requires: XFree86-driver-nvidia} +%{?with_nvidia:Requires: X11-driver-nvidia} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _noautoreqdep libGL.so.1 libGLU.so.1 @@ -61,8 +61,15 @@ X_LIBS='-I/usr/X11R6/include'; export X_LIBS %{__autoconf} %{__automake} %configure \ - %{!?with_glut:--enable-SDL}%{?with_glut:--enable-glut} \ - %{!?with_nvidia:--disable-nvidia}%{?with_nvidia:--enable-nvidia} +%if %{with glut} + --enable-glut \ + --disable-SDL \ +%else + --disable-glut \ + --enable-SDL \ +%endif + --%{?with_nvidia:en}%{!?with_nvidia:dis}able-nvidia \ + --enable-sound %{__make}