[egoboo] Change main Makefile to not use enet

Bruno Wolff III bruno at fedoraproject.org
Tue Mar 13 02:50:20 UTC 2012


commit 085301c3ca08b42522dc9947f491dc6f07f92bf2
Author: Bruno Wolff III <bruno at wolff.to>
Date:   Sun Mar 11 12:50:45 2012 -0500

    Change main Makefile to not use enet

 egoboo-noenet.patch |   27 +++++++++++++++++++++++++++
 egoboo.spec         |    2 ++
 2 files changed, 29 insertions(+), 0 deletions(-)
---
diff --git a/egoboo-noenet.patch b/egoboo-noenet.patch
new file mode 100644
index 0000000..c0f9a5d
--- /dev/null
+++ b/egoboo-noenet.patch
@@ -0,0 +1,27 @@
+--- src/Makefile.orig	2012-03-11 12:48:17.135715153 -0500
++++ src/Makefile	2012-03-11 12:48:52.373193658 -0500
+@@ -14,21 +14,15 @@
+ 
+ .PHONY: all clean
+ 
+-all: enet egoboo
++all: egoboo
+ 
+ clean:
+-	make -C ./enet clean
+ 	make -C ./game clean
+ 
+-./enet/lib/libenet.a:
+-	make -C ./enet all
+-
+-enet:   ./enet/lib/libenet.a
+-
+-egoboo: enet
++egoboo:
+ 	make -C ./game all PREFIX=$(PREFIX) PROJ_NAME=$(PROJ_NAME)
+ 	
+-egoboo_lua: enet
++egoboo_lua:
+ 	make -F Makefile.lua -C game all PREFIX=$(PREFIX) PROJ_NAME=$(PROJ_NAME)
+ 
+ install: egoboo
diff --git a/egoboo.spec b/egoboo.spec
index a4c2903..9e72124 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
 Patch0:         egoboo-opts.patch
+Patch1:         egoboo-noenet.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL_mixer-devel SDL_ttf-devel SDL_image-devel enet-devel
 BuildRequires:  desktop-file-utils
@@ -24,6 +25,7 @@ dimension.
 %prep
 %setup -q
 %patch0 -b .opts
+%patch1 -b .noenet
 
 %build
 make -C src/game


More information about the scm-commits mailing list