rpms/blobAndConquer/devel .cvsignore, 1.8, 1.9 blobAndConquer.spec, 1.15, 1.16 sources, 1.8, 1.9

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/blobAndConquer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2482

Modified Files:
	.cvsignore blobAndConquer.spec sources 
Log Message:
* Thu Jun 26 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.96-1
- New upstream release 0.96



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/blobAndConquer/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	16 Jun 2008 13:16:28 -0000	1.8
+++ .cvsignore	29 Jun 2008 09:16:42 -0000	1.9
@@ -1 +1 @@
-blobAndConquer-0.95-1.tar.gz
+blobAndConquer-0.96-1.tar.gz


Index: blobAndConquer.spec
===================================================================
RCS file: /cvs/extras/rpms/blobAndConquer/devel/blobAndConquer.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- blobAndConquer.spec	16 Jun 2008 13:16:28 -0000	1.15
+++ blobAndConquer.spec	29 Jun 2008 09:16:42 -0000	1.16
@@ -6,7 +6,7 @@
 %define upstream_release 1
 
 Name:           blobAndConquer
-Version:        0.95
+Version:        0.96
 Release:        1%{?dist}
 Summary:        Blob Wars 2: Blob And Conquer
 Group:          Amusements/Games
@@ -37,26 +37,21 @@
 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
 
 
 %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
 
 desktop-file-install --vendor fedora --delete-original \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
@@ -84,15 +79,18 @@
 
 %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
+* Thu Jun 26 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.96-1
+- New upstream release 0.96
+
 * Mon Jun 16 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.95-1
 - New upstream release 0.95
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/blobAndConquer/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	16 Jun 2008 13:16:28 -0000	1.8
+++ sources	29 Jun 2008 09:16:42 -0000	1.9
@@ -1 +1 @@
-05ad224d14300a2b2e263326af8a3dd9  blobAndConquer-0.95-1.tar.gz
+0a2e8d9e1116d6885caf135ee2a992b3  blobAndConquer-0.96-1.tar.gz