- updated to 2.02, updated config patch

- added c++ patch with fixes for current C++

Changed files:
    xevil-c++.patch -> 1.1
    xevil-config.patch -> 1.2
    xevil.spec -> 1.2

diff --git a/xevil-c++.patch b/xevil-c++.patch
new file mode 100644 (file)
index 0000000..b9d1001
--- /dev/null
+++ b/xevil-c++.patch
@@ -0,0 +1,22 @@
+--- 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-config.patch b/xevil-config.patch
index 2b2ee2c05d83a0177fa7b5ad0efa6f184a7bc0a7..20661cd35eeae69114fc6855a622dad128f17a4f 100644 (file)
--- a/xevil-config.patch
+++ b/xevil-config.patch
@@ -1,28 +1,20 @@
---- xevil-1.5.orig/Makefile    Mon Jun  3 22:47:02 1996
-+++ xevil-1.5/Makefile Thu Jun  7 17:19:50 2001
-@@ -8,7 +8,7 @@
- #### Defines that are applicable to makes on all architectures
- SHELL         =       /bin/sh
- TARGETS               =       xevil #xshow
--DEBUG_OPT     =       -O #-g#  #-DPRINT_ERRORS  
-+DEBUG_OPT     =       -fno-for-scope $(OPTFLAGS)
- LINK_OPT      =       -O
- 
- #SRC_DIR and WORK_DIR are only used for `make workdir`
-@@ -124,7 +124,7 @@
- 
- 
- 
--i386-linux:
-+linux:
-       @$(MAKE) CC="g++" CFLAGS="-DUSE_RANDOM -DPROTECTED_IS_PUBLIC" \
- INCL_DIRS="" LIBS_DIRS="-L/usr/X11R6/lib" LIBS="-lX11 -lm" $(TARGETS)
- 
-@@ -163,7 +163,6 @@
- #### Executables
- xevil: $(OBJS)
-       $(CC) $(LINK_FLAGS) $(LINK_OPT) $(LIBS_DIRS) -o  xevil $(OBJS) $(LIBS)
--      $(STRIP) xevil
- 
- # This is a simple program to show a bitmap and mask with arbitrary foreground
- # and background colors.  I used it to test many of the bitmaps.  It is not
+--- xevil-2.02.orig/makefile   Wed Jan 19 13:08:50 2000
++++ xevil-2.02/makefile        Mon Jul  2 20:13:37 2001
+@@ -59,7 +59,6 @@
+       cd $(DEPTH)/cmn; $(MAKE)\r
+       cd $(DEPTH)/x11; $(MAKE)\r
+       $(CC) $(LINK_FLAGS) $(LINK_OPT) $(LIBS_DIRS) -o $(OBJ_DIR)/xevil $(ALL_OBJS) $(LIBS)\r
+-      $(STRIP) $(OBJ_DIR)/xevil\r
+ \r
+ # Could also include serverping in the distribution\r
+ $(OBJ_DIR)/xevil$(VERSION).$(PCKG_NAME).tar.Z::\r
+--- xevil-2.02.orig/config.mk  Wed Jan 19 14:19:04 2000
++++ xevil-2.02/config.mk       Mon Jul  2 21:55:29 2001
+@@ -231,7 +231,6 @@
+ i386:\r
+       @$(MAKE) CC="g++" \\r
+ CFLAGS="-DUSE_RANDOM -DXEVIL_KEYSET=UIlinux -DUSE_UINT_NET_LENGTH" \\r
+-LINK_FLAGS="-static" \\r
+ INCL_DIRS="-I/usr/X11R6/include" \\r
+ LIBS_DIRS="-L/usr/X11R6/lib" \\r
+ LIBS="-lXpm -lX11 -lm" \\r

diff --git a/xevil.spec b/xevil.spec
index 9e3c298c1fd271d0d9d237e6d25253c424ff7bb4..8534574933b1cfbf83b2a59bdae302bd45d522ea 100644 (file)
--- a/xevil.spec
+++ b/xevil.spec
@@ -1,14 +1,19 @@
 Summary:       A fast-action violent game for the X Window System
 Summary(pl):   Brutalna gra o szybkiej akcji pod X Window System
 Name:          xevil
-Version:       1.5
-Release:       13
+Version:       2.02
+Release:       1
 License:       GPL
 Group:         X11/Applications/Games
 Group(de):     X11/Applikationen/Spiele
 Group(pl):     X11/Aplikacje/Gry
-Source0:       ftp://ftp.x.org/contrib/games/%{name}%{version}/%{name}%{version}.tar.Z
+Source0:       ftp://ftp.xevil.com/stable/%{name}src%{version}.zip
 Patch0:                %{name}-config.patch
+Patch1:                %{name}-c++.patch
+URL:           http://www.xevil.com/
+BuildRequires: unzip
+BuildRequires: XFree86-devel >= 4.0
+BuildRequires: libstdc++-devel
 Buildroot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _prefix         /usr/X11R6
@@ -26,20 +31,23 @@ jest zabijanie wszystkiego w zasi
 poziomów. W xevil mo¿na graæ przeciwko komputerowi albo innym graczom.
 
 %prep
-%setup -q -c
-%patch -p1
+%setup -q -T -c
+
+unzip -q %{SOURCE0}
+
+%patch0 -p1
+%patch1 -p1
 
 %build
-%{__make} linux OPTFLAGS="%{rpmcflags}" LINK_OPT="%{rpmldflags}"
+%{__make} HOSTTYPE=i386 DEBUG_OPT="%{rpmcflags}" LINK_FLAGS="%{rpmldflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man6,%{_applnkdir}/Games}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_applnkdir}/Games}
 
-install xevil $RPM_BUILD_ROOT%{_bindir}
-install xevil.6 $RPM_BUILD_ROOT%{_mandir}/man6
+install x11/REDHAT_LINUX/xevil $RPM_BUILD_ROOT%{_bindir}
 
-gzip -9nf NOTES xevil*README
+gzip -9nf readme.txt
 
 cat > $RPM_BUILD_ROOT%{_applnkdir}/Games/xevil.desktop <<EOF
 # KDE Config File
@@ -56,7 +64,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc *.gz
+%doc *.gz instructions
 %attr(755,root,root) %{_bindir}/xevil
-%{_mandir}/man6/xevil.6*
 %{_applnkdir}/Games/*