rpms/blobAndConquer/devel .cvsignore, 1.10, 1.11 blobAndConquer.spec, 1.17, 1.18 sources, 1.10, 1.11

[Rafał Psota]

Author: rafalzaq

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

Modified Files:
	.cvsignore blobAndConquer.spec sources 
Log Message:
remove nonfree sound files


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/blobAndConquer/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	9 Jul 2008 07:37:49 -0000	1.10
+++ .cvsignore	17 Sep 2008 12:44:05 -0000	1.11
@@ -1 +1,2 @@
-blobAndConquer-0.98-1.tar.gz
+blobAndConquer-0.98.tar.gz
+blobAndConquer-0.98-music.tar.bz2


Index: blobAndConquer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/blobAndConquer/devel/blobAndConquer.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- blobAndConquer.spec	9 Jul 2008 07:37:49 -0000	1.17
+++ blobAndConquer.spec	17 Sep 2008 12:44:05 -0000	1.18
@@ -7,13 +7,15 @@
 
 Name:           blobAndConquer
 Version:        0.98
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Blob Wars 2: Blob And Conquer
 Group:          Amusements/Games
-License:        GPLv2+
+License:        GPLv2+ and Redistributable, no modification permitted
 URL:            http://www.parallelrealities.co.uk/blobAndConquer.php
 # Non rpm compatible URL: http://www.parallelrealities.co.uk/download.php?file=blobAndConquer-%{version}-%{upstream_release}.tar.gz&type=zip
-Source0:        %{name}-%{version}-%{upstream_release}.tar.gz
+#Tarball without nonfree sound file
+Source0:        %{name}-%{version}.tar.gz
+Source1:        %{name}-%{version}-music.tar.bz2
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:  SDL_image-devel SDL_mixer-devel SDL_ttf-devel zlib-devel
 BuildRequires:  desktop-file-utils
@@ -31,7 +33,7 @@
 
 
 %prep
-%setup -q
+%setup -q -a 1
 # some cleanup
 chmod -x gfx/rw2/*.raw data/gameDefs/defines.h `find src -type f`
 sed -i 's/\r//g' data/gameDefs/defines.h `find src -type f`
@@ -39,6 +41,7 @@
   icons/blobAndConquer.desktop
 sed -i 's/-o root -g games//g' makefile
 
+cp -p *.{xm,s3m,mod} music/
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS" DOCDIR=%{_docdir}/%{name}-%{version}/ \
@@ -53,6 +56,8 @@
   ICONDIR=$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/
 ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/%{name}-wrapper
 
+cp -p README.fedora-music $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+
 desktop-file-install --vendor fedora --delete-original \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   --add-category ActionGame \
@@ -88,6 +93,8 @@
 
 
 %changelog
+* Wed Sep 17 2008 Rafał Psota <rafalzaq at gmail.com> 0.98-2
+- Remove nonfree sound files
 * Wed Jul  9 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.98-1
 - New upstream release 0.98
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/blobAndConquer/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	9 Jul 2008 07:37:49 -0000	1.10
+++ sources	17 Sep 2008 12:44:05 -0000	1.11
@@ -1 +1,2 @@
-3eb2b8088effea3aa07153695ad8f8f7  blobAndConquer-0.98-1.tar.gz
+71a3726c15f0c5f9ed2c6910ef5a721e  blobAndConquer-0.98.tar.gz
+121f85f5a039d2a3fd1d6d3262c5137a  blobAndConquer-0.98-music.tar.bz2