[egoboo/f17] Revert "The makefile patch no longer applies"
Bruno Wolff III
bruno at fedoraproject.org
Fri Apr 27 04:27:27 UTC 2012
commit 4d8ee5053229d8279d51e2ff7182439007b5bcbc
Author: Bruno Wolff III <bruno at wolff.to>
Date: Thu Apr 26 23:09:55 2012 -0500
Revert "The makefile patch no longer applies"
This reverts commit 12ccf7554f5de5b66dca0ab640fc62a99d94177e.
egoboo-2.7.5-unix.patch | 12 ++++++++++++
egoboo.spec | 2 ++
2 files changed, 14 insertions(+), 0 deletions(-)
---
diff --git a/egoboo-2.7.5-unix.patch b/egoboo-2.7.5-unix.patch
new file mode 100644
index 0000000..e20c2f4
--- /dev/null
+++ b/egoboo-2.7.5-unix.patch
@@ -0,0 +1,12 @@
+diff -ur orig/game/Makefile.unix egoboo-2.7.5/game/Makefile.unix
+--- orig/game/Makefile.unix 2008-01-01 22:35:35.000000000 +0100
++++ egoboo-2.7.5/game/Makefile.unix 2010-02-15 22:26:50.951732207 +0100
+@@ -18,7 +18,7 @@
+
+ CC := gcc
+ OPT := -Os
+-INC := -I. -I.. ${SDLCONF_I}
++INC := ${SDLCONF_I}
+ CFLAGS := ${OPT} ${INC}
+ LDFLAGS := ${SDLCONF_L} -lSDL_ttf -lSDL_mixer -lSDL_image -lGL -lGLU
+
diff --git a/egoboo.spec b/egoboo.spec
index 14d19c4..ceb96f4 100644
--- a/egoboo.spec
+++ b/egoboo.spec
@@ -8,6 +8,7 @@ URL: http://egoboo.sourceforge.net/
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Source1: %{name}.desktop
Source2: KNOWN-BUGS.txt
+Patch0: %{name}-2.7.5-unix.patch
Patch1: %{name}-2.4.3-opengl-wrapper.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL_mixer-devel SDL_ttf-devel SDL_image-devel enet-devel
@@ -24,6 +25,7 @@ dimension.
%prep
%setup -q
+%patch0 -p1
%patch1 -p1
cp -a %{SOURCE2} .
sed -i 's/\r//g' game/change.log game/Egoboodoc.txt
More information about the scm-commits
mailing list