From 090ddb4291b639e41004af94e504d5c2b6f1fc2d Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 15 Apr 2009 05:30:36 +0000 Subject: [PATCH 1/6] Initialize branch F-11 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..25c7708 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-11 From d862a5f66bc7166d8a1621381e5156b44c7c4528 Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Thu, 7 May 2009 15:45:56 +0000 Subject: [PATCH 2/6] Update to 0.8.3; make -data subpackage noarch --- .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 c9a022d21fc2dfcbf67973ad39c22c4f3de9fe63 Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Sun, 19 Jul 2009 02:46:10 +0000 Subject: [PATCH 3/6] Update to 0.8.4; Build with $RPM_OPT_FLAGS. --- .cvsignore | 2 +- sources | 2 +- wormux.spec | 11 ++++++++++- 3 files changed, 12 insertions(+), 3 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 71121a6..e8af3fe 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,6 +7,7 @@ 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,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 @@ -82,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 @@ -92,6 +97,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 666e9b2d86e735bfecb9a0aa7a5aa9c6e4991372 Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Sun, 19 Jul 2009 03:00:06 +0000 Subject: [PATCH 4/6] Add patch for $RPM_OPT_FLAGS --- wormux-0.8.3-cflags.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) 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" + From 574dd814c1340425e24b6f62d09dc904c08a1070 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:18:37 +0000 Subject: [PATCH 5/6] 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 2dbe3023262e1c0f10223f66c256b55ecec950f7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:25:29 +0000 Subject: [PATCH 6/6] 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 25c7708..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-11