diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 249fe9f..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -wormux-0.8.tar.bz2 diff --git a/Makefile b/Makefile deleted file mode 100644 index e98eb66..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 $$/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/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 c42464f..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -79400ddcb2e9fdfcd4145c62940a24d3 wormux-0.8.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 deleted file mode 100644 index 637f0be..0000000 --- a/wormux.spec +++ /dev/null @@ -1,132 +0,0 @@ -Name: wormux -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.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 libpng-devel -BuildRequires: gettext libxml++-devel desktop-file-utils -Requires: wormux-data - -%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. - - -%package data -Summary: Data files for wormux -Group: Amusements/Games -Requires: %{name} = %{version} -%description data -Data files for wormux - -%prep -%setup -q - - -%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 - -%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} -%{_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 -* 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