rpms/bzflag/F-9 bzflag.spec,1.45,1.46
Nils Philippsen (nphilipp)
fedora-extras-commits at redhat.com
Wed Jul 9 10:11:11 UTC 2008
Author: nphilipp
Update of /cvs/pkgs/rpms/bzflag/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4732
Modified Files:
bzflag.spec
Log Message:
build without SDL (#426011)
Index: bzflag.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzflag/F-9/bzflag.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- bzflag.spec 8 Jul 2008 15:00:13 -0000 1.45
+++ bzflag.spec 9 Jul 2008 10:09:51 -0000 1.46
@@ -1,5 +1,8 @@
#### options:
-# Use --with/--without modular_x to rebuild with/without modular X deps
+# --with/--without options:
+# modular_x: rebuild with modular X deps
+# opengl_wrapper: use Fedora OpenGL wrapper
+# SDL: use SDL instead of X11 directly
#### default options:
%if %{?fedora}%{!?fedora:5} < 5
@@ -22,13 +25,17 @@
%define _libcurl_devel 0
%endif
+# don't build with SDL by default because of display resolution setting
+# problems
+%bcond_with SDL
+
%define desktop_vendor fedora
#define date 20050930
Summary: 3D multi-player tank battle game
Name: bzflag
Version: 2.0.12
-Release: 1%{?dist}
+Release: 2%{?dist}
License: LGPLv2
Group: Amusements/Games
URL: http://bzflag.org
@@ -51,7 +58,9 @@
BuildRequires: libGLU-devel
BuildRequires: gcc-c++
BuildRequires: desktop-file-utils
+%if %{with SDL}
BuildRequires: SDL-devel
+%endif
BuildRequires: ncurses-devel
%if %_libcurl_devel
BuildRequires: libcurl-devel
@@ -90,6 +99,9 @@
CXXFLAGS='-fPIC %{optflags} -fno-strict-aliasing'
LDFLAGS='-pie'
%configure \
+%if ! %{with SDL}
+ --without-SDL \
+%endif
--enable-optimized \
--enable-shared
make %{?_smp_mflags}
@@ -134,6 +146,9 @@
%{_mandir}/man*/*
%changelog
+* Wed Jul 08 2008 Nils Philippsen <nphilipp at redhat.com> 2.0.12-2
+- build without SDL (#426011)
+
* Tue Jul 08 2008 Nils Philippsen <nphilipp at redhat.com> 2.0.12-1
- version 2.0.12
- fix source URL
More information about the fedora-extras-commits
mailing list