rpms/blobAndConquer/F-8 .cvsignore, 1.6, 1.7 blobAndConquer.spec, 1.11, 1.12 sources, 1.6, 1.7

[Rafał Psota]

Author: rafalzaq

Update of /cvs/pkgs/rpms/blobAndConquer/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12327

Modified Files:
	.cvsignore blobAndConquer.spec sources 
Log Message:
update to 0.98 and remove nonfree sound files


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/blobAndConquer/F-8/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	12 Jun 2008 21:29:11 -0000	1.6
+++ .cvsignore	17 Sep 2008 12:51:27 -0000	1.7
@@ -1 +1,2 @@
-blobAndConquer-0.94-1.tar.gz
+blobAndConquer-0.98.tar.gz
+blobAndConquer-0.98-music.tar.bz2


Index: blobAndConquer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/blobAndConquer/F-8/blobAndConquer.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- blobAndConquer.spec	12 Jun 2008 21:29:11 -0000	1.11
+++ blobAndConquer.spec	17 Sep 2008 12:51:27 -0000	1.12
@@ -6,14 +6,16 @@
 %define upstream_release 1
 
 Name:           blobAndConquer
-Version:        0.94
+Version:        0.98
 Release:        1%{?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,32 +33,30 @@
 
 
 %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`
 sed -i 's/Exec=blobAndConquer/Exec=blobAndConquer-wrapper/' \
   icons/blobAndConquer.desktop
+sed -i 's/-o root -g games//g' makefile
 
+cp -p *.{xm,s3m,mod} music/
 
 %build
-# the long CXXFLAGS isn't pretty, but it really is the easiest way
-make CXXFLAGS='%{optflags} `sdl-config --cflags` -DVERSION=%{version} \
-  -DRELEASE=%{upstream_release} -DUSEPAK=0 -DDEV=0 -DPAKNAME=\"%{name}.pak\" \
-  -DPAKLOCATION=\"%{_datadir}/%{name}\" -DLOCALEDIR=\"%{_datadir}/locale\" \
-  -DGAMEPLAYMANUAL=\"%{_docdir}/%{name}-%{version}/index.html\"'
+make CFLAGS="$RPM_OPT_FLAGS" DOCDIR=%{_docdir}/%{name}-%{version}/ \
+  DATADIR=%{_datadir}/%{name}/ all buildpak
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
 make install DESTDIR=$RPM_BUILD_ROOT BINDIR=$RPM_BUILD_ROOT%{_bindir} \
+  DOCDIR=$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} \
   DATADIR=$RPM_BUILD_ROOT%{_datadir}/%{name} \
-  ICONDIR=$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
+  ICONDIR=$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/
 ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/%{name}-wrapper
-mkdir installed-docs
-mv $RPM_BUILD_ROOT%{_docdir}/%{name}/* installed-docs
+
+cp -p README.fedora-music $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
 desktop-file-install --vendor fedora --delete-original \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
@@ -84,15 +84,19 @@
 
 %files
 %defattr(-,root,root,-)
-%doc installed-docs/*
+%doc %{_docdir}/%{name}-%{version}
 %{_bindir}/%{name}*
 # the data/gameDefs/defines.h file is needed runtime and thus not a devel file!
 %{_datadir}/%{name}
 %{_datadir}/applications/fedora-%{name}.desktop
-%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+%{_datadir}/icons/hicolor/*/apps/%{name}.png
 
 
 %changelog
+* Wed Sep 17 2008 Rafał Psota <rafalzaq at gmail.com> 0.98-1
+- Remove nonfree sound files
+- Update to 0.98
+
 * Thu Jun 12 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.94-1
 - New upstream release 0.94
 - Drop all patches (all upstream now)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/blobAndConquer/F-8/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	12 Jun 2008 21:29:11 -0000	1.6
+++ sources	17 Sep 2008 12:51:27 -0000	1.7
@@ -1 +1,2 @@
-e8533f7aca9d6c786ef82a184a414535  blobAndConquer-0.94-1.tar.gz
+71a3726c15f0c5f9ed2c6910ef5a721e  blobAndConquer-0.98.tar.gz
+121f85f5a039d2a3fd1d6d3262c5137a  blobAndConquer-0.98-music.tar.bz2