rpms/blobwars/devel .cvsignore, 1.2, 1.3 blobwars-1.05-debian.patch, 1.1, 1.2 blobwars-1.05-desktop.patch, 1.1, 1.2 blobwars.spec, 1.2, 1.3 sources, 1.2, 1.3

Tue Apr 10 20:19:36 UTC 2007

Author: jwrdegoede

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

Modified Files:
	.cvsignore blobwars-1.05-debian.patch 
	blobwars-1.05-desktop.patch blobwars.spec sources 
Log Message:
* Tue Apr 10 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.06-1
- New upstream release 1.06-2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/blobwars/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

--- .cvsignore	7 Jun 2006 19:55:25 -0000	1.2
+++ .cvsignore	10 Apr 2007 20:19:00 -0000	1.3
@@ -1 +1 @@
-blobwars_1.05.orig.tar.gz
+blobwars-1.06-2.tar.gz

blobwars-1.05-debian.patch:

Index: blobwars-1.05-debian.patch
===================================================================
RCS file: /cvs/extras/rpms/blobwars/devel/blobwars-1.05-debian.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- blobwars-1.05-debian.patch	7 Jun 2006 19:55:25 -0000	1.1
+++ blobwars-1.05-debian.patch	10 Apr 2007 20:19:00 -0000	1.2
@@ -1,69 +1,25 @@
---- blobwars-1.05/src/CKeyboard.h.deb	2006-05-15 23:12:11.000000000 +0200
-+++ blobwars-1.05/src/CKeyboard.h	2006-05-15 23:12:20.000000000 +0200
-@@ -8,6 +8,6 @@
- 	
- 		Keyboard();
- 		void setDefaultKeys();
--		static char *Keyboard::translateKey(int value);
-+		static char *translateKey(int value);
- 
- };
---- blobwars-1.05/makefile.deb	2006-05-15 23:12:11.000000000 +0200
-+++ blobwars-1.05/makefile	2006-05-15 23:12:20.000000000 +0200
-@@ -10,12 +10,11 @@
+--- blobwars-1.06/makefile.debian	2007-04-06 18:16:35.000000000 +0200
++++ blobwars-1.06/makefile	2007-04-10 21:10:10.000000000 +0200
+@@ -9,8 +9,8 @@
  DEMO = 0
  
  PREFIX=$(DESTDIR)/usr
 -BINDIR = $(PREFIX)/games/
--DATADIR = $(PREFIX)/share/games/parallelrealities/
+-DATADIR = $(PREFIX)/share/games/blobwars/
 +BINDIR = $(PREFIX)/bin/
 +DATADIR = $(PREFIX)/share/blobwars/
  DOCDIR = $(PREFIX)/share/doc/$(PROG)/
--ICONDIR = $(PREFIX)/share/icons/
--KDE = $(PREFIX)/share/applnk/Games/Arcade/
--GNOME = $(PREFIX)/share/gnome/apps/Games/
-+ICONDIR = $(PREFIX)/share/icons/hicolor/
-+DESKTOPDIR = $(PREFIX)/share/applications/
- 
- CXXFLAGS += `sdl-config --cflags` -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DUSEPAK=$(USEPAK) -DDEMO=$(DEMO)
- CXXFLAGS += -DPAKNAME=\"$(PAKNAME)\" -DPAKLOCATION=\"$(DATADIR)\" -DUNIX -DGAMEPLAYMANUAL=\"$(DOCDIR)index.html\" -Wall
-@@ -51,7 +50,6 @@
- 
- mapeditor: $(MAPOBJS)
- 	$(CXX) $(LIBS) $(MAPOBJS) -o mapeditor
--	strip mapeditor
+ ICONDIR = $(PREFIX)/share/icons/hicolor/
+ DESKTOPDIR = $(PREFIX)/share/applications/
+@@ -78,9 +78,8 @@
+ 	mkdir -p $(ICONDIR)64x64/apps
+ 	mkdir -p $(DESKTOPDIR)
  
- # cleaning everything that can be automatically recreated with "make".
- clean:
-@@ -68,21 +66,17 @@
- 	mkdir -p $(BINDIR)
- 	mkdir -p $(DATADIR)
- 	mkdir -p $(DOCDIR)
--	mkdir -p $(ICONDIR)
--	mkdir -p $(ICONDIR)mini
--	mkdir -p $(ICONDIR)large
--	mkdir -p $(KDE)
--	mkdir -p $(GNOME)
-+	mkdir -p $(ICONDIR)16x16/apps
-+	mkdir -p $(ICONDIR)32x32/apps
-+	mkdir -p $(ICONDIR)64x64/apps
-+	mkdir -p $(DESKTOPDIR)
- 
--	strip $(PROG)
 -	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)
--	cp $(ICONS)$(PROG)-mini.png $(ICONDIR)mini/$(PROG).png
--	cp $(ICONS)$(PROG)-large.png $(ICONDIR)large/$(PROG).png
--	cp $(ICONS)$(PROG).desktop $(KDE)
--	cp $(ICONS)$(PROG).desktop $(GNOME)
 +	install -m 755 $(PROG) $(BINDIR)$(PROG)
 +	install -m 644 $(PAKNAME) $(DATADIR)$(PAKNAME)
-+	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)
- 
- uninstall:
- 	$(RM) $(BINDIR)$(PROG)
+ 	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

blobwars-1.05-desktop.patch:

Index: blobwars-1.05-desktop.patch
===================================================================
RCS file: /cvs/extras/rpms/blobwars/devel/blobwars-1.05-desktop.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- blobwars-1.05-desktop.patch	7 Jun 2006 19:55:25 -0000	1.1
+++ blobwars-1.05-desktop.patch	10 Apr 2007 20:19:00 -0000	1.2
@@ -1,13 +1,15 @@
---- blobwars-1.05/icons/blobwars.desktop.dsktop	2006-06-01 10:12:25.000000000 +0200
-+++ blobwars-1.05/icons/blobwars.desktop	2006-06-01 10:12:52.000000000 +0200
-@@ -2,8 +2,8 @@
+--- blobwars-1.06/icons/blobwars.desktop.dsktop	2007-04-06 18:16:35.000000000 +0200
++++ blobwars-1.06/icons/blobwars.desktop	2007-04-10 21:01:28.000000000 +0200
+@@ -1,9 +1,8 @@
+ [Desktop Entry]
  Encoding=UTF-8
- Categories=Application;Game;
- X-Desktop-File-Install-Version=1.0
+-Categories=Application;Game;
+-X-Desktop-File-Install-Version=1.0
 -Name=Metal Blob Solid
+-Icon=blobwars
++Categories=Game;ActionGame;
 +Name=Blob Wars: Metal Blob Solid
- Icon=blobwars.png
++Icon=blobwars.png
  Exec=blobwars
--Terminal=0
-+Terminal=false
+ Terminal=false
  Type=Application


Index: blobwars.spec
===================================================================
RCS file: /cvs/extras/rpms/blobwars/devel/blobwars.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- blobwars.spec	28 Aug 2006 05:12:56 -0000	1.2
+++ blobwars.spec	10 Apr 2007 20:19:00 -0000	1.3
@@ -1,16 +1,18 @@
 Name:           blobwars
-Version:        1.05
-Release:        3%{?dist}
+Version:        1.06
+Release:        1%{?dist}
 Summary:        Mission and Objective based 2D Platform Game
 Group:          Amusements/Games
 License:        GPL
 URL:            http://www.parallelrealities.co.uk/blobWars.php
-Source0:        ftp://ftp.debian.org/debian/pool/main/b/%{name}/%{name}_%{version}.orig.tar.gz
+# no full URL as it gets downloaded through a php script, GRRR
+Source0:        %{name}-%{version}-2.tar.gz
 Patch0:         blobwars-1.05-debian.patch
 Patch1:         blobwars-1.05-desktop.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL_mixer-devel SDL_image-devel SDL_ttf-devel zlib-devel
 BuildRequires:  desktop-file-utils
+Requires:       hicolor-icon-theme
 
 %description
 Blob Wars : Metal Blob Solid. This is Episode I of the Blob Wars Saga.
@@ -33,9 +35,9 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+%find_lang %{name}
 desktop-file-install --vendor fedora --delete-original    \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications           \
-  --add-category X-Fedora                                 \
   $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 
@@ -45,18 +47,14 @@
 
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 %postun
 touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc doc/*
 %{_bindir}/%{name}
@@ -66,13 +64,16 @@
 
 
 %changelog
+* Tue Apr 10 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.06-1
+- New upstream release 1.06-2
+
 * Mon Aug 28 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.05-3
 - FE6 Rebuild
 
 * Thu Jun  1 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.05-2
 - remove extreanous BR SDL-devel and ImageMagick
-- remove extreanous "export" in %build section
-- remove extreanous "-n %{name}-%{version}" under %setup
+- remove extreanous "export" in %%build section
+- remove extreanous "-n %%{name}-%%{version}" under %%setup
 - cleanup .desktop file
 
 * Sun May 14 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.05-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/blobwars/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Jun 2006 19:55:25 -0000	1.2
+++ sources	10 Apr 2007 20:19:00 -0000	1.3
@@ -1 +1 @@
-72b259abb6ec83a77f3c76052de24e50  blobwars_1.05.orig.tar.gz
+f50002a3a2d5daae090c882d2ccf41d1  blobwars-1.06-2.tar.gz


