rpms/fRaBs/devel frabs210-lisp-fixes.patch, NONE, 1.1 fRaBs.desktop, 1.3, 1.4 fRaBs.spec, 1.5, 1.6

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/fRaBs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24737

Modified Files:
	fRaBs.desktop fRaBs.spec 
Added Files:
	frabs210-lisp-fixes.patch 
Log Message:
* Tue Mar  4 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 2.11-1
- Sync with upstream 2.11 release (backport 2 small addon lisp fixes), but keep
  using the old tarbal as the new one contains a dos version, with dos
  exectuables, line-endings and various filename upper/lowercase mismatches.
- Update .desktop file for new 0.7.1 abuse release (binary name changed)


frabs210-lisp-fixes.patch:

--- NEW FILE frabs210-lisp-fixes.patch ---
--- frabs210_unix.src/addon/leon/leon.lsp	2002-01-23 18:34:07.000000000 +0100
+++ frabs210_unix.src/addon/leon/leon.lsp	2008-03-03 22:40:02.000000000 +0100
@@ -54,7 +54,7 @@
 (load "addon/leon/lisp/text.lsp")
 (load "addon/leon/lisp/nextlev3.lsp")
 (load "addon/leon/lisp/lnant.lsp")
-(load "addon/leon/lisp/lnisc.lsp")
+(load "addon/leon/lisp/lmisc.lsp")
 (load "addon/leon/lisp/grenade.lsp")
 (load "addon/leon/lisp/nguns.lsp")
 (load "addon/leon/lisp/rain.lsp")
diff -ur frabs210_unix.src/addon/twist/lisp/chars.lsp abuse-frabs-2.11/addon/twist/lisp/chars.lsp
--- frabs210_unix.src/addon/twist/lisp/chars.lsp	2002-01-23 18:34:07.000000000 +0100
+++ frabs210_unix.src/addon/twist/lisp/chars.lsp	2008-03-03 22:40:02.000000000 +0100
@@ -331,7 +331,7 @@
 	(damage_fun  guner_damage))
   (abilities (run_top_speed 12)
 	     (start_hp 60))
-  (flags (hurtable T) (can_block F))
+  (flags (hurtable T) (can_block (not T)))
   (range 300 100)
   (vars fire_delay burst_delay burst_total burst_wait burst_left 
 	max_xvel   max_yvel    smoke_time fire_time)


Index: fRaBs.desktop
===================================================================
RCS file: /cvs/extras/rpms/fRaBs/devel/fRaBs.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fRaBs.desktop	6 Aug 2007 12:00:51 -0000	1.3
+++ fRaBs.desktop	4 Mar 2008 09:41:17 -0000	1.4
@@ -1,8 +1,7 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=Abuse (fRaBs)
 Comment=Abuse with free datafiles
-Exec=abuse.sdl -fullscreen -datadir /usr/share/fRaBs
+Exec=abuse -fullscreen -datadir /usr/share/fRaBs
 Icon=fRaBs.png
 Terminal=false
 Type=Application


Index: fRaBs.spec
===================================================================
RCS file: /cvs/extras/rpms/fRaBs/devel/fRaBs.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fRaBs.spec	6 Aug 2007 12:00:51 -0000	1.5
+++ fRaBs.spec	4 Mar 2008 09:41:17 -0000	1.6
@@ -1,20 +1,23 @@
 %define _version 210
+# we need atleast ubuse-0.7.1 as with 0.7.1 abuse.sdl was renamed to abuse
+%define min_abuse_version 0.7.1
 
 Name:           fRaBs
-Version:        2.10
-Release:        3%{?dist}
+Version:        2.11
+Release:        1%{?dist}
 Group:          Amusements/Games
 License:        Public Domain
 Summary:        Free data files for abuse the game
-# upstream is no longer
-URL:            http://web.archive.org/web/20021208173222/http://www.cs.uidaho.edu/~cass0664/fRaBs/
+URL:            http://abuse.zoy.org/
+# we use an older version no longer available, see changelog for rationale
 Source0:        frabs%{_version}_unix.src.tar.bz2
 Source1:        %{name}.desktop
+Patch0:         frabs210-lisp-fixes.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ImageMagick desktop-file-utils
 BuildArch:      noarch
-Requires:       abuse hicolor-icon-theme
-Provides:       abuse-data
+Requires:       abuse >= %{min_abuse_version}, hicolor-icon-theme
+Provides:       abuse-data = %{min_abuse_version}
 Provides:       frabs = %{version}-%{release}
 
 %description
@@ -23,6 +26,7 @@
 
 %prep
 %setup -q -n frabs%{_version}_unix.src
+%patch0 -p1
 
 
 %build
@@ -73,6 +77,12 @@
 
 
 %changelog
+* Tue Mar  4 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 2.11-1
+- Sync with upstream 2.11 release (backport 2 small addon lisp fixes), but keep
+  using the old tarbal as the new one contains a dos version, with dos
+  exectuables, line-endings and various filename upper/lowercase mismatches.
+- Update .desktop file for new 0.7.1 abuse release (binary name changed)
+
 * Fri Aug  3 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.10-3
 - Fixup .desktop file categories for games-menus usage