- up to 2.02r2

- removed obsolete c++ patch, gcc3 patch replaced by new one for gcc 3.3

Changed files:
    xevil-c++.patch -> 1.2
    xevil-gcc3.patch -> 1.2
    xevil.spec -> 1.18

diff --git a/xevil-c++.patch b/xevil-c++.patch
deleted file mode 100644 (file)
index b9d1001..0000000
--- a/xevil-c++.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- xevil-2.02.orig/cmn/intel.cpp      Wed Jan 19 12:54:34 2000
-+++ xevil-2.02/cmn/intel.cpp   Mon Jul  2 20:44:30 2001
-@@ -1606,7 +1606,7 @@
- Boolean Machine::weapon_current_is_drop_liftable(PhysicalP p) {\r
-   // This is a HACK, we should really make Lifter override \r
-   // get_weapon_current(), etc.\r
--  char *dummy;\r
-+  const char *dummy;\r
-   ClassId classId = p->get_weapon_string(dummy);\r
-   if (classId == A_DropLiftable) {\r
-     return True;\r
---- xevil-2.02.orig/x11/ui.cpp Wed Jan 19 12:54:14 2000
-+++ xevil-2.02/x11/ui.cpp      Mon Jul  2 21:09:11 2001
-@@ -1322,7 +1322,7 @@
-       \r
-       // Get font.  Use user-specified font if given.\r
-       // regular size font.\r
--      char *theFont = fontName ? fontName : DEFAULT_FONT_NAME;\r
-+      const char *theFont = fontName ? fontName : DEFAULT_FONT_NAME;\r
-       xvars.font[xvars.dpyMax] = \r
-         XLoadQueryFont(xvars.dpy[xvars.dpyMax],theFont);\r
-       if (!xvars.font[xvars.dpyMax]) {\r

diff --git a/xevil-gcc3.patch b/xevil-gcc3.patch
index 21c2aa0c9dd6eb27827dbb0698666938f4d32ad8..017c8980405184d5ff27d29699167cffc150fc4b 100644 (file)
--- a/xevil-gcc3.patch
+++ b/xevil-gcc3.patch
@@ -1,42 +1,11 @@
---- xevil-2.02/cmn/locator.h.orig      Wed Jan 19 12:54:10 2000
-+++ xevil-2.02/cmn/locator.h   Sun Oct 13 12:06:18 2002
-@@ -48,6 +48,7 @@
- \r
- // Include Files\r
- #include <iostream.h>\r
-+#include <algo.h>\r
- \r
- #include "utils.h"\r
- #include "coord.h"\r
---- xevil-2.02/x11/panel.cpp.orig      Wed Jan 19 12:54:16 2000
-+++ xevil-2.02/x11/panel.cpp   Sun Oct 13 12:33:25 2002
-@@ -32,6 +32,7 @@
- #include <X11/keysym.h>\r
- }\r
- #include <strstream.h>\r
-+#include <iostream.h>\r
- \r
- #include "utils.h"\r
- #include "xdata.h"\r
---- xevil-2.02/x11/main.cpp.orig       Wed Jan 19 20:52:40 2000
-+++ xevil-2.02/x11/main.cpp    Sun Oct 13 12:35:05 2002
-@@ -64,7 +64,7 @@
- // main's job is very simple.\r
- // Create the Game, then run the outer loop, one iteration per turn.\r
- // Empty the event queue and feed it to Game every turn.\r
--void main(int argc, char **argv) {\r
-+int main(int argc, char **argv) {\r
-   Utils::seed_random();\r
- \r
-   GameP game = new Game(&argc,argv);\r
---- xevil-2.02/x11/serverping.cpp.orig Wed Jan 19 12:54:16 2000
-+++ xevil-2.02/x11/serverping.cpp      Sun Oct 13 12:35:52 2002
-@@ -31,7 +31,7 @@
- #include "neth.h"\r
- #include "id.h"\r
- #include <strstream.h>\r
--\r
-+#include <iostream.h>\r
- \r
- \r
- class ServerPing {\r
+--- xevil-2.02r2/cmn/physical.h.orig   2000-01-19 12:54:08.000000000 +0100
++++ xevil-2.02r2/cmn/physical.h        2003-06-30 22:00:04.000000000 +0200
+@@ -93,7 +93,7 @@
+    CLASSNAME::CLASSNAME(InStreamP in,const CLASSNAME ## Context &cx, \\r
+                          CLASSNAME ## Xdata &x_data, \\r
+                          WorldP w,LocatorP l) \\r
+-   : PARENT(in,cx. ## parent ## Context,x_data,w,l) \r
++   : PARENT(in,cx. parent ## Context,x_data,w,l) \r
+ \r
+ // Used by internal nodes and leaves.\r
+ #define DEFINE_UPDATE_FROM_STREAM(CLASSNAME,PARENT) \\r

diff --git a/xevil.spec b/xevil.spec
index 1c6b41ccd7acade758dae3dd5570e5eb9bdd270e..28b8b788f3d0ea56ed08dc8c9bb34b7aec97d8ae 100644 (file)
--- a/xevil.spec
+++ b/xevil.spec
@@ -9,23 +9,21 @@ Summary(pl):  Brutalna gra o szybkiej akcji pod X Window System
 Summary(sk):   Rýchla násilná hra pre X Window Systém
 Summary(tr):   Hýzlý ve þiddet yüklü bir X oyunu
 Name:          xevil
-Version:       2.02
-Release:       3
+Version:       2.02r2
+Release:       1
 License:       GPL
 Group:         X11/Applications/Games
 Source0:       http://www.xevil.com/download/stable/%{name}src%{version}.zip
-# Source0-md5: e1890f77144367e2e8bbf3609458b784
+# Source0-md5: 09a9ef720b7204b0be68c4f462def370
 Source1:       %{name}.desktop
 Source2:       %{name}.png
 Patch0:                %{name}-config.patch
-Patch1:                %{name}-c++.patch
-Patch2:                %{name}-gcc3.patch
-Patch3:                %{name}-const_float.patch
+Patch1:                %{name}-gcc3.patch
+Patch2:                %{name}-const_float.patch
 URL:           http://www.xevil.com/
-BuildRequires: unzip
 BuildRequires: XFree86-devel >= 4.0
 BuildRequires: libstdc++-devel
-BuildRequires: /usr/bin/compress
+BuildRequires: unzip
 Buildroot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _prefix         /usr/X11R6
@@ -78,10 +76,16 @@ Ninja sava
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
+
+# no <strstream.h> compat in gcc 3.3
+cat > cmn/strstream.h <<EOF
+#include <strstream>
+using namespace std;
+EOF
 
 %build
-%{__make} HOSTTYPE=i386 \
+%{__make} \
+       HOSTTYPE=i386 \
        DEBUG_OPT="%{rpmcflags} -fno-exceptions" \
        LINK_FLAGS="%{rpmldflags}"