rpms/wesnoth/F-8 wesnoth-1.2.8-gcc43.patch, NONE, 1.1 wesnoth-1.3.16-remove-ogg-test.patch, NONE, 1.1 sources, 1.23, 1.24 wesnoth.spec, 1.45, 1.46
Jon Ciesla (limb)
fedora-extras-commits at redhat.com
Tue Apr 1 17:13:40 UTC 2008
- Previous message (by thread): rpms/kernel/devel linux-2.6-merge-efifb-imacfb.patch, NONE, 1.1 config-x86-generic, 1.31, 1.32 config-x86_64-generic, 1.29, 1.30 kernel.spec, 1.568, 1.569
- Next message (by thread): rpms/jd/F-7 .cvsignore, 1.187, 1.188 jd.spec, 1.212, 1.213 sources, 1.188, 1.189
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: limb
Update of /cvs/pkgs/rpms/wesnoth/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14781
Modified Files:
sources wesnoth.spec
Added Files:
wesnoth-1.2.8-gcc43.patch wesnoth-1.3.16-remove-ogg-test.patch
Log Message:
Update to 1.4 stable in response to multiple user requests and SIG
discussion.
wesnoth-1.2.8-gcc43.patch:
--- NEW FILE wesnoth-1.2.8-gcc43.patch ---
--- wesnoth-1.2.8/src/server/game.cpp.orig 2008-02-11 18:16:19.000000000 -0500
+++ wesnoth-1.2.8/src/server/game.cpp 2008-02-11 18:16:31.000000000 -0500
@@ -20,6 +20,7 @@
#include <iostream>
#include <sstream>
+#include <algorithm>
#define LOG_SERVER LOG_STREAM(info, general)
wesnoth-1.3.16-remove-ogg-test.patch:
--- NEW FILE wesnoth-1.3.16-remove-ogg-test.patch ---
--- configure.ac 2008-02-22 14:10:36.000000000 -0600
+++ configure.ac 2008-02-22 14:10:36.000000000 -0600
@@ -890,23 +890,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("data/core/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: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wesnoth/F-8/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources 29 Nov 2007 20:08:23 -0000 1.23
+++ sources 1 Apr 2008 17:12:50 -0000 1.24
@@ -1 +1 @@
-99d17b23d2ea4dc3a008f5c69cd43789 wesnoth-1.2.8.tar.bz2
+a2e8e4b32292f16842453e4c836429b2 wesnoth-1.4.tar.bz2
Index: wesnoth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wesnoth/F-8/wesnoth.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- wesnoth.spec 1 Dec 2007 04:47:53 -0000 1.45
+++ wesnoth.spec 1 Apr 2008 17:12:50 -0000 1.46
@@ -1,15 +1,16 @@
Name: wesnoth
-Version: 1.2.8
-Release: 2%{?dist}
+Version: 1.4
+Release: 1%{?dist}
Summary: Turn-based strategy game with a fantasy theme
Group: Amusements/Games
-License: GPL+
+License: GPLv2+
URL: http://www.wesnoth.org
Source0: http://www.%{name}.org/files/%{name}-%{version}.tar.bz2
Source1: wesnothd.init
Source2: %{name}.sysconfig
-Patch0: %{name}-%{version}-remove-ogg-test.patch
+Patch0: %{name}-1.2.8-gcc43.patch
+Patch1: wesnoth-1.3.16-remove-ogg-test.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL_image-devel
@@ -21,10 +22,10 @@
BuildRequires: python-devel
BuildRequires: desktop-file-utils
BuildRequires: gettext
+BuildRequires: boost-devel
# Drop these when ogg test patch is removed.
-BuildRequires: autoconf
-BuildRequires: automake
-
+BuildRequires: autoconf
+BuildRequires: automake
%description
The Battle for Wesnoth is a turn-based strategy game with a fantasy theme.
@@ -70,9 +71,10 @@
%prep
%setup -q
-%patch0 -p1 -b .ogg
+%patch0 -p1 -b .gcc43
+%patch1 -p0
autoreconf
-chmod -x MANUAL*
+#chmod -x MANUAL*
%build
@@ -95,10 +97,21 @@
desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications \
--mode="0644" --vendor fedora \
icons/%{name}.desktop
+
+desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications \
+ --mode="0644" --vendor fedora \
+ icons/%{name}_editor.desktop
+
+#clean up extraneous .desktop files.
+rm -f $RPM_BUILD_ROOT/usr/share/applications/wesnoth*
+rm -f $RPM_BUILD_ROOT/usr/share/wesnoth/icons/*.desktop
+
# add icon for menus
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps
install -m 644 images/%{name}-icon.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps
+install -m 644 icons/%{name}_editor-icon.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps
+
# arrange server package files
mkdir -p ${RPM_BUILD_ROOT}%{_sbindir}
mv ${RPM_BUILD_ROOT}%{_bindir}/wesnothd ${RPM_BUILD_ROOT}%{_sbindir}
@@ -115,10 +128,25 @@
find $RPM_BUILD_ROOT -name ".cvs*" | xargs rm -f
find $RPM_BUILD_ROOT -name "CVS" | xargs rm -rf
+rm -rf $RPM_BUILD_ROOT/usr/share/doc/wesnoth/
+rm -f $RPM_BUILD_ROOT/usr/share/icons/wesnoth-icon.png
+rm -f $RPM_BUILD_ROOT/usr/share/icons/wesnoth_editor-icon.png
+rm -f $RPM_BUILD_ROOT/usr/share/applications/wesnoth*
%clean
rm -rf $RPM_BUILD_ROOT
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
%pre server
/usr/sbin/useradd -c "Wesnoth server" -s /sbin/nologin \
@@ -141,10 +169,10 @@
%files -f %{name}.\*.lang
%defattr(-,root,root,-)
-%doc COPYING changelog README copyright MANUAL*
+%doc COPYING changelog README copyright doc/manual/
%{_bindir}/%{name}
%{_datadir}/%{name}
-%{_datadir}/applications/*
+%{_datadir}/applications/fedora-wesnoth.desktop
%{_datadir}/pixmaps/*
%{_mandir}/man6/wesnoth.6*
%{_mandir}/*/man6/wesnoth.6*
@@ -154,6 +182,10 @@
%{_bindir}/wesnoth_editor
%{_bindir}/exploder
%{_bindir}/cutter
+%{_bindir}/wmlindent
+%{_bindir}/wmllint
+%{_bindir}/wmlscope
+%{_datadir}/applications/fedora-wesnoth_editor.desktop
%{_mandir}/man6/wesnoth_editor.6*
%{_mandir}/*/man6/wesnoth_editor.6*
@@ -168,12 +200,31 @@
%ghost /var/run/wesnothd/socket
%changelog
+* Tue Mar 11 2008 Jon Ciesla <limb at jcomserv.net> - 1.4-1
+- Update to 1.4 stable.
+
+* Fri Feb 15 2008 Jon Ciesla <limb at jcomserv.net> - 1.3.16-1
+- Update to 1.3.16.
+- Updated ogg test patch.
+- Corrected license tag.
+- Added boost-devel BR.
+- Corrected .desktop/icon handling for subpackage.
+
+* Mon Feb 11 2008 Warren Togami <wtogami at redhat.com> - 1.2.8-5
+- Patch to fix build with gcc-4.3.
+
+* Fri Feb 8 2008 Brian Pepple <bpepple at fedoraproject.org> - 1.2.8-4
+- Rebuild for gcc-4.3.
+
+* Fri Nov 30 2007 Brian Pepple <bpepple at fedoraproject.org> - 1.2.8-3
+- Re-add the server-gid that accidently got removed.
+
* Fri Nov 30 2007 Brian Pepple <bpepple at 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 at fedoraproject.org> - 1.2.8-1
-- Update to 1.2.8. Fixes #405661 (CVE-2007-5742)
+- Update to 1.2.8.
* Tue Oct 9 2007 Brian Pepple <bpepple at fedoraproject.org> - 1.2.7-1
- Update to 1.2.7. Fixes #324841 (CVE-2007-3917)
- Previous message (by thread): rpms/kernel/devel linux-2.6-merge-efifb-imacfb.patch, NONE, 1.1 config-x86-generic, 1.31, 1.32 config-x86_64-generic, 1.29, 1.30 kernel.spec, 1.568, 1.569
- Next message (by thread): rpms/jd/F-7 .cvsignore, 1.187, 1.188 jd.spec, 1.212, 1.213 sources, 1.188, 1.189
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list