Author: bpepple
Update of /cvs/pkgs/rpms/wesnoth/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19672
Modified Files:
wesnoth.spec
Added Files:
wesnoth-1.2.8-remove-ogg-test.patch
Log Message:
* Fri Nov 30 2007 Brian Pepple <bpepple(a)fedoraproject.org> - 1.2.8-2
- Add patch to drop ogg test from configure script, until better workaround.
- Enable python support.
wesnoth-1.2.8-remove-ogg-test.patch:
--- NEW FILE wesnoth-1.2.8-remove-ogg-test.patch ---
diff -ur wesnoth-1.2.8.OLD/configure.ac wesnoth-1.2.8/configure.ac
--- wesnoth-1.2.8.OLD/configure.ac 2007-11-25 06:37:12.000000000 -0500
+++ wesnoth-1.2.8/configure.ac 2007-11-30 14:21:07.000000000 -0500
@@ -798,23 +798,6 @@
LIBS="$LIBS $SDL_LIBS $SDL_MIXER_LIBS"
ac_link="$LDPREFIX $ac_link"
- AC_RUN_IFELSE([AC_LANG_SOURCE([
- #include <SDL_mixer.h>
- #include <stdlib.h>
-
- int main(int argc, char **argv)
- {
- Mix_Music* music = Mix_LoadMUS("music/main_menu.ogg");
- if (music == NULL)
- exit(1);
- exit(0);
- }
- ])],
- [AC_MSG_RESULT(yes)],
- [AC_MSG_RESULT(no)]
- [AC_MSG_ERROR([*** SDL_mixer has no OGG support! You need SDL_mixer with OGG
support])],
- [AC_MSG_RESULT([not tested in cross-compiling])])
-
CPPFLAGS=$OLD_CPPFLAGS
CFLAGS=$OLD_CFLAGS
Index: wesnoth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wesnoth/devel/wesnoth.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- wesnoth.spec 29 Nov 2007 20:05:10 -0000 1.44
+++ wesnoth.spec 30 Nov 2007 23:15:10 -0000 1.45
@@ -1,6 +1,6 @@
Name: wesnoth
Version: 1.2.8
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Turn-based strategy game with a fantasy theme
Group: Amusements/Games
@@ -9,6 +9,7 @@
Source0:
http://www.%{name}.org/files/%{name}-%{version}.tar.bz2
Source1: wesnothd.init
Source2: %{name}.sysconfig
+Patch0: %{name}-%{version}-remove-ogg-test.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL_image-devel
@@ -17,8 +18,12 @@
BuildRequires: freetype-devel
BuildRequires: libpng-devel
BuildRequires: fribidi-devel
+BuildRequires: python-devel
BuildRequires: desktop-file-utils
BuildRequires: gettext
+# Drop these when ogg test patch is removed.
+BuildRequires: autoconf
+BuildRequires: automake
%description
@@ -65,6 +70,8 @@
%prep
%setup -q
+%patch0 -p1 -b .ogg
+autoreconf
chmod -x MANUAL*
@@ -74,9 +81,9 @@
--enable-editor \
--enable-tools \
--enable-server \
+ --enable-python \
--with-fifodir=/var/run/wesnothd \
--with-server-uid=$(id -u) \
- --with-server-gid=$(id -g)
make %{?_smp_mflags}
@@ -160,6 +167,10 @@
%ghost /var/run/wesnothd/socket
%changelog
+* Fri Nov 30 2007 Brian Pepple <bpepple(a)fedoraproject.org> - 1.2.8-2
+- Add patch to drop ogg test from configure script, until better workaround.
+- Enable python support.
+
* Thu Nov 29 2007 Brian Pepple <bpepple(a)fedoraproject.org> - 1.2.8-1
- Update to 1.2.8.