From 52addad9e8be22ea5c129d6fd18442d687f8a4ac Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 7 Nov 2008 03:54:07 +0000 Subject: [PATCH 1/7] Initialize branch F-10 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..dc32377 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-10 From b5f862d1cd7afd61adcfa86e02ad15633ed34fd1 Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Sat, 8 Nov 2008 00:26:25 +0000 Subject: [PATCH 2/7] Remove obsolete patches --- wormux-0.7.9-cflags.patch | 51 -------------------------- wormux-0.7.9-gcc43.patch | 75 --------------------------------------- 2 files changed, 126 deletions(-) delete mode 100644 wormux-0.7.9-cflags.patch delete mode 100644 wormux-0.7.9-gcc43.patch 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" From 8da3fc07f117b1dd23a91e7959624d2ec02cb147 Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Sat, 8 Nov 2008 00:28:37 +0000 Subject: [PATCH 3/7] Update to 0.8.2 --- .cvsignore | 2 +- sources | 2 +- wormux.spec | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) 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.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 a51ed3b2de8c72333ce8c0e860ccc0f9bee9be32 Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Thu, 7 May 2009 15:51:56 +0000 Subject: [PATCH 4/7] Update to 0.8.3 --- .cvsignore | 2 +- sources | 2 +- wormux.spec | 9 ++++++++- 3 files changed, 10 insertions(+), 3 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 b464557..c480aea 100644 --- a/wormux.spec +++ b/wormux.spec @@ -1,5 +1,5 @@ Name: wormux -Version: 0.8.2 +Version: 0.8.3 Release: 1%{?dist} Summary: 2D convivial mass murder game @@ -25,12 +25,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 @@ -84,6 +87,10 @@ fi %{_datadir}/%{name} %changelog +* Wed May 6 2009 Wart 0.8.3-1 +- Update to 0.8.3 +- Make -data subpackage noarch + * Fri Nov 7 2008 Wart 0.8.2-1 - Update to 0.8.2 From 5eaa7b19e4228200901e553d151b45cad540fa60 Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Sun, 19 Jul 2009 20:09:29 +0000 Subject: [PATCH 5/7] Update to 0.8.4 --- .cvsignore | 2 +- sources | 2 +- wormux-0.8.3-cflags.patch | 11 +++++++++++ wormux.spec | 13 ++++++++++++- 4 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 wormux-0.8.3-cflags.patch 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-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 c480aea..c24e76b 100644 --- a/wormux.spec +++ b/wormux.spec @@ -1,5 +1,5 @@ Name: wormux -Version: 0.8.3 +Version: 0.8.4 Release: 1%{?dist} Summary: 2D convivial mass murder game @@ -7,12 +7,15 @@ 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 BuildRequires: SDL_ttf-devel SDL_net-devel curl-devel libpng-devel BuildRequires: gettext libxml++-devel desktop-file-utils Requires: wormux-data +Requires(post): coreutils +Requires(postun): coreutils %description Battle your favorite free software mascots in the Wormux arena. With big @@ -31,9 +34,11 @@ Data files for wormux %prep %setup -q +%patch0 -p1 # 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 @@ -77,6 +82,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 @@ -87,6 +94,10 @@ fi %{_datadir}/%{name} %changelog +* Wed Jul 18 2009 Wart 0.8.4-1 +- Update to 0.8.4 +- Build with $RPM_OPT_FLAGS. + * Wed May 6 2009 Wart 0.8.3-1 - Update to 0.8.3 - Make -data subpackage noarch From 8d0bbf8cd078964c67f0a91736690ba3ebf2d6cb Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:18:37 +0000 Subject: [PATCH 6/7] 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 cb756e9df1a7be39e301bdd037c1eb44232f926a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:25:26 +0000 Subject: [PATCH 7/7] 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 dc32377..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-10