rpms/blobwars/devel blobwars-1.05-debian.patch, NONE, 1.1 blobwars-1.05-desktop.patch, NONE, 1.1 blobwars.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Wed Jun 7 19:55:25 UTC 2006
Author: jwrdegoede
Update of /cvs/extras/rpms/blobwars/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24750/devel
Modified Files:
.cvsignore sources
Added Files:
blobwars-1.05-debian.patch blobwars-1.05-desktop.patch
blobwars.spec
Log Message:
auto-import blobwars-1.05-2 on branch devel from blobwars-1.05-2.src.rpm
blobwars-1.05-debian.patch:
--- NEW FILE blobwars-1.05-debian.patch ---
--- 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 @@
DEMO = 0
PREFIX=$(DESTDIR)/usr
-BINDIR = $(PREFIX)/games/
-DATADIR = $(PREFIX)/share/games/parallelrealities/
+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
# 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)
blobwars-1.05-desktop.patch:
--- NEW FILE blobwars-1.05-desktop.patch ---
--- 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 @@
Encoding=UTF-8
Categories=Application;Game;
X-Desktop-File-Install-Version=1.0
-Name=Metal Blob Solid
+Name=Blob Wars: Metal Blob Solid
Icon=blobwars.png
Exec=blobwars
-Terminal=0
+Terminal=false
Type=Application
--- NEW FILE blobwars.spec ---
Name: blobwars
Version: 1.05
Release: 2%{?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
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
%description
Blob Wars : Metal Blob Solid. This is Episode I of the Blob Wars Saga.
You must undertake the role of fearless Blob solider, Bob, as he infiltrates
various enemy installations and hideouts in an attempt to rescue as many
MIAs as possible.
%prep
%setup -q
%patch0 -p1 -z .debian
%patch1 -p1 -z .dsktop
%build
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \
DOCDIR=%{_docdir}/%{name}-%{version}/
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
desktop-file-install --vendor fedora --delete-original \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
--add-category X-Fedora \
$RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
%clean
rm -rf $RPM_BUILD_ROOT
%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
%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
%files
%defattr(-,root,root,-)
%doc doc/*
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}.png
%changelog
* 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
- cleanup .desktop file
* Sun May 14 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.05-1
- initial Fedora Extras package
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/blobwars/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 7 Jun 2006 19:50:54 -0000 1.1
+++ .cvsignore 7 Jun 2006 19:55:25 -0000 1.2
@@ -0,0 +1 @@
+blobwars_1.05.orig.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/blobwars/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 7 Jun 2006 19:50:54 -0000 1.1
+++ sources 7 Jun 2006 19:55:25 -0000 1.2
@@ -0,0 +1 @@
+72b259abb6ec83a77f3c76052de24e50 blobwars_1.05.orig.tar.gz
More information about the fedora-extras-commits
mailing list