rpms/asylum/devel asylum-0.2.4-makefile.patch, NONE, 1.1 asylum.spec, 1.7, 1.8 asylum-0.2.2-makefile.patch, 1.1, NONE

[Tom Callaway]

Author: spot

Update of /cvs/pkgs/rpms/asylum/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8221

Modified Files:
	asylum.spec 
Added Files:
	asylum-0.2.4-makefile.patch 
Removed Files:
	asylum-0.2.2-makefile.patch 
Log Message:
fix makefile patch

asylum-0.2.4-makefile.patch:

--- NEW FILE asylum-0.2.4-makefile.patch ---
diff -up asylum-0.2.4/Makefile.BAD asylum-0.2.4/Makefile
--- asylum-0.2.4/Makefile.BAD	2008-09-26 17:44:11.000000000 -0400
+++ asylum-0.2.4/Makefile	2008-09-26 17:45:07.000000000 -0400
@@ -4,7 +4,8 @@ HOST=generic
 
 CC=g++
 RM=rm
-CFLAGS= -O3 -funsigned-char \
+RPMFLAGS =
+CFLAGS= $(RPMFLAGS) -funsigned-char \
 	-DRESOURCEPATH=\"$(INSTALLRESOURCEPATH)\" \
 	-DSCOREPATH=\"$(INSTALLHISCORES)\"
 LIBS= -lm -lSDL -lSDL_mixer
@@ -44,8 +45,8 @@ ifeq ($(HOST),mingw)
 	LIBS=-lm -lmingw32 -lSDL_mixer -lSDLmain -lSDL -mwindows
 endif
 ifeq ($(HOST),generic)
-	INSTALLBIN=/usr/games/asylum
-	INSTALLRESOURCEPATH=/usr/share/games/asylum
+	INSTALLBIN=/usr/bin/asylum
+	INSTALLRESOURCEPATH=/usr/share/asylum
 	INSTALLHISCORES=/var/games/asylum
 endif
 


Index: asylum.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asylum/devel/asylum.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- asylum.spec	29 Aug 2008 03:51:15 -0000	1.7
+++ asylum.spec	26 Sep 2008 22:00:35 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           asylum
 Version:        0.2.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        SDL port of the game Asylum, originally for the Archimedes
 Group:          Amusements/Games
 # For detailed licensing, see the README
@@ -8,7 +8,7 @@
 URL:            http://sdl-asylum.sourceforge.net
 Source0:        http://downloads.sourceforge.net/sdl-%{name}/%{name}-%{version}.tar.gz
 Source1:        %{name}.png
-Patch:          asylum-0.2.2-makefile.patch
+Patch:          asylum-0.2.4-makefile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  desktop-file-utils
 BuildRequires:  SDL_mixer-devel
@@ -105,6 +105,9 @@
 
 
 %changelog
+* Fri Sep 26 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.2.4-3
+- fix makefile patch to apply properly
+
 * Fri Aug 29 2008 Michael Fleming <mfleming+rpm at enlartenment.com> - 0.2.4-2
 - New builders don't like Patch0 declaration, adjust make it happy
 


--- asylum-0.2.2-makefile.patch DELETED ---