From 96622f90f3eb57ec6bbd8b5423529c337f0f74ee Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 18 May 2007 11:09:38 +0000 Subject: [PATCH 01/40] Initialize branch F-7 for wormux --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..c48525c --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-7 From b3ab5552f1876961ecb9cabf2aec054f66880f0f Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Tue, 19 Jun 2007 15:33:33 +0000 Subject: [PATCH 02/40] Rebuild against SDL_gfx 2.0.16. --- wormux.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/wormux.spec b/wormux.spec index 27cc2b4..8426b79 100644 --- a/wormux.spec +++ b/wormux.spec @@ -1,6 +1,6 @@ Name: wormux Version: 0.7.9 -Release: 3%{?dist} +Release: 4%{?dist} Summary: 2D convivial mass murder game Group: Amusements/Games @@ -10,7 +10,7 @@ Source0: http://download.gna.org/wormux/%{name}-%{version}.tar.gz Patch0: wormux-0.7.9-cflags.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: SDL_image-devel SDL_gfx-devel SDL_mixer-devel +BuildRequires: SDL_image-devel SDL_gfx-devel SDL_mixer-devel BuildRequires: SDL_ttf-devel SDL_net-devel curl-devel BuildRequires: gettext libxml++-devel desktop-file-utils Requires: wormux-data @@ -85,6 +85,9 @@ fi %{_datadir}/%{name} %changelog +* Tue Jun 19 2007 Matthias Saou 0.7.9-4 +- Rebuild against SDL_gfx 2.0.16. + * Wed Mar 28 2007 Wart 0.7.9-3 - Enable use of $RPM_OPT_FLAGS From 2363ced4f71a3a6893cd3a995d1787d060d4d97d Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Wed, 22 Aug 2007 06:00:21 +0000 Subject: [PATCH 03/40] License tag clarification --- wormux.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/wormux.spec b/wormux.spec index 8426b79..60e4b97 100644 --- a/wormux.spec +++ b/wormux.spec @@ -1,10 +1,10 @@ Name: wormux Version: 0.7.9 -Release: 4%{?dist} +Release: 5%{?dist} Summary: 2D convivial mass murder game Group: Amusements/Games -License: GPL +License: GPLv2+ URL: http://www.wormux.org Source0: http://download.gna.org/wormux/%{name}-%{version}.tar.gz Patch0: wormux-0.7.9-cflags.patch @@ -85,6 +85,9 @@ fi %{_datadir}/%{name} %changelog +* Tue Aug 21 2007 Wart 0.7.9-5 +- License tag clarification + * Tue Jun 19 2007 Matthias Saou 0.7.9-4 - Rebuild against SDL_gfx 2.0.16. From 5ce0caf7f3aedc0af20f797f540c0aa39e4789a9 Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Wed, 22 Aug 2007 06:05:00 +0000 Subject: [PATCH 04/40] License tag clarification --- wormux.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/wormux.spec b/wormux.spec index 27cc2b4..06be555 100644 --- a/wormux.spec +++ b/wormux.spec @@ -1,10 +1,10 @@ Name: wormux Version: 0.7.9 -Release: 3%{?dist} +Release: 4%{?dist} Summary: 2D convivial mass murder game Group: Amusements/Games -License: GPL +License: GPLv2+ URL: http://www.wormux.org Source0: http://download.gna.org/wormux/%{name}-%{version}.tar.gz Patch0: wormux-0.7.9-cflags.patch @@ -85,6 +85,8 @@ fi %{_datadir}/%{name} %changelog +- License tag clarification + * Wed Mar 28 2007 Wart 0.7.9-3 - Enable use of $RPM_OPT_FLAGS From de8d164622e7032e7bef023606e0e2d9df8fb928 Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Sun, 10 Feb 2008 21:02:49 +0000 Subject: [PATCH 05/40] rebuild for gcc 4.3 --- wormux-0.7.9-gcc43.patch | 75 ++++++++++++++++++++++++++++++++++++++++ wormux.spec | 7 +++- 2 files changed, 81 insertions(+), 1 deletion(-) create mode 100644 wormux-0.7.9-gcc43.patch diff --git a/wormux-0.7.9-gcc43.patch b/wormux-0.7.9-gcc43.patch new file mode 100644 index 0000000..d182617 --- /dev/null +++ b/wormux-0.7.9-gcc43.patch @@ -0,0 +1,75 @@ +--- wormux-0.7.9/src/network/distant_cpu.cpp.orig 2008-02-10 11:52:30.000000000 -0800 ++++ wormux-0.7.9/src/network/distant_cpu.cpp 2008-02-10 11:52:43.000000000 -0800 +@@ -30,6 +30,7 @@ + #include "../team/teams_list.h" + #include "../tool/debug.h" + #include "../tool/i18n.h" ++#include + //----------------------------------------------------------------------------- + + DistantComputer::DistantComputer(TCPsocket new_sock) +--- wormux-0.7.9/src/weapon/launcher.cpp.orig 2008-02-10 12:10:59.000000000 -0800 ++++ wormux-0.7.9/src/weapon/launcher.cpp 2008-02-10 12:11:11.000000000 -0800 +@@ -22,6 +22,7 @@ + #include "launcher.h" + + #include ++#include + + #include "explosion.h" + #include "../game/config.h" +--- wormux-0.7.9/src/weapon/anvil.cpp.orig 2008-02-10 12:14:32.000000000 -0800 ++++ wormux-0.7.9/src/weapon/anvil.cpp 2008-02-10 12:14:45.000000000 -0800 +@@ -22,6 +22,7 @@ + #include "anvil.h" + //----------------------------------------------------------------------------- + #include ++#include + #include "../game/time.h" + #include "../team/teams_list.h" + #include "../graphic/video.h" +--- wormux-0.7.9/src/menu/map_selection_box.cpp.orig 2008-02-09 15:00:36.000000000 -0800 ++++ wormux-0.7.9/src/menu/map_selection_box.cpp 2008-02-09 15:20:34.000000000 -0800 +@@ -19,6 +19,8 @@ + * Map selection box + *****************************************************************************/ + ++#include ++#include + #include "map_selection_box.h" + #include "../include/action_handler.h" + #include "../map/maps_list.h" +--- wormux-0.7.9/src/menu/credits_menu.cpp.orig 2008-02-09 15:03:55.000000000 -0800 ++++ wormux-0.7.9/src/menu/credits_menu.cpp 2008-02-09 15:12:24.000000000 -0800 +@@ -23,6 +23,8 @@ + //----------------------------------------------------------------------------- + #include + #include ++#include ++#include + #include "../game/config.h" + #include "../include/app.h" + //----------------------------------------------------------------------------- +--- wormux-0.7.9/src/game/config.cpp.orig 2008-02-09 14:49:55.000000000 -0800 ++++ wormux-0.7.9/src/game/config.cpp 2008-02-09 14:51:19.000000000 -0800 +@@ -373,7 +373,7 @@ + */ + std::string Config::GetEnv(const std::string & name, const std::string &default_value) + { +- const char *env = std::getenv(name.c_str()); ++ const char *env = ::getenv(name.c_str()); + if (env != NULL) { + return env; + } else { +--- wormux-0.7.9/src/map/maps_list.cpp.orig 2008-02-09 15:31:53.000000000 -0800 ++++ wormux-0.7.9/src/map/maps_list.cpp 2008-02-09 15:32:07.000000000 -0800 +@@ -18,7 +18,8 @@ + ****************************************************************************** + * Maps list + *****************************************************************************/ +- ++#include ++#include + #include "maps_list.h" + #include "map.h" + #include "../game/config.h" diff --git a/wormux.spec b/wormux.spec index 60e4b97..9f8523a 100644 --- a/wormux.spec +++ b/wormux.spec @@ -1,6 +1,6 @@ Name: wormux Version: 0.7.9 -Release: 5%{?dist} +Release: 6%{?dist} Summary: 2D convivial mass murder game Group: Amusements/Games @@ -8,6 +8,7 @@ License: GPLv2+ URL: http://www.wormux.org Source0: http://download.gna.org/wormux/%{name}-%{version}.tar.gz Patch0: wormux-0.7.9-cflags.patch +Patch1: wormux-0.7.9-gcc43.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL_image-devel SDL_gfx-devel SDL_mixer-devel @@ -32,6 +33,7 @@ Data files for wormux %prep %setup -q %patch0 -p1 +%patch1 -p1 %build @@ -85,6 +87,9 @@ fi %{_datadir}/%{name} %changelog +* Fri Feb 8 2008 Wart 0.7.9-6 +- Rebuild for gcc 4.3 + * Tue Aug 21 2007 Wart 0.7.9-5 - License tag clarification From a3c29e30b1244b044844b76c5236f568fd09e7cf Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Fri, 30 May 2008 17:38:05 +0000 Subject: [PATCH 06/40] Update to 0.8 --- .cvsignore | 2 +- sources | 2 +- wormux.spec | 16 ++++++++-------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.cvsignore b/.cvsignore index b08c6c5..249fe9f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wormux-0.7.9.tar.gz +wormux-0.8.tar.bz2 diff --git a/sources b/sources index 19e3015..c42464f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d921ae5bad243dec7bb6825d6e0b9d16 wormux-0.7.9.tar.gz +79400ddcb2e9fdfcd4145c62940a24d3 wormux-0.8.tar.bz2 diff --git a/wormux.spec b/wormux.spec index 9f8523a..637f0be 100644 --- a/wormux.spec +++ b/wormux.spec @@ -1,18 +1,16 @@ Name: wormux -Version: 0.7.9 -Release: 6%{?dist} +Version: 0.8 +Release: 1%{?dist} Summary: 2D convivial mass murder game Group: Amusements/Games License: GPLv2+ URL: http://www.wormux.org -Source0: http://download.gna.org/wormux/%{name}-%{version}.tar.gz -Patch0: wormux-0.7.9-cflags.patch -Patch1: wormux-0.7.9-gcc43.patch +Source0: http://download.gna.org/wormux/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL_image-devel SDL_gfx-devel SDL_mixer-devel -BuildRequires: SDL_ttf-devel SDL_net-devel curl-devel +BuildRequires: SDL_ttf-devel SDL_net-devel curl-devel libpng-devel BuildRequires: gettext libxml++-devel desktop-file-utils Requires: wormux-data @@ -32,8 +30,6 @@ Data files for wormux %prep %setup -q -%patch0 -p1 -%patch1 -p1 %build @@ -80,6 +76,7 @@ fi %{_bindir}/%{name} %{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/32x32/apps/%{name}.png +%{_datadir}/pixmaps/wormux*.png %{_mandir}/man6/*.6.gz %files data @@ -87,6 +84,9 @@ fi %{_datadir}/%{name} %changelog +* Thu May 29 2008 Wart 0.8-1 +- Update to 0.8 + * Fri Feb 8 2008 Wart 0.7.9-6 - Rebuild for gcc 4.3 From 1d859f2ef32599681203a5123bdcf2d176221a85 Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Sat, 8 Nov 2008 00:06:59 +0000 Subject: [PATCH 07/40] Update to 0.8.2 --- .cvsignore | 2 +- sources | 2 +- wormux-0.7.9-cflags.patch | 51 -------------------------- wormux-0.7.9-gcc43.patch | 75 --------------------------------------- wormux.spec | 5 ++- 5 files changed, 6 insertions(+), 129 deletions(-) delete mode 100644 wormux-0.7.9-cflags.patch delete mode 100644 wormux-0.7.9-gcc43.patch diff --git a/.cvsignore b/.cvsignore index 249fe9f..1bf53c8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wormux-0.8.tar.bz2 +wormux-0.8.2.tar.bz2 diff --git a/sources b/sources index c42464f..b6cd8c8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -79400ddcb2e9fdfcd4145c62940a24d3 wormux-0.8.tar.bz2 +cd0f22e6055acebfa5871e86ca229ee8 wormux-0.8.2.tar.bz2 diff --git a/wormux-0.7.9-cflags.patch b/wormux-0.7.9-cflags.patch deleted file mode 100644 index 3860805..0000000 --- a/wormux-0.7.9-cflags.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- wormux-0.7.9/configure.ac~ 2007-01-28 16:06:11.000000000 +0200 -+++ wormux-0.7.9/configure.ac 2007-03-24 12:59:34.000000000 +0200 -@@ -150,11 +150,8 @@ - GCC_FLAGS="$GCC_FLAGS -O2" - fi - -- dnl Ignore default options set by autoconf -- dnl CFLAGS="$CFLAGS $GCC_FLAGS" -- CFLAGS="$GCC_FLAGS" -- dnl CXXFLAGS="$CXXFLAGS $GCC_FLAGS" -- CXXFLAGS="$GCC_FLAGS" -+ CFLAGS="$GCC_FLAGS $CFLAGS" -+ CXXFLAGS="$GCC_FLAGS $CXXFLAGS" - - else - if test "x${debug}" = "xyes"; then ---- wormux-0.7.9/configure~ 2007-01-28 16:06:58.000000000 +0200 -+++ wormux-0.7.9/configure 2007-03-24 12:59:57.000000000 +0200 -@@ -7319,8 +7319,8 @@ - GCC_FLAGS="$GCC_FLAGS -O2" - fi - -- CFLAGS="$GCC_FLAGS" -- CXXFLAGS="$GCC_FLAGS" -+ CFLAGS="$GCC_FLAGS $CFLAGS" -+ CXXFLAGS="$GCC_FLAGS $CXXFLAGS" - - else - if test "x${debug}" = "xyes"; then ---- wormux-0.7.9/src/Makefile.am~ 2007-01-28 16:03:48.000000000 +0200 -+++ wormux-0.7.9/src/Makefile.am 2007-03-24 13:03:12.000000000 +0200 -@@ -176,7 +176,7 @@ - weapon/blowtorch.cpp weapon/blowtorch.h \ - weapon/syringe.cpp weapon/syringe.h - --AM_CXXFLAGS = -DINSTALL_DATADIR=\"$(pkgdatadir)\" -DINSTALL_LOCALEDIR=\"$(localedir)\" -DFONT_FILE=\"$(fontfile)\" -DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\" -Werror -+AM_CXXFLAGS = -DINSTALL_DATADIR=\"$(pkgdatadir)\" -DINSTALL_LOCALEDIR=\"$(localedir)\" -DFONT_FILE=\"$(fontfile)\" -DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\" - - - if WIN32 ---- wormux-0.7.9/src/Makefile.in~ 2007-01-28 16:06:57.000000000 +0200 -+++ wormux-0.7.9/src/Makefile.in 2007-03-24 13:03:28.000000000 +0200 -@@ -518,7 +518,7 @@ - weapon/submachine_gun.h weapon/polecat.cpp weapon/polecat.h \ - weapon/blowtorch.cpp weapon/blowtorch.h weapon/syringe.cpp \ - weapon/syringe.h $(am__append_1) --AM_CXXFLAGS = -DINSTALL_DATADIR=\"$(pkgdatadir)\" -DINSTALL_LOCALEDIR=\"$(localedir)\" -DFONT_FILE=\"$(fontfile)\" -DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\" -Werror -+AM_CXXFLAGS = -DINSTALL_DATADIR=\"$(pkgdatadir)\" -DINSTALL_LOCALEDIR=\"$(localedir)\" -DFONT_FILE=\"$(fontfile)\" -DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\" - all: config.h - $(MAKE) $(AM_MAKEFLAGS) all-recursive - diff --git a/wormux-0.7.9-gcc43.patch b/wormux-0.7.9-gcc43.patch deleted file mode 100644 index d182617..0000000 --- a/wormux-0.7.9-gcc43.patch +++ /dev/null @@ -1,75 +0,0 @@ ---- wormux-0.7.9/src/network/distant_cpu.cpp.orig 2008-02-10 11:52:30.000000000 -0800 -+++ wormux-0.7.9/src/network/distant_cpu.cpp 2008-02-10 11:52:43.000000000 -0800 -@@ -30,6 +30,7 @@ - #include "../team/teams_list.h" - #include "../tool/debug.h" - #include "../tool/i18n.h" -+#include - //----------------------------------------------------------------------------- - - DistantComputer::DistantComputer(TCPsocket new_sock) ---- wormux-0.7.9/src/weapon/launcher.cpp.orig 2008-02-10 12:10:59.000000000 -0800 -+++ wormux-0.7.9/src/weapon/launcher.cpp 2008-02-10 12:11:11.000000000 -0800 -@@ -22,6 +22,7 @@ - #include "launcher.h" - - #include -+#include - - #include "explosion.h" - #include "../game/config.h" ---- wormux-0.7.9/src/weapon/anvil.cpp.orig 2008-02-10 12:14:32.000000000 -0800 -+++ wormux-0.7.9/src/weapon/anvil.cpp 2008-02-10 12:14:45.000000000 -0800 -@@ -22,6 +22,7 @@ - #include "anvil.h" - //----------------------------------------------------------------------------- - #include -+#include - #include "../game/time.h" - #include "../team/teams_list.h" - #include "../graphic/video.h" ---- wormux-0.7.9/src/menu/map_selection_box.cpp.orig 2008-02-09 15:00:36.000000000 -0800 -+++ wormux-0.7.9/src/menu/map_selection_box.cpp 2008-02-09 15:20:34.000000000 -0800 -@@ -19,6 +19,8 @@ - * Map selection box - *****************************************************************************/ - -+#include -+#include - #include "map_selection_box.h" - #include "../include/action_handler.h" - #include "../map/maps_list.h" ---- wormux-0.7.9/src/menu/credits_menu.cpp.orig 2008-02-09 15:03:55.000000000 -0800 -+++ wormux-0.7.9/src/menu/credits_menu.cpp 2008-02-09 15:12:24.000000000 -0800 -@@ -23,6 +23,8 @@ - //----------------------------------------------------------------------------- - #include - #include -+#include -+#include - #include "../game/config.h" - #include "../include/app.h" - //----------------------------------------------------------------------------- ---- wormux-0.7.9/src/game/config.cpp.orig 2008-02-09 14:49:55.000000000 -0800 -+++ wormux-0.7.9/src/game/config.cpp 2008-02-09 14:51:19.000000000 -0800 -@@ -373,7 +373,7 @@ - */ - std::string Config::GetEnv(const std::string & name, const std::string &default_value) - { -- const char *env = std::getenv(name.c_str()); -+ const char *env = ::getenv(name.c_str()); - if (env != NULL) { - return env; - } else { ---- wormux-0.7.9/src/map/maps_list.cpp.orig 2008-02-09 15:31:53.000000000 -0800 -+++ wormux-0.7.9/src/map/maps_list.cpp 2008-02-09 15:32:07.000000000 -0800 -@@ -18,7 +18,8 @@ - ****************************************************************************** - * Maps list - *****************************************************************************/ -- -+#include -+#include - #include "maps_list.h" - #include "map.h" - #include "../game/config.h" diff --git a/wormux.spec b/wormux.spec index 637f0be..b464557 100644 --- a/wormux.spec +++ b/wormux.spec @@ -1,5 +1,5 @@ Name: wormux -Version: 0.8 +Version: 0.8.2 Release: 1%{?dist} Summary: 2D convivial mass murder game @@ -84,6 +84,9 @@ fi %{_datadir}/%{name} %changelog +* Fri Nov 7 2008 Wart 0.8.2-1 +- Update to 0.8.2 + * Thu May 29 2008 Wart 0.8-1 - Update to 0.8 From 3984d7827eb894254f52f8d8c6dfd5fbd0da2573 Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Wed, 24 Dec 2008 23:24:51 +0000 Subject: [PATCH 08/40] - Add coreutils requirement for rpm post scripts - Replace bundled font with a symlink to an identical system font (BZ #477484) --- wormux.spec | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/wormux.spec b/wormux.spec index b464557..0c87242 100644 --- a/wormux.spec +++ b/wormux.spec @@ -1,6 +1,6 @@ Name: wormux Version: 0.8.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: 2D convivial mass murder game Group: Amusements/Games @@ -12,7 +12,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL_image-devel SDL_gfx-devel SDL_mixer-devel BuildRequires: SDL_ttf-devel SDL_net-devel curl-devel libpng-devel BuildRequires: gettext libxml++-devel desktop-file-utils -Requires: wormux-data +Requires: wormux-data dejavu-fonts +Requires(post): coreutils +Requires(postun): coreutils %description Battle your favorite free software mascots in the Wormux arena. With big @@ -54,6 +56,9 @@ desktop-file-install --vendor fedora \ install -d $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/ install -p -m 644 data/%{name}_32x32.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/%{name}.png +rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/font/DejaVuSans.ttf +ln -s %{_datadir}/fonts/dejavu/DejaVuSans.ttf $RPM_BUILD_ROOT%{_datadir}/%{name}/font/DejaVuSans.ttf + %clean rm -rf $RPM_BUILD_ROOT @@ -84,6 +89,10 @@ fi %{_datadir}/%{name} %changelog +* Wed Dec 24 2008 Wart 0.8.2-2 +- Add coreutils requirement for rpm post scripts +- Replace bundled font with a symlink to an identical system font (BZ #477484) + * Fri Nov 7 2008 Wart 0.8.2-1 - Update to 0.8.2 From 71b9f18bb735458aa7f0ec4c7438c56ab1d6b980 Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Fri, 2 Jan 2009 00:11:47 +0000 Subject: [PATCH 09/40] Fix font package name for F11 --- wormux.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/wormux.spec b/wormux.spec index 0c87242..fbe5f4d 100644 --- a/wormux.spec +++ b/wormux.spec @@ -1,6 +1,6 @@ Name: wormux Version: 0.8.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: 2D convivial mass murder game Group: Amusements/Games @@ -12,7 +12,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL_image-devel SDL_gfx-devel SDL_mixer-devel BuildRequires: SDL_ttf-devel SDL_net-devel curl-devel libpng-devel BuildRequires: gettext libxml++-devel desktop-file-utils -Requires: wormux-data dejavu-fonts +Requires: wormux-data dejavu-fonts-sans Requires(post): coreutils Requires(postun): coreutils @@ -89,6 +89,9 @@ fi %{_datadir}/%{name} %changelog +* Thu Jan 1 2009 Wart 0.8.2-3 +- Fix font package name for F11 + * Wed Dec 24 2008 Wart 0.8.2-2 - Add coreutils requirement for rpm post scripts - Replace bundled font with a symlink to an identical system font (BZ #477484) From 755901025d24ecf7763e51c1b009e396902d11d3 Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Thu, 29 Jan 2009 15:44:21 +0000 Subject: [PATCH 10/40] Yet another font package rename. --- wormux.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/wormux.spec b/wormux.spec index fbe5f4d..2ae23cf 100644 --- a/wormux.spec +++ b/wormux.spec @@ -1,6 +1,6 @@ Name: wormux Version: 0.8.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: 2D convivial mass murder game Group: Amusements/Games @@ -12,7 +12,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL_image-devel SDL_gfx-devel SDL_mixer-devel BuildRequires: SDL_ttf-devel SDL_net-devel curl-devel libpng-devel BuildRequires: gettext libxml++-devel desktop-file-utils -Requires: wormux-data dejavu-fonts-sans +Requires: wormux-data dejavu-sans-fonts Requires(post): coreutils Requires(postun): coreutils @@ -89,6 +89,9 @@ fi %{_datadir}/%{name} %changelog +* Thu Jan 29 2009 Wart 0.8.2-4 +- Yet another font package rename + * Thu Jan 1 2009 Wart 0.8.2-3 - Fix font package name for F11 From 125339aaba7ba58306a2c58c039b1fd345422e2b Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Thu, 26 Feb 2009 07:10:14 +0000 Subject: [PATCH 11/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- wormux.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wormux.spec b/wormux.spec index 2ae23cf..f13e596 100644 --- a/wormux.spec +++ b/wormux.spec @@ -1,6 +1,6 @@ Name: wormux Version: 0.8.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: 2D convivial mass murder game Group: Amusements/Games @@ -89,6 +89,9 @@ fi %{_datadir}/%{name} %changelog +* Wed Feb 25 2009 Fedora Release Engineering - 0.8.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Thu Jan 29 2009 Wart 0.8.2-4 - Yet another font package rename From 1eca55ae8944dfb43aa070240cd62774882df2ab Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Thu, 7 May 2009 15:40:15 +0000 Subject: [PATCH 12/40] Update to 0.8.3 --- .cvsignore | 2 +- sources | 2 +- wormux.spec | 11 +++++++++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 1bf53c8..7980afd 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wormux-0.8.2.tar.bz2 +wormux-0.8.3.tar.bz2 diff --git a/sources b/sources index b6cd8c8..3a9eae4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cd0f22e6055acebfa5871e86ca229ee8 wormux-0.8.2.tar.bz2 +c4235a844ad9f7337f1a8da2c5c1b820 wormux-0.8.3.tar.bz2 diff --git a/wormux.spec b/wormux.spec index f13e596..71121a6 100644 --- a/wormux.spec +++ b/wormux.spec @@ -1,6 +1,6 @@ Name: wormux -Version: 0.8.2 -Release: 5%{?dist} +Version: 0.8.3 +Release: 1%{?dist} Summary: 2D convivial mass murder game Group: Amusements/Games @@ -27,12 +27,15 @@ destroy all of your opponents' mascots. Summary: Data files for wormux Group: Amusements/Games Requires: %{name} = %{version} +BuildArch: noarch %description data Data files for wormux %prep %setup -q +# Remove a backup file +rm -f data/game_mode/rope_objects.xml~ %build %configure --disable-nls --disable-dependency-tracking @@ -89,6 +92,10 @@ fi %{_datadir}/%{name} %changelog +* Wed May 6 2009 Wart 0.8.3-1 +- Update to 0.8.3 +- Make -data subpackage noarch + * Wed Feb 25 2009 Fedora Release Engineering - 0.8.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From 2632b7f09ded8ccddc5b9855458169ce3b39e868 Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Thu, 7 May 2009 21:53:35 +0000 Subject: [PATCH 13/40] Build with $RPM_OPT_FLAGS. --- wormux-0.8.3-cflags.patch | 11 +++++++++++ wormux.spec | 7 ++++++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 wormux-0.8.3-cflags.patch diff --git a/wormux-0.8.3-cflags.patch b/wormux-0.8.3-cflags.patch new file mode 100644 index 0000000..6dfd262 --- /dev/null +++ b/wormux-0.8.3-cflags.patch @@ -0,0 +1,11 @@ +diff -up wormux-0.8.3/configure~ wormux-0.8.3/configure +--- wormux-0.8.3/configure~ 2009-03-05 22:24:17.000000000 +0200 ++++ wormux-0.8.3/configure 2009-05-07 20:41:31.000000000 +0300 +@@ -7608,6 +7608,7 @@ echo "${ECHO_T}$gccver" >&6; } + GCC_FLAGS="$GCC_FLAGS -DWMX_LOG" + fi + ++ GCC_FLAGS="$GCC_FLAGS $CFLAGS" + CFLAGS="$GCC_FLAGS" + CXXFLAGS="$GCC_FLAGS" + diff --git a/wormux.spec b/wormux.spec index 71121a6..c5e6f68 100644 --- a/wormux.spec +++ b/wormux.spec @@ -1,12 +1,13 @@ Name: wormux Version: 0.8.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: 2D convivial mass murder game Group: Amusements/Games License: GPLv2+ URL: http://www.wormux.org Source0: http://download.gna.org/wormux/%{name}-%{version}.tar.bz2 +Patch0: wormux-0.8.3-cflags.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL_image-devel SDL_gfx-devel SDL_mixer-devel @@ -33,6 +34,7 @@ Data files for wormux %prep %setup -q +%patch0 -p1 # Remove a backup file rm -f data/game_mode/rope_objects.xml~ @@ -92,6 +94,9 @@ fi %{_datadir}/%{name} %changelog +* Thu May 7 2009 Ville Skyttä - 0.8.3-2 +- Build with $RPM_OPT_FLAGS. + * Wed May 6 2009 Wart 0.8.3-1 - Update to 0.8.3 - Make -data subpackage noarch From 8a992fc42f0e54d519fe4215b64ac9f110863199 Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Sun, 19 Jul 2009 02:26:53 +0000 Subject: [PATCH 14/40] Update to latest release --- .cvsignore | 2 +- sources | 2 +- wormux.spec | 10 ++++++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 7980afd..4521d44 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wormux-0.8.3.tar.bz2 +wormux-0.8.4.tar.bz2 diff --git a/sources b/sources index 3a9eae4..5e905b5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c4235a844ad9f7337f1a8da2c5c1b820 wormux-0.8.3.tar.bz2 +0aed316799723173f2d6e242af312382 wormux-0.8.4.tar.bz2 diff --git a/wormux.spec b/wormux.spec index c5e6f68..b7baa79 100644 --- a/wormux.spec +++ b/wormux.spec @@ -1,6 +1,6 @@ Name: wormux -Version: 0.8.3 -Release: 2%{?dist} +Version: 0.8.4 +Release: 1%{?dist} Summary: 2D convivial mass murder game Group: Amusements/Games @@ -38,6 +38,7 @@ Data files for wormux # Remove a backup file rm -f data/game_mode/rope_objects.xml~ +rm -f data/game_mode/skin_viewer.xml~ %build %configure --disable-nls --disable-dependency-tracking @@ -84,6 +85,8 @@ fi %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog %{_bindir}/%{name} +%{_bindir}/%{name}-index-server +%{_bindir}/%{name}-server %{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/32x32/apps/%{name}.png %{_datadir}/pixmaps/wormux*.png @@ -94,6 +97,9 @@ fi %{_datadir}/%{name} %changelog +* Wed Jul 18 2009 Wart 0.8.4-1 +- Update to 0.8.4 + * Thu May 7 2009 Ville Skyttä - 0.8.3-2 - Build with $RPM_OPT_FLAGS. From bcf58d743ac6c47c4db1ed937186a9034c6c2c3c Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 27 Jul 2009 07:26:31 +0000 Subject: [PATCH 15/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- wormux.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wormux.spec b/wormux.spec index b7baa79..586ce24 100644 --- a/wormux.spec +++ b/wormux.spec @@ -1,6 +1,6 @@ Name: wormux Version: 0.8.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: 2D convivial mass murder game Group: Amusements/Games @@ -97,6 +97,9 @@ fi %{_datadir}/%{name} %changelog +* Mon Jul 27 2009 Fedora Release Engineering - 0.8.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Wed Jul 18 2009 Wart 0.8.4-1 - Update to 0.8.4 From 4a10fe7db543b20628c79c1ce38aa89d6f483d24 Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Mon, 12 Oct 2009 01:22:52 +0000 Subject: [PATCH 16/40] Update to 0.8.5 --- .cvsignore | 2 +- sources | 2 +- wormux.spec | 9 +++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 4521d44..db549f0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wormux-0.8.4.tar.bz2 +wormux-0.8.5.tar.bz2 diff --git a/sources b/sources index 5e905b5..3f0c387 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0aed316799723173f2d6e242af312382 wormux-0.8.4.tar.bz2 +e349893a46ece08533f4e393c82adeef wormux-0.8.5.tar.bz2 diff --git a/wormux.spec b/wormux.spec index 586ce24..7e32745 100644 --- a/wormux.spec +++ b/wormux.spec @@ -1,6 +1,6 @@ Name: wormux -Version: 0.8.4 -Release: 2%{?dist} +Version: 0.8.5 +Release: 1%{?dist} Summary: 2D convivial mass murder game Group: Amusements/Games @@ -85,8 +85,6 @@ fi %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog %{_bindir}/%{name} -%{_bindir}/%{name}-index-server -%{_bindir}/%{name}-server %{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/32x32/apps/%{name}.png %{_datadir}/pixmaps/wormux*.png @@ -97,6 +95,9 @@ fi %{_datadir}/%{name} %changelog +* Sat Oct 10 2009 Wart 0.8.5-1 +- Update to 0.8.5 + * Mon Jul 27 2009 Fedora Release Engineering - 0.8.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From c891f6ea72841922884f3312b9965cbcd72c7073 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:43:16 +0000 Subject: [PATCH 17/40] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e98eb66..d2d1ddf 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := wormux SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 263fb9048ddd8be2e90f4c0678c96502f093be3a Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:18:38 +0000 Subject: [PATCH 18/40] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e98eb66..d2d1ddf 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := wormux SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From b4651dde69505735d7f112513b584c4ed58441d3 Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Mon, 8 Feb 2010 16:05:55 +0000 Subject: [PATCH 19/40] Update to 0.9.0 --- .cvsignore | 2 +- sources | 2 +- wormux.spec | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index db549f0..6328240 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wormux-0.8.5.tar.bz2 +wormux-0.9.0.tar.bz2 diff --git a/sources b/sources index 3f0c387..564fa4e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e349893a46ece08533f4e393c82adeef wormux-0.8.5.tar.bz2 +001b4979c53ffcf4c45715cad4f8bc85 wormux-0.9.0.tar.bz2 diff --git a/wormux.spec b/wormux.spec index 7e32745..2c7a568 100644 --- a/wormux.spec +++ b/wormux.spec @@ -1,5 +1,5 @@ Name: wormux -Version: 0.8.5 +Version: 0.9.0 Release: 1%{?dist} Summary: 2D convivial mass murder game @@ -95,6 +95,9 @@ fi %{_datadir}/%{name} %changelog +* Sat Feb 6 2010 Wart 0.9.0-1 +- Update to 0.9.0 + * Sat Oct 10 2009 Wart 0.8.5-1 - Update to 0.8.5 From 5b72a3dc853f8417ec9a59a3eca7e1266bbaf568 Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Mon, 8 Feb 2010 17:14:52 +0000 Subject: [PATCH 20/40] Add game server utility --- wormux.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/wormux.spec b/wormux.spec index 2c7a568..3f4a95c 100644 --- a/wormux.spec +++ b/wormux.spec @@ -85,6 +85,7 @@ fi %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog %{_bindir}/%{name} +%{_bindir}/%{name}-list-games %{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/32x32/apps/%{name}.png %{_datadir}/pixmaps/wormux*.png From d9915fff9fc7a74f044322d47e2c04e8a90691f3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:25:21 +0000 Subject: [PATCH 21/40] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index d2d1ddf..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: wormux -# $Id$ -NAME := wormux -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index c48525c..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-7 From fb2f41de6d757f9e17c95a120e71c2dfbf137a1d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:25:27 +0000 Subject: [PATCH 22/40] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index d2d1ddf..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: wormux -# $Id$ -NAME := wormux -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From 00c3af5916fe649f42e248277edf23678abd7f96 Mon Sep 17 00:00:00 2001 From: wart Date: Sat, 11 Sep 2010 22:44:23 -0700 Subject: [PATCH 23/40] Update to 0.9.2 --- .gitignore | 1 + sources | 2 +- wormux.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6328240..46f2b62 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ wormux-0.9.0.tar.bz2 +/wormux-0.9.2.tar.bz2 diff --git a/sources b/sources index 564fa4e..5052a57 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -001b4979c53ffcf4c45715cad4f8bc85 wormux-0.9.0.tar.bz2 +2f4bee4b11091da81af4338c1fcce211 wormux-0.9.2.tar.bz2 diff --git a/wormux.spec b/wormux.spec index 3f4a95c..1c5ca84 100644 --- a/wormux.spec +++ b/wormux.spec @@ -1,5 +1,5 @@ Name: wormux -Version: 0.9.0 +Version: 0.9.2 Release: 1%{?dist} Summary: 2D convivial mass murder game @@ -96,6 +96,9 @@ fi %{_datadir}/%{name} %changelog +* Sat Sep 11 2010 Wart 0.9.2-1 +- Update to 0.9.2 + * Sat Feb 6 2010 Wart 0.9.0-1 - Update to 0.9.0 From ff4c613fd18a0e7ed0a5d9f778880966a82d100e Mon Sep 17 00:00:00 2001 From: wart Date: Sun, 12 Sep 2010 09:07:33 -0700 Subject: [PATCH 24/40] Add patch to fix build errors on x86_64 --- wormux-0.9.2-64bit.patch | 11 +++++++++++ wormux.spec | 3 +++ 2 files changed, 14 insertions(+) create mode 100644 wormux-0.9.2-64bit.patch diff --git a/wormux-0.9.2-64bit.patch b/wormux-0.9.2-64bit.patch new file mode 100644 index 0000000..25edd89 --- /dev/null +++ b/wormux-0.9.2-64bit.patch @@ -0,0 +1,11 @@ +--- lib/fixedpoint/stdint.h.orig 2010-09-12 09:04:52.000000000 -0700 ++++ lib/fixedpoint/stdint.h 2010-09-12 09:05:09.000000000 -0700 +@@ -30,7 +30,7 @@ + typedef unsigned short uint16_t; + typedef int int32_t; + typedef unsigned uint32_t; +-typedef long long int64_t; ++/* typedef long long int64_t; */ + typedef unsigned long long uint64_t; + + /* 7.18.1.2 Minimum-width integer types */ diff --git a/wormux.spec b/wormux.spec index 1c5ca84..8c80956 100644 --- a/wormux.spec +++ b/wormux.spec @@ -8,6 +8,7 @@ License: GPLv2+ URL: http://www.wormux.org Source0: http://download.gna.org/wormux/%{name}-%{version}.tar.bz2 Patch0: wormux-0.8.3-cflags.patch +Patch1: wormux-0.9.2-64bit.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL_image-devel SDL_gfx-devel SDL_mixer-devel @@ -35,6 +36,7 @@ Data files for wormux %prep %setup -q %patch0 -p1 +%patch1 -p0 # Remove a backup file rm -f data/game_mode/rope_objects.xml~ @@ -98,6 +100,7 @@ fi %changelog * Sat Sep 11 2010 Wart 0.9.2-1 - Update to 0.9.2 +- Add patch for 64-bit builds * Sat Feb 6 2010 Wart 0.9.0-1 - Update to 0.9.0 From 6203fe5b9c76b8edb7cb13ff15a830fc22851d32 Mon Sep 17 00:00:00 2001 From: wart Date: Mon, 13 Sep 2010 07:01:16 -0700 Subject: [PATCH 25/40] New upstream release that fixes 64-bit builds --- .gitignore | 1 + sources | 1 + wormux-0.9.2-64bit.patch | 11 ----------- wormux.spec | 8 ++++---- 4 files changed, 6 insertions(+), 15 deletions(-) delete mode 100644 wormux-0.9.2-64bit.patch diff --git a/.gitignore b/.gitignore index 46f2b62..d75b25c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ wormux-0.9.0.tar.bz2 /wormux-0.9.2.tar.bz2 +/wormux-0.9.2.1.tar.bz2 diff --git a/sources b/sources index 5052a57..a391672 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 2f4bee4b11091da81af4338c1fcce211 wormux-0.9.2.tar.bz2 +e49621b9b4ac7c8d1b11657989df61db wormux-0.9.2.1.tar.bz2 diff --git a/wormux-0.9.2-64bit.patch b/wormux-0.9.2-64bit.patch deleted file mode 100644 index 25edd89..0000000 --- a/wormux-0.9.2-64bit.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/fixedpoint/stdint.h.orig 2010-09-12 09:04:52.000000000 -0700 -+++ lib/fixedpoint/stdint.h 2010-09-12 09:05:09.000000000 -0700 -@@ -30,7 +30,7 @@ - typedef unsigned short uint16_t; - typedef int int32_t; - typedef unsigned uint32_t; --typedef long long int64_t; -+/* typedef long long int64_t; */ - typedef unsigned long long uint64_t; - - /* 7.18.1.2 Minimum-width integer types */ diff --git a/wormux.spec b/wormux.spec index 8c80956..b39966a 100644 --- a/wormux.spec +++ b/wormux.spec @@ -1,5 +1,5 @@ Name: wormux -Version: 0.9.2 +Version: 0.9.2.1 Release: 1%{?dist} Summary: 2D convivial mass murder game @@ -8,7 +8,6 @@ License: GPLv2+ URL: http://www.wormux.org Source0: http://download.gna.org/wormux/%{name}-%{version}.tar.bz2 Patch0: wormux-0.8.3-cflags.patch -Patch1: wormux-0.9.2-64bit.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL_image-devel SDL_gfx-devel SDL_mixer-devel @@ -36,7 +35,6 @@ Data files for wormux %prep %setup -q %patch0 -p1 -%patch1 -p0 # Remove a backup file rm -f data/game_mode/rope_objects.xml~ @@ -98,9 +96,11 @@ fi %{_datadir}/%{name} %changelog +* Sun Sep 12 2010 Wart 0.9.2.1-1 +- Update to 0.9.2.1 with fix for 64-bit builds + * Sat Sep 11 2010 Wart 0.9.2-1 - Update to 0.9.2 -- Add patch for 64-bit builds * Sat Feb 6 2010 Wart 0.9.0-1 - Update to 0.9.0 From 8bf71e6e87b6c2b02dd4cc540473430bc24dd01a Mon Sep 17 00:00:00 2001 From: wart Date: Mon, 13 Sep 2010 15:29:49 -0700 Subject: [PATCH 26/40] Re-add french translations that had gone missing --- wormux.spec | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/wormux.spec b/wormux.spec index b39966a..0a6e63c 100644 --- a/wormux.spec +++ b/wormux.spec @@ -1,6 +1,6 @@ Name: wormux Version: 0.9.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: 2D convivial mass murder game Group: Amusements/Games @@ -23,6 +23,12 @@ sticks of dynamite, grenades, baseball bats, and bazookas you can exterminate your opponent in a 2D cartoon style scenery. The goal of the game is to destroy all of your opponents' mascots. +%description -l fr +Faites des batailles épic dans l'arène Wormux avec vos mascote préféré. Avec +de gros baton de dynamites, grenades, bats de baseball et basookas tu dois +exterminer tes ennemis dans un style cartoon 2D. Le but du jeu est de détruire +toutes les macotees ennemies. + %package data Summary: Data files for wormux @@ -32,6 +38,9 @@ BuildArch: noarch %description data Data files for wormux +%description -l fr data +Fichier de données pour wormux + %prep %setup -q %patch0 -p1 @@ -96,6 +105,9 @@ fi %{_datadir}/%{name} %changelog +* Mon Sep 13 2010 Wart 0.9.2.1-2 +- Re-add french translations that had gone missing + * Sun Sep 12 2010 Wart 0.9.2.1-1 - Update to 0.9.2.1 with fix for 64-bit builds From 7c40dad4d97b33335610b4153cf953e2a2191837 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 29 Sep 2010 17:54:50 -0700 Subject: [PATCH 27/40] - Rebuilt for gcc bug 634757 --- wormux.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wormux.spec b/wormux.spec index 0a6e63c..dca7f41 100644 --- a/wormux.spec +++ b/wormux.spec @@ -1,6 +1,6 @@ Name: wormux Version: 0.9.2.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: 2D convivial mass murder game Group: Amusements/Games @@ -105,6 +105,9 @@ fi %{_datadir}/%{name} %changelog +* Wed Sep 29 2010 jkeating - 0.9.2.1-3 +- Rebuilt for gcc bug 634757 + * Mon Sep 13 2010 Wart 0.9.2.1-2 - Re-add french translations that had gone missing From b8166dab2b5e9bf639f8744d0e6efbf8a62932f8 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 21:08:26 -0600 Subject: [PATCH 28/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- wormux.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wormux.spec b/wormux.spec index dca7f41..d937528 100644 --- a/wormux.spec +++ b/wormux.spec @@ -1,6 +1,6 @@ Name: wormux Version: 0.9.2.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: 2D convivial mass murder game Group: Amusements/Games @@ -105,6 +105,9 @@ fi %{_datadir}/%{name} %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 0.9.2.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Wed Sep 29 2010 jkeating - 0.9.2.1-3 - Rebuilt for gcc bug 634757 From 007c212835838e52782d51a57d5aa3bd92cbd03c Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Tue, 26 Jul 2011 08:58:44 -0500 Subject: [PATCH 29/40] Rebuild for SDL_gfx soname bump. --- wormux.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wormux.spec b/wormux.spec index d937528..5a1ec62 100644 --- a/wormux.spec +++ b/wormux.spec @@ -1,6 +1,6 @@ Name: wormux Version: 0.9.2.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: 2D convivial mass murder game Group: Amusements/Games @@ -105,6 +105,9 @@ fi %{_datadir}/%{name} %changelog +* Tue Jul 26 2011 Bruno Wolff III - 0.9.2.1-5 +- Rebuild for SDL_gfx soname bump. + * Mon Feb 07 2011 Fedora Release Engineering - 0.9.2.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From b40fb0ec4f59124803b5cc765393b14912784922 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 6 Dec 2011 01:29:43 -0500 Subject: [PATCH 30/40] Rebuild for new libpng --- wormux.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wormux.spec b/wormux.spec index 5a1ec62..e69de62 100644 --- a/wormux.spec +++ b/wormux.spec @@ -1,6 +1,6 @@ Name: wormux Version: 0.9.2.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: 2D convivial mass murder game Group: Amusements/Games @@ -105,6 +105,9 @@ fi %{_datadir}/%{name} %changelog +* Tue Dec 06 2011 Adam Jackson - 0.9.2.1-6 +- Rebuild for new libpng + * Tue Jul 26 2011 Bruno Wolff III - 0.9.2.1-5 - Rebuild for SDL_gfx soname bump. From 3c5c609bc243a1f96ed3a0c3f0b6707a1eb71f35 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 14 Jan 2012 02:29:10 -0600 Subject: [PATCH 31/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- wormux.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wormux.spec b/wormux.spec index e69de62..1d97bad 100644 --- a/wormux.spec +++ b/wormux.spec @@ -1,6 +1,6 @@ Name: wormux Version: 0.9.2.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: 2D convivial mass murder game Group: Amusements/Games @@ -105,6 +105,9 @@ fi %{_datadir}/%{name} %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 0.9.2.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Tue Dec 06 2011 Adam Jackson - 0.9.2.1-6 - Rebuild for new libpng From b118699c2edf469c4540dd905f26892eddffe585 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Sun, 26 Feb 2012 10:45:38 -0600 Subject: [PATCH 32/40] We don't need the old source to do a current build --- sources | 1 - 1 file changed, 1 deletion(-) diff --git a/sources b/sources index a391672..2859b44 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -2f4bee4b11091da81af4338c1fcce211 wormux-0.9.2.tar.bz2 e49621b9b4ac7c8d1b11657989df61db wormux-0.9.2.1.tar.bz2 From f68d159e96f2c36b0f91281b8dbe4dfb5002f0d4 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Sun, 26 Feb 2012 10:55:04 -0600 Subject: [PATCH 33/40] gcc 4.7 has a problem casting away const We need to ast to void * to drop const before SDL does its cast. Though really the SDL cast should include const for read operations. --- wormux-gcc47.patch | 17 +++++++++++++++++ wormux.spec | 7 ++++++- 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 wormux-gcc47.patch diff --git a/wormux-gcc47.patch b/wormux-gcc47.patch new file mode 100644 index 0000000..c0b6db9 --- /dev/null +++ b/wormux-gcc47.patch @@ -0,0 +1,17 @@ +--- lib/wormux/action/action.cpp.orig 2012-02-26 10:50:43.367360110 -0600 ++++ lib/wormux/action/action.cpp 2012-02-26 10:51:37.459234926 -0600 +@@ -70,11 +70,11 @@ + + var.clear(); + buffer += 4; // skip the buffer len +- m_type = (Action_t)SDLNet_Read32(buffer); ++ m_type = (Action_t)SDLNet_Read32((void *)buffer); + buffer += 4; +- m_timestamp = (uint)SDLNet_Read32(buffer); ++ m_timestamp = (uint)SDLNet_Read32((void *)buffer); + buffer += 4; +- int m_length = SDLNet_Read32(buffer); ++ int m_length = SDLNet_Read32((void *)buffer); + buffer += 4; + + for(int i=0; i < m_length; i++) diff --git a/wormux.spec b/wormux.spec index 1d97bad..01b0a4f 100644 --- a/wormux.spec +++ b/wormux.spec @@ -1,6 +1,6 @@ Name: wormux Version: 0.9.2.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: 2D convivial mass murder game Group: Amusements/Games @@ -8,6 +8,7 @@ License: GPLv2+ URL: http://www.wormux.org Source0: http://download.gna.org/wormux/%{name}-%{version}.tar.bz2 Patch0: wormux-0.8.3-cflags.patch +Patch1: wormux-gcc47.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL_image-devel SDL_gfx-devel SDL_mixer-devel @@ -44,6 +45,7 @@ Fichier de données pour wormux %prep %setup -q %patch0 -p1 +%patch1 -p0 # Remove a backup file rm -f data/game_mode/rope_objects.xml~ @@ -105,6 +107,9 @@ fi %{_datadir}/%{name} %changelog +* Sun Feb 26 2012 Bruno Wolff III - 0.9.2.1-8 +- Fix building with gcc 4.7 + * Sat Jan 14 2012 Fedora Release Engineering - 0.9.2.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From eff8a25d33a154bd12535fd7747c040be3c7c07d Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Sun, 26 Feb 2012 11:03:09 -0600 Subject: [PATCH 34/40] Make adjusting patches easier --- wormux.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wormux.spec b/wormux.spec index 01b0a4f..d852c24 100644 --- a/wormux.spec +++ b/wormux.spec @@ -44,8 +44,8 @@ Fichier de données pour wormux %prep %setup -q -%patch0 -p1 -%patch1 -p0 +%patch0 -p1 -b .cflags +%patch1 -p0 -b .gcc47 # Remove a backup file rm -f data/game_mode/rope_objects.xml~ From f424ab4b032c3a5e2029e135e23fb67db1b73af7 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Sun, 26 Feb 2012 11:08:09 -0600 Subject: [PATCH 35/40] Missed another needed cast --- wormux-gcc47.patch | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/wormux-gcc47.patch b/wormux-gcc47.patch index c0b6db9..24d1ad0 100644 --- a/wormux-gcc47.patch +++ b/wormux-gcc47.patch @@ -1,6 +1,6 @@ ---- lib/wormux/action/action.cpp.orig 2012-02-26 10:50:43.367360110 -0600 -+++ lib/wormux/action/action.cpp 2012-02-26 10:51:37.459234926 -0600 -@@ -70,11 +70,11 @@ +--- ./lib/wormux/action/action.cpp.gcc47 2010-04-05 10:09:44.000000000 -0500 ++++ ./lib/wormux/action/action.cpp 2012-02-26 11:07:36.046066366 -0600 +@@ -70,16 +70,16 @@ var.clear(); buffer += 4; // skip the buffer len @@ -15,3 +15,9 @@ buffer += 4; for(int i=0; i < m_length; i++) + { +- uint32_t val = SDLNet_Read32(buffer); ++ uint32_t val = SDLNet_Read32((void *)buffer); + var.push_back(val); + buffer += 4; + } From cf148710cc04c4ad66064617c05affe364639bcc Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Sun, 26 Feb 2012 11:13:35 -0600 Subject: [PATCH 36/40] Fix potential truncation of buffer lengths Saving a 32 bit unsigned int in an int might result in truncation on some arches. Most likely the buffers weren't long enough for this to be a problem in practice, but it's still a bad thing to do. --- wormux-length-fix.patch | 15 +++++++++++++++ wormux.spec | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 wormux-length-fix.patch diff --git a/wormux-length-fix.patch b/wormux-length-fix.patch new file mode 100644 index 0000000..aeaae5c --- /dev/null +++ b/wormux-length-fix.patch @@ -0,0 +1,15 @@ +--- ./lib/wormux/action/action.cpp.orig 2012-02-26 11:10:20.199929478 -0600 ++++ ./lib/wormux/action/action.cpp 2012-02-26 11:11:44.368626889 -0600 +@@ -74,10 +74,10 @@ + buffer += 4; + m_timestamp = (uint)SDLNet_Read32((void *)buffer); + buffer += 4; +- int m_length = SDLNet_Read32((void *)buffer); ++ uint32_t m_length = SDLNet_Read32((void *)buffer); + buffer += 4; + +- for(int i=0; i < m_length; i++) ++ for(uint32_t i=0; i < m_length; i++) + { + uint32_t val = SDLNet_Read32((void *)buffer); + var.push_back(val); diff --git a/wormux.spec b/wormux.spec index d852c24..5c72a9f 100644 --- a/wormux.spec +++ b/wormux.spec @@ -9,6 +9,7 @@ URL: http://www.wormux.org Source0: http://download.gna.org/wormux/%{name}-%{version}.tar.bz2 Patch0: wormux-0.8.3-cflags.patch Patch1: wormux-gcc47.patch +Patch2: wormux-length-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL_image-devel SDL_gfx-devel SDL_mixer-devel @@ -46,6 +47,7 @@ Fichier de données pour wormux %setup -q %patch0 -p1 -b .cflags %patch1 -p0 -b .gcc47 +%patch2 -p0 -b .lengthfix # Remove a backup file rm -f data/game_mode/rope_objects.xml~ From 8f7880927d5ea0aebeeb9de96b5a56880ccea7f7 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Sun, 26 Feb 2012 11:19:08 -0600 Subject: [PATCH 37/40] png.h no longer includes zlib.h --- wormux-libpng15.patch | 10 ++++++++++ wormux.spec | 3 +++ 2 files changed, 13 insertions(+) create mode 100644 wormux-libpng15.patch diff --git a/wormux-libpng15.patch b/wormux-libpng15.patch new file mode 100644 index 0000000..066f707 --- /dev/null +++ b/wormux-libpng15.patch @@ -0,0 +1,10 @@ +--- ./src/graphic/surface.cpp.orig 2012-02-26 11:17:09.621964916 -0600 ++++ ./src/graphic/surface.cpp 2012-02-26 11:17:25.752014962 -0600 +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include + + #include "graphic/surface.h" + #include "tool/math_tools.h" diff --git a/wormux.spec b/wormux.spec index 5c72a9f..19d2b82 100644 --- a/wormux.spec +++ b/wormux.spec @@ -10,6 +10,7 @@ Source0: http://download.gna.org/wormux/%{name}-%{version}.tar.bz2 Patch0: wormux-0.8.3-cflags.patch Patch1: wormux-gcc47.patch Patch2: wormux-length-fix.patch +Patch3: wormux-libpng.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL_image-devel SDL_gfx-devel SDL_mixer-devel @@ -48,6 +49,7 @@ Fichier de données pour wormux %patch0 -p1 -b .cflags %patch1 -p0 -b .gcc47 %patch2 -p0 -b .lengthfix +%patch3 -p0 -b .libpng15 # Remove a backup file rm -f data/game_mode/rope_objects.xml~ @@ -111,6 +113,7 @@ fi %changelog * Sun Feb 26 2012 Bruno Wolff III - 0.9.2.1-8 - Fix building with gcc 4.7 +- Fix building with libpng 1.5 * Sat Jan 14 2012 Fedora Release Engineering - 0.9.2.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 53876f5d9c2720288d10d8303a2fc140f72ddabc Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Sun, 26 Feb 2012 11:19:53 -0600 Subject: [PATCH 38/40] Fix typo in patch file name --- wormux.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wormux.spec b/wormux.spec index 19d2b82..e0d1bac 100644 --- a/wormux.spec +++ b/wormux.spec @@ -10,7 +10,7 @@ Source0: http://download.gna.org/wormux/%{name}-%{version}.tar.bz2 Patch0: wormux-0.8.3-cflags.patch Patch1: wormux-gcc47.patch Patch2: wormux-length-fix.patch -Patch3: wormux-libpng.patch +Patch3: wormux-libpng15.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL_image-devel SDL_gfx-devel SDL_mixer-devel From b7358703ceb716acf9ec656b549efea23a6f5d6d Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Sun, 26 Feb 2012 11:24:31 -0600 Subject: [PATCH 39/40] stdio.h no longer includes unistd.h --- wormux-gcc47.patch | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/wormux-gcc47.patch b/wormux-gcc47.patch index 24d1ad0..8191b12 100644 --- a/wormux-gcc47.patch +++ b/wormux-gcc47.patch @@ -21,3 +21,11 @@ var.push_back(val); buffer += 4; } +--- tools/list_games/main.cpp.orig 2012-02-26 11:22:38.113714541 -0600 ++++ tools/list_games/main.cpp 2012-02-26 11:24:01.264282537 -0600 +@@ -1,4 +1,5 @@ + #include ++#include + #include + #include + #include From 5147eecb79e4093a67da3448e6cadedf7270989a Mon Sep 17 00:00:00 2001 From: Jiri Popelka Date: Fri, 23 Mar 2012 16:08:32 +0100 Subject: [PATCH 40/40] Renamed to warmux (#773419) --- .gitignore | 3 - dead.package | 1 + sources | 1 - wormux-0.8.3-cflags.patch | 11 -- wormux-gcc47.patch | 31 ------ wormux-length-fix.patch | 15 --- wormux-libpng15.patch | 10 -- wormux.spec | 222 -------------------------------------- 8 files changed, 1 insertion(+), 293 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 sources delete mode 100644 wormux-0.8.3-cflags.patch delete mode 100644 wormux-gcc47.patch delete mode 100644 wormux-length-fix.patch delete mode 100644 wormux-libpng15.patch delete mode 100644 wormux.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index d75b25c..0000000 --- a/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -wormux-0.9.0.tar.bz2 -/wormux-0.9.2.tar.bz2 -/wormux-0.9.2.1.tar.bz2 diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..fda6e65 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Renamed to warmux (#773419) diff --git a/sources b/sources deleted file mode 100644 index 2859b44..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -e49621b9b4ac7c8d1b11657989df61db wormux-0.9.2.1.tar.bz2 diff --git a/wormux-0.8.3-cflags.patch b/wormux-0.8.3-cflags.patch deleted file mode 100644 index 6dfd262..0000000 --- a/wormux-0.8.3-cflags.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up wormux-0.8.3/configure~ wormux-0.8.3/configure ---- wormux-0.8.3/configure~ 2009-03-05 22:24:17.000000000 +0200 -+++ wormux-0.8.3/configure 2009-05-07 20:41:31.000000000 +0300 -@@ -7608,6 +7608,7 @@ echo "${ECHO_T}$gccver" >&6; } - GCC_FLAGS="$GCC_FLAGS -DWMX_LOG" - fi - -+ GCC_FLAGS="$GCC_FLAGS $CFLAGS" - CFLAGS="$GCC_FLAGS" - CXXFLAGS="$GCC_FLAGS" - diff --git a/wormux-gcc47.patch b/wormux-gcc47.patch deleted file mode 100644 index 8191b12..0000000 --- a/wormux-gcc47.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- ./lib/wormux/action/action.cpp.gcc47 2010-04-05 10:09:44.000000000 -0500 -+++ ./lib/wormux/action/action.cpp 2012-02-26 11:07:36.046066366 -0600 -@@ -70,16 +70,16 @@ - - var.clear(); - buffer += 4; // skip the buffer len -- m_type = (Action_t)SDLNet_Read32(buffer); -+ m_type = (Action_t)SDLNet_Read32((void *)buffer); - buffer += 4; -- m_timestamp = (uint)SDLNet_Read32(buffer); -+ m_timestamp = (uint)SDLNet_Read32((void *)buffer); - buffer += 4; -- int m_length = SDLNet_Read32(buffer); -+ int m_length = SDLNet_Read32((void *)buffer); - buffer += 4; - - for(int i=0; i < m_length; i++) - { -- uint32_t val = SDLNet_Read32(buffer); -+ uint32_t val = SDLNet_Read32((void *)buffer); - var.push_back(val); - buffer += 4; - } ---- tools/list_games/main.cpp.orig 2012-02-26 11:22:38.113714541 -0600 -+++ tools/list_games/main.cpp 2012-02-26 11:24:01.264282537 -0600 -@@ -1,4 +1,5 @@ - #include -+#include - #include - #include - #include diff --git a/wormux-length-fix.patch b/wormux-length-fix.patch deleted file mode 100644 index aeaae5c..0000000 --- a/wormux-length-fix.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- ./lib/wormux/action/action.cpp.orig 2012-02-26 11:10:20.199929478 -0600 -+++ ./lib/wormux/action/action.cpp 2012-02-26 11:11:44.368626889 -0600 -@@ -74,10 +74,10 @@ - buffer += 4; - m_timestamp = (uint)SDLNet_Read32((void *)buffer); - buffer += 4; -- int m_length = SDLNet_Read32((void *)buffer); -+ uint32_t m_length = SDLNet_Read32((void *)buffer); - buffer += 4; - -- for(int i=0; i < m_length; i++) -+ for(uint32_t i=0; i < m_length; i++) - { - uint32_t val = SDLNet_Read32((void *)buffer); - var.push_back(val); diff --git a/wormux-libpng15.patch b/wormux-libpng15.patch deleted file mode 100644 index 066f707..0000000 --- a/wormux-libpng15.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ./src/graphic/surface.cpp.orig 2012-02-26 11:17:09.621964916 -0600 -+++ ./src/graphic/surface.cpp 2012-02-26 11:17:25.752014962 -0600 -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - - #include "graphic/surface.h" - #include "tool/math_tools.h" diff --git a/wormux.spec b/wormux.spec deleted file mode 100644 index e0d1bac..0000000 --- a/wormux.spec +++ /dev/null @@ -1,222 +0,0 @@ -Name: wormux -Version: 0.9.2.1 -Release: 8%{?dist} -Summary: 2D convivial mass murder game - -Group: Amusements/Games -License: GPLv2+ -URL: http://www.wormux.org -Source0: http://download.gna.org/wormux/%{name}-%{version}.tar.bz2 -Patch0: wormux-0.8.3-cflags.patch -Patch1: wormux-gcc47.patch -Patch2: wormux-length-fix.patch -Patch3: wormux-libpng15.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: SDL_image-devel SDL_gfx-devel SDL_mixer-devel -BuildRequires: SDL_ttf-devel SDL_net-devel curl-devel libpng-devel -BuildRequires: gettext libxml++-devel desktop-file-utils -Requires: wormux-data dejavu-sans-fonts -Requires(post): coreutils -Requires(postun): coreutils - -%description -Battle your favorite free software mascots in the Wormux arena. With big -sticks of dynamite, grenades, baseball bats, and bazookas you can exterminate -your opponent in a 2D cartoon style scenery. The goal of the game is to -destroy all of your opponents' mascots. - -%description -l fr -Faites des batailles épic dans l'arène Wormux avec vos mascote préféré. Avec -de gros baton de dynamites, grenades, bats de baseball et basookas tu dois -exterminer tes ennemis dans un style cartoon 2D. Le but du jeu est de détruire -toutes les macotees ennemies. - - -%package data -Summary: Data files for wormux -Group: Amusements/Games -Requires: %{name} = %{version} -BuildArch: noarch -%description data -Data files for wormux - -%description -l fr data -Fichier de données pour wormux - -%prep -%setup -q -%patch0 -p1 -b .cflags -%patch1 -p0 -b .gcc47 -%patch2 -p0 -b .lengthfix -%patch3 -p0 -b .libpng15 - -# Remove a backup file -rm -f data/game_mode/rope_objects.xml~ -rm -f data/game_mode/skin_viewer.xml~ - -%build -%configure --disable-nls --disable-dependency-tracking -make %{?_smp_mflags} - - -%install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT - -sed -i -e 's/Icon=.*/Icon=wormux.png/' \ - $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop -desktop-file-install --vendor fedora \ - --dir $RPM_BUILD_ROOT/%{_datadir}/applications/ \ - --remove-category=Application \ - --remove-category=ArcadeGame \ - --add-category=StrategyGame \ - --delete-original \ - $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop - -install -d $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/ -install -p -m 644 data/%{name}_32x32.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/%{name}.png - -rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/font/DejaVuSans.ttf -ln -s %{_datadir}/fonts/dejavu/DejaVuSans.ttf $RPM_BUILD_ROOT%{_datadir}/%{name}/font/DejaVuSans.ttf - -%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 - - -%files -%defattr(-,root,root,-) -%doc AUTHORS COPYING ChangeLog -%{_bindir}/%{name} -%{_bindir}/%{name}-list-games -%{_datadir}/applications/*.desktop -%{_datadir}/icons/hicolor/32x32/apps/%{name}.png -%{_datadir}/pixmaps/wormux*.png -%{_mandir}/man6/*.6.gz - -%files data -%defattr(-,root,root,-) -%{_datadir}/%{name} - -%changelog -* Sun Feb 26 2012 Bruno Wolff III - 0.9.2.1-8 -- Fix building with gcc 4.7 -- Fix building with libpng 1.5 - -* Sat Jan 14 2012 Fedora Release Engineering - 0.9.2.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Dec 06 2011 Adam Jackson - 0.9.2.1-6 -- Rebuild for new libpng - -* Tue Jul 26 2011 Bruno Wolff III - 0.9.2.1-5 -- Rebuild for SDL_gfx soname bump. - -* Mon Feb 07 2011 Fedora Release Engineering - 0.9.2.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Wed Sep 29 2010 jkeating - 0.9.2.1-3 -- Rebuilt for gcc bug 634757 - -* Mon Sep 13 2010 Wart 0.9.2.1-2 -- Re-add french translations that had gone missing - -* Sun Sep 12 2010 Wart 0.9.2.1-1 -- Update to 0.9.2.1 with fix for 64-bit builds - -* Sat Sep 11 2010 Wart 0.9.2-1 -- Update to 0.9.2 - -* Sat Feb 6 2010 Wart 0.9.0-1 -- Update to 0.9.0 - -* Sat Oct 10 2009 Wart 0.8.5-1 -- Update to 0.8.5 - -* Mon Jul 27 2009 Fedora Release Engineering - 0.8.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Jul 18 2009 Wart 0.8.4-1 -- Update to 0.8.4 - -* Thu May 7 2009 Ville Skyttä - 0.8.3-2 -- Build with $RPM_OPT_FLAGS. - -* Wed May 6 2009 Wart 0.8.3-1 -- Update to 0.8.3 -- Make -data subpackage noarch - -* Wed Feb 25 2009 Fedora Release Engineering - 0.8.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Thu Jan 29 2009 Wart 0.8.2-4 -- Yet another font package rename - -* Thu Jan 1 2009 Wart 0.8.2-3 -- Fix font package name for F11 - -* Wed Dec 24 2008 Wart 0.8.2-2 -- Add coreutils requirement for rpm post scripts -- Replace bundled font with a symlink to an identical system font (BZ #477484) - -* Fri Nov 7 2008 Wart 0.8.2-1 -- Update to 0.8.2 - -* Thu May 29 2008 Wart 0.8-1 -- Update to 0.8 - -* Fri Feb 8 2008 Wart 0.7.9-6 -- Rebuild for gcc 4.3 - -* Tue Aug 21 2007 Wart 0.7.9-5 -- License tag clarification - -* Tue Jun 19 2007 Matthias Saou 0.7.9-4 -- Rebuild against SDL_gfx 2.0.16. - -* Wed Mar 28 2007 Wart 0.7.9-3 -- Enable use of $RPM_OPT_FLAGS - -* Fri Mar 9 2007 Wart 0.7.9-2 -- Clean up desktop file categories -- Use upstream's desktop file and icon - -* Sat Feb 17 2007 Wart 0.7.9-1 -- Update to 0.7.9 - -* Fri Sep 1 2006 Wart 0.7.4-1 -- Update to 0.7.4 - -* Fri Aug 04 2006 Wart 0.7.2-6 -- Add 'ArcadeGame' category to .desktop file - -* Fri Jun 09 2006 Wart 0.7.2-5 -- Improve grammar in description - -* Fri Jun 09 2006 Wart 0.7.2-4 -- Fix broken path to desktop icon -- Fix typo in description - -* Fri Jun 09 2006 Wart 0.7.2-3 -- Use RPM_BUILD_ROOT consistently -- Put the wormux icon in a size-specific directory -- Removed INSTALL from the documentation files - -* Fri Jun 09 2006 Wart 0.7.2-2 -- Expanded the description -- Separated game data into a subpackage - -* Fri Jun 02 2006 Wart 0.7.2-1 -- Initial Fedora Extras package