Author: lisu Date: Wed Nov 23 21:53:36 2011 GMT Module: packages Tag: HEAD ---- Log message: - uodated to 0.93
---- Files affected: packages/edgar: edgar-makefile.patch (1.9 -> 1.10) , edgar.spec (1.44 -> 1.45) ---- Diffs: ================================================================ Index: packages/edgar/edgar-makefile.patch diff -u packages/edgar/edgar-makefile.patch:1.9 packages/edgar/edgar-makefile.patch:1.10 --- packages/edgar/edgar-makefile.patch:1.9 Fri May 20 21:35:10 2011 +++ packages/edgar/edgar-makefile.patch Wed Nov 23 22:53:31 2011 @@ -1,6 +1,6 @@ ---- edgar-0.85/makefile.orig 2011-05-16 22:00:04.000000000 +0200 -+++ edgar-0.85/makefile 2011-05-20 21:09:49.046666675 +0200 -@@ -24,7 +24,7 @@ +--- edgar-0.93/makefile.orig 2011-09-09 18:59:03.000000000 +0200 ++++ edgar-0.93/makefile 2011-11-23 22:50:49.474026241 +0100 +@@ -22,7 +22,7 @@ CXX = gcc PREFIX = $(DESTDIR)/usr @@ -9,22 +9,22 @@ DOC_DIR = $(PREFIX)/share/doc/$(PROG)/ ICON_DIR = $(PREFIX)/share/icons/hicolor/ DESKTOP_DIR = $(PREFIX)/share/applications/ -@@ -37,13 +37,7 @@ +@@ -35,13 +35,8 @@ DATA_DIR = $(PREFIX)/share/games/edgar/ endif -ifeq ($(DEV),1) --CFLAGS = -Wall -g -pedantic -Werror -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DDEV=$(DEV) -DINSTALL_PATH=\"$(DATA_DIR)\" -DLOCALE_DIR=\"$(LOCALE_DIR)\" -DPAK_FILE=\"$(PAK_FILE)\" -DMEDAL_SERVER_HOST=\"$(MEDAL_SERVER_HOST)\" -DMEDAL_SERVER_PORT=$(MEDAL_SERVER_PORT) --#CFLAGS = -Wall -O2 -pedantic -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DDEV=$(DEV) -DINSTALL_PATH=\"$(DATA_DIR)\" -DLOCALE_DIR=\"$(LOCALE_DIR)\" -DPAK_FILE=\"$(PAK_FILE)\" -DMEDAL_SERVER_HOST=\"$(MEDAL_SERVER_HOST)\" -DMEDAL_SERVER_PORT=$(MEDAL_SERVER_PORT) +-CFLAGS = -Wall -g -pedantic -Werror -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DDEV=$(DEV) -DINSTALL_PATH=\"$(DATA_DIR)\" -DLOCALE_DIR=\"$(LOCALE_DIR)\" -DPAK_FILE=\"$(PAK_FILE)\" +-#CFLAGS = -Wall -O2 -pedantic -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DDEV=$(DEV) -DINSTALL_PATH=\"$(DATA_DIR)\" -DLOCALE_DIR=\"$(LOCALE_DIR)\" -DPAK_FILE=\"$(PAK_FILE)\" -else --CFLAGS = -Wall -O2 -pedantic -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DDEV=$(DEV) -DINSTALL_PATH=\"$(DATA_DIR)\" -DLOCALE_DIR=\"$(LOCALE_DIR)\" -DPAK_FILE=\"$(PAK_FILE)\" -DMEDAL_SERVER_HOST=\"$(MEDAL_SERVER_HOST)\" -DMEDAL_SERVER_PORT=$(MEDAL_SERVER_PORT) --#CFLAGS = -Wall -Os -pedantic -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DDEV=$(DEV) -DINSTALL_PATH=\"$(DATA_DIR)\" -DLOCALE_DIR=\"$(LOCALE_DIR)\" -DPAK_FILE=\"$(PAK_FILE)\" -DMEDAL_SERVER_HOST=\"$(MEDAL_SERVER_HOST)\" -DMEDAL_SERVER_PORT=$(MEDAL_SERVER_PORT) +-CFLAGS = -Wall -O2 -pedantic -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DDEV=$(DEV) -DINSTALL_PATH=\"$(DATA_DIR)\" -DLOCALE_DIR=\"$(LOCALE_DIR)\" -DPAK_FILE=\"$(PAK_FILE)\" ++CFLAGS = $(OPTFLAGS) -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DDEV=$(DEV) -DINSTALL_PATH=\"$(DATA_DIR)\" -DLOCALE_DIR=\"$(LOCALE_DIR)\" -DPAK_FILE=\"$(PAK_FILE)\" + #CFLAGS = -Wall -Os -pedantic -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DDEV=$(DEV) -DINSTALL_PATH=\"$(DATA_DIR)\" -DLOCALE_DIR=\"$(LOCALE_DIR)\" -DPAK_FILE=\"$(PAK_FILE)\" -endif -+CFLAGS = $(OPTFLAGS) -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DDEV=$(DEV) -DINSTALL_PATH=\"$(DATA_DIR)\" -DLOCALE_DIR=\"$(LOCALE_DIR)\" -DPAK_FILE=\"$(PAK_FILE)\" -DMEDAL_SERVER_HOST=\"$(MEDAL_SERVER_HOST)\" -DMEDAL_SERVER_PORT=$(MEDAL_SERVER_PORT) ifeq ($(OS),Windows_NT) - LFLAGS = `sdl-config --libs` -lSDL -lSDL_image -lSDL_mixer -lSDL_ttf -lSDL_net -lz -llibintl -lm -@@ -102,7 +96,7 @@ + LFLAGS = `sdl-config --libs` -lSDL -lSDL_image -lSDL_mixer -lSDL_ttf -lSDL_net -lz -lintl -lm +@@ -101,7 +96,7 @@ all : $(PROG) makefile.dep $(ED_PROG) $(PAK_PROG) $(LOCALE_MO) $(PO_PROG) makefile.dep : src/*/*.h src/*.h @@ -33,7 +33,7 @@ # compiling other source files. %.o: -@@ -113,23 +107,23 @@ +@@ -112,23 +107,23 @@ # linking the program. $(PROG): $(MAIN_OBJS) $(CORE_OBJS) ================================================================ Index: packages/edgar/edgar.spec diff -u packages/edgar/edgar.spec:1.44 packages/edgar/edgar.spec:1.45 --- packages/edgar/edgar.spec:1.44 Tue Jul 19 21:49:01 2011 +++ packages/edgar/edgar.spec Wed Nov 23 22:53:31 2011 @@ -2,18 +2,18 @@ Summary: 2D Platform game Summary(pl.UTF-8): Dwuwymiarowa gra platformowa Name: edgar -Version: 0.92 +Version: 0.93 Release: 1 License: GPL v2+ Group: X11/Applications/Games -Source0: http://www.parallelrealities.co.uk/download/edgar/%{name}-%{version}-1.tar.gz -# Source0-md5: fbba28cb4dad93d2971161876c81126b +Source0: http://downloads.sourceforge.net/legendofedgar/%{name}-%{version}-1.tar.gz +# Source0-md5: f3fbb2b075696c3ff7751738bb74469c Source1: %{name}.png Patch0: %{name}-makefile.patch Patch1: %{name}-useless_files.patch Patch2: %{name}-desktop.patch Patch3: %{name}-link.patch -URL: http://www.parallelrealities.co.uk/projects/edgar.php +URL: http://www.parallelrealities.co.uk/p/legend-of-edgar.html BuildRequires: SDL_image-devel BuildRequires: SDL_mixer-devel BuildRequires: SDL_net-devel @@ -75,6 +75,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.45 2011/11/23 21:53:31 lisu +- uodated to 0.93 + Revision 1.44 2011/07/19 19:49:01 lisu - updated to 0.92 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/edgar/edgar-makefile.patch?r1=1.9&r2=1.10&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/edgar/edgar.spec?r1=1.44&r2=1.45&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
