rpms/blobwars/devel blobwars-1.09b2-makefile.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 blobwars.spec, 1.7, 1.8 sources, 1.4, 1.5

Rafał Psota rafalzaq at fedoraproject.org
Fri Aug 29 21:40:47 UTC 2008


Author: rafalzaq

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

Modified Files:
	.cvsignore blobwars.spec sources 
Added Files:
	blobwars-1.09b2-makefile.patch 
Log Message:
update to 1.09b2 and remove nonfree sound files

blobwars-1.09b2-makefile.patch:

--- NEW FILE blobwars-1.09b2-makefile.patch ---
--- makefile.orig	2008-02-29 19:07:01.000000000 +0100
+++ makefile	2008-08-29 20:30:32.000000000 +0200
@@ -8,8 +8,8 @@
 USEPAK = 1
 
 PREFIX=$(DESTDIR)/usr
-BINDIR = $(PREFIX)/games/
-DATADIR = $(PREFIX)/share/games/blobwars/
+BINDIR = $(PREFIX)/bin/
+DATADIR = $(PREFIX)/share/blobwars/
 DOCDIR = $(PREFIX)/share/doc/$(PROG)/
 ICONDIR = $(PREFIX)/share/icons/hicolor/
 DESKTOPDIR = $(PREFIX)/share/applications/
@@ -18,7 +18,7 @@
 CXXFLAGS += `sdl-config --cflags` -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DUSEPAK=$(USEPAK)
 CXXFLAGS += -DPAKNAME=\"$(PAKNAME)\" -DPAKLOCATION=\"$(DATADIR)\" -DUNIX -DGAMEPLAYMANUAL=\"$(DOCDIR)index.html\" -Wall
 CXXFLAGS += -DLOCALEDIR=\"$(LOCALEDIR)\"
-CXXFLAGS += $(CFLAGS) -pg -Werror
+CXXFLAGS += $(CFLAGS) -pg
 LIBS = `sdl-config --libs` -lSDL_mixer -lSDL_image -lSDL_ttf -lz
 
 OBJS += CAudio.o
@@ -105,13 +105,13 @@
 	mkdir -p $(ICONDIR)64x64/apps
 	mkdir -p $(DESKTOPDIR)
 
-	install -o root -g games -m 755 $(PROG) $(BINDIR)$(PROG)
-	install -o root -g games -m 644 $(PAKNAME) $(DATADIR)$(PAKNAME)
-	install -o root -g games -m 644 $(DOCS) $(DOCDIR)
-	cp $(ICONS)$(PROG).png $(ICONDIR)32x32/apps/
-	cp $(ICONS)$(PROG)-mini.png $(ICONDIR)16x16/apps/$(PROG).png
-	cp $(ICONS)$(PROG)-large.png $(ICONDIR)64x64/apps/$(PROG).png
-	cp $(ICONS)$(PROG).desktop $(DESKTOPDIR)
+	install -m 755 $(PROG) $(BINDIR)$(PROG)
+	install -m 644 $(PAKNAME) $(DATADIR)$(PAKNAME)
+	install -m 644 $(DOCS) $(DOCDIR)
+	cp -p $(ICONS)$(PROG).png $(ICONDIR)32x32/apps/
+	cp -p $(ICONS)$(PROG)-mini.png $(ICONDIR)16x16/apps/$(PROG).png
+	cp -p $(ICONS)$(PROG)-large.png $(ICONDIR)64x64/apps/$(PROG).png
+	cp -p $(ICONS)$(PROG).desktop $(DESKTOPDIR)
 
 	@for f in $(LOCALE_MO); do \
 		lang=`echo $$f | sed -e 's/^locale\///;s/\.mo$$//'`; \


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/blobwars/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	16 Sep 2007 09:56:43 -0000	1.4
+++ .cvsignore	29 Aug 2008 21:40:17 -0000	1.5
@@ -1 +1,2 @@
-blobwars-1.07-1.tar.gz
+blobwars-1.09b2.tar.bz2
+blobwars-1.09b2-music.tar.bz2


Index: blobwars.spec
===================================================================
RCS file: /cvs/pkgs/rpms/blobwars/devel/blobwars.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- blobwars.spec	19 Feb 2008 08:05:52 -0000	1.7
+++ blobwars.spec	29 Aug 2008 21:40:17 -0000	1.8
@@ -1,15 +1,17 @@
 Name:           blobwars
-Version:        1.07
-Release:        2%{?dist}
+Version:        1.09b2
+Release:        1%{?dist}
 Summary:        Mission and Objective based 2D Platform Game
 Group:          Amusements/Games
-License:        GPLv2+
+License:        GPLv2+ and Redistributable, no modification permitted
+#see README.fedora-music for details
 URL:            http://www.parallelrealities.co.uk/blobWars.php
-# no full URL as it gets downloaded through a php script, GRRR
-Source0:        %{name}-%{version}-1.tar.gz
-Patch0:         blobwars-1.05-debian.patch
+# no full URL as it gets downloaded through a php script, and nonfree sound files has been removed
+Source0:        %{name}-%{version}.tar.bz2
+Source1:        %{name}-%{version}-music.tar.bz2
+Patch0:         blobwars-1.09b2-makefile.patch
 Patch1:         blobwars-1.05-desktop.patch
-Patch2:         blobwars-1.07-es.patch
+#Patch2:         blobwars-1.07-es.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL_mixer-devel SDL_image-devel SDL_ttf-devel zlib-devel
 BuildRequires:  gettext desktop-file-utils
@@ -23,10 +25,12 @@
 
 
 %prep
-%setup -q
-%patch0 -p1 -z .debian
+%setup -q -a 1
+%patch0 -p0 -z .makefile
 %patch1 -p1 -z .dsktop
-%patch2 -p0
+#%patch2 -p0
+
+cp -p *{.xm,.s3m,.mod} music/
 
 
 %build
@@ -42,6 +46,7 @@
   --dir $RPM_BUILD_ROOT%{_datadir}/applications           \
   $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
+rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -62,7 +67,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc doc/*
+%doc doc/* README.fedora-music
 %{_bindir}/%{name}
 %{_datadir}/%{name}
 %{_datadir}/applications/fedora-%{name}.desktop
@@ -70,6 +75,9 @@
 
 
 %changelog
+* Fri Aug 29 2008 Rafał Psota <rafalzaq at gmail.com> 1.09b2-1
+- remove nonfree sounds and music
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.07-2
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/blobwars/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	16 Sep 2007 09:56:43 -0000	1.4
+++ sources	29 Aug 2008 21:40:17 -0000	1.5
@@ -1 +1,2 @@
-877d8075ce3f01557be35e7b1da11eec  blobwars-1.07-1.tar.gz
+30cc5ff2dc51e2e4ee4f48dfb6c7a1d1  blobwars-1.09b2.tar.bz2
+d01a343e3c18b817dc3f25224c6e66fb  blobwars-1.09b2-music.tar.bz2




More information about the fedora-extras-commits mailing list