Compare commits
7 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
cb756e9df1 | ||
|
8d0bbf8cd0 | ||
|
5eaa7b19e4 | ||
|
|
a51ed3b2de | ||
|
|
8da3fc07f1 | ||
|
|
b5f862d1cd | ||
|
52addad9e8 |
8 changed files with 35 additions and 150 deletions
|
|
@ -1 +0,0 @@
|
|||
wormux-0.8.tar.bz2
|
||||
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
|
|
@ -0,0 +1 @@
|
|||
wormux-0.8.4.tar.bz2
|
||||
21
Makefile
21
Makefile
|
|
@ -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)
|
||||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
79400ddcb2e9fdfcd4145c62940a24d3 wormux-0.8.tar.bz2
|
||||
0aed316799723173f2d6e242af312382 wormux-0.8.4.tar.bz2
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
@ -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 <bits/stl_algo.h>
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
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 <sstream>
|
||||
+#include <typeinfo>
|
||||
|
||||
#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 <sstream>
|
||||
+#include <typeinfo>
|
||||
#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 <algorithm>
|
||||
+#include <functional>
|
||||
#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 <sstream>
|
||||
#include <iostream>
|
||||
+#include <algorithm>
|
||||
+#include <functional>
|
||||
#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 <algorithm>
|
||||
+#include <functional>
|
||||
#include "maps_list.h"
|
||||
#include "map.h"
|
||||
#include "../game/config.h"
|
||||
11
wormux-0.8.3-cflags.patch
Normal file
11
wormux-0.8.3-cflags.patch
Normal file
|
|
@ -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"
|
||||
|
||||
23
wormux.spec
23
wormux.spec
|
|
@ -1,5 +1,5 @@
|
|||
Name: wormux
|
||||
Version: 0.8
|
||||
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
|
||||
|
|
@ -25,12 +28,17 @@ 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
|
||||
%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
|
||||
|
|
@ -74,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
|
||||
|
|
@ -84,6 +94,17 @@ fi
|
|||
%{_datadir}/%{name}
|
||||
|
||||
%changelog
|
||||
* Wed Jul 18 2009 Wart <wart@kobold.org> 0.8.4-1
|
||||
- Update to 0.8.4
|
||||
- Build with $RPM_OPT_FLAGS.
|
||||
|
||||
* Wed May 6 2009 Wart <wart@kobold.org> 0.8.3-1
|
||||
- Update to 0.8.3
|
||||
- Make -data subpackage noarch
|
||||
|
||||
* Fri Nov 7 2008 Wart <wart@kobold.org> 0.8.2-1
|
||||
- Update to 0.8.2
|
||||
|
||||
* Thu May 29 2008 Wart <wart@kobold.org> 0.8-1
|
||||
- Update to 0.8
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue