From da088c6f26844c9fee8684d7e58065fb279a186c Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 17 Feb 2010 03:27:48 +0000 Subject: [PATCH 1/4] Initialize branch F-13 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..baa94ef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-13 From adde6cd48009ed0e3c17f3230c025d11777624d3 Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Sun, 11 Apr 2010 02:06:25 +0000 Subject: [PATCH 2/4] - Update to 0.9.1 - Add french description --- .cvsignore | 2 +- sources | 2 +- wormux.spec | 30 ++++++++++++++++++++++++++---- 3 files changed, 28 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 6328240..c746d74 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wormux-0.9.0.tar.bz2 +wormux-0.9.1.tar.bz2 diff --git a/sources b/sources index 564fa4e..ad245eb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -001b4979c53ffcf4c45715cad4f8bc85 wormux-0.9.0.tar.bz2 +97b039570f345aff84ac07718f57e44a wormux-0.9.1.tar.bz2 diff --git a/wormux.spec b/wormux.spec index 3f4a95c..d7cb6b4 100644 --- a/wormux.spec +++ b/wormux.spec @@ -1,5 +1,5 @@ Name: wormux -Version: 0.9.0 +Version: 0.9.1 Release: 1%{?dist} Summary: 2D convivial mass murder game @@ -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,13 +38,26 @@ BuildArch: noarch %description data Data files for wormux +%description -l fr data +Fichier de données pour 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~ +# Remove backup files +rm -f data/map/hive/config.xml.~1~ +rm -f data/map/randomisland/config.xml.~1~ +rm -f data/map/pillars/config.xml.~1~ +rm -f data/map/paradis/config.xml.~1~ +rm -f data/map/tic-tac-toe/config.xml.~1~ +rm -f data/map/randomamoebas/config.xml.~1~ +rm -f data/game_mode/skin_viewer.xml.~1~ +rm -f data/game_mode/classic.xml.~2~ +rm -f data/game_mode/unlimited.xml.~1~ +rm -f data/game_mode/blitz.xml.~1~ +rm -f data/game_mode/classic.xml.~1~ + %build %configure --disable-nls --disable-dependency-tracking @@ -96,6 +115,9 @@ fi %{_datadir}/%{name} %changelog +* Sat Mar 19 2010 Jonathan MERCIER 0.9.1-1 +- Update to 0.9.1 + * Sat Feb 6 2010 Wart 0.9.0-1 - Update to 0.9.0 From bb48aa9683f36a4657dee6faf0aae2bbca9957ba Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:25:22 +0000 Subject: [PATCH 3/4] 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 baa94ef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-13 From 81b5804571293f465eddffe8fb8b8b8e12239b58 Mon Sep 17 00:00:00 2001 From: wart Date: Mon, 13 Sep 2010 15:46:14 -0700 Subject: [PATCH 4/4] Update to 0.9.2.1 --- .gitignore | 1 + sources | 1 + wormux.spec | 5 ++++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index c746d74..6e5a6cf 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ wormux-0.9.1.tar.bz2 +/wormux-0.9.2.1.tar.bz2 diff --git a/sources b/sources index ad245eb..1b9e2da 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 97b039570f345aff84ac07718f57e44a wormux-0.9.1.tar.bz2 +e49621b9b4ac7c8d1b11657989df61db wormux-0.9.2.1.tar.bz2 diff --git a/wormux.spec b/wormux.spec index d7cb6b4..2c53b1c 100644 --- a/wormux.spec +++ b/wormux.spec @@ -1,5 +1,5 @@ Name: wormux -Version: 0.9.1 +Version: 0.9.2.1 Release: 1%{?dist} Summary: 2D convivial mass murder game @@ -115,6 +115,9 @@ 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 Mar 19 2010 Jonathan MERCIER 0.9.1-1 - Update to 0.9.1