rpms/xblast/FC-6 xblast-2.10.4-manpage.patch, NONE, 1.1 xblast-2.10.4-sdl-fixes.patch, NONE, 1.1 xblast.desktop, NONE, 1.1 xblast.png, NONE, 1.1 xblast.sh, NONE, 1.1 xblast.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Hans de Goede (jwrdegoede) fedora-extras-commits at redhat.com
Sun Mar 4 10:30:46 UTC 2007


Author: jwrdegoede

Update of /cvs/extras/rpms/xblast/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31076

Modified Files:
	.cvsignore sources 
Added Files:
	xblast-2.10.4-manpage.patch xblast-2.10.4-sdl-fixes.patch 
	xblast.desktop xblast.png xblast.sh xblast.spec 
Log Message:
* Thu Mar  1 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.10.4-2
- Use sf.net sourceforge URL from the Guidelines (bz 229476)
- Keep timestamp while installing the wrapper (bz 229476)
- Sanitize and install the manpage (bz 229476)
- Add "Requires: xorg-x11-fonts-ISO8859-1-75dpi" to xblast-x11 (bz 229476)
- Make xblast look for translations under /usr/share/locale (bz 229476)


xblast-2.10.4-manpage.patch:

--- NEW FILE xblast-2.10.4-manpage.patch ---
--- xblast-2.10.4/xblast.man~	2007-03-01 10:50:54.000000000 +0100
+++ xblast-2.10.4/xblast.man	2007-03-01 10:50:54.000000000 +0100
@@ -1,4 +1,4 @@
-.TH xblast 6x "Release 2.10.0 (Februar 27th 2005)"
+.TH xblast 6 "Release 2.10.4 (Juni 16th 2006)"
 .SH NAME
 XBlast (TNT) \- Multi-player "Blast the Others" game
 .PP
@@ -11,12 +11,8 @@
 
 .SH DESCRIPTION
 .PP
-XBlast is a multi-player arcade game for X11R5/R6. The game can be played
-with at least two players and up to six players. It was inspired by
-the video/computer game Bomberman/Dynablaster which was to my
-knowledge first programmed for NEC's PC Engine/Turbo Grafx. Other
-(commercial) versions of the original game exist for IBM-PC, Atari ST,
-Amiga, NES, GameBoy and Super NES.
+XBlast is a multi-player arcade game available for both SDL and X11R5/R6. The
+game can be played with at least two players and up to six players.
 .PP
 
 
@@ -142,7 +138,7 @@
 Go to previous menu.
 .PP
 Please note that since \fIXBlast 2.7.x\fP the keybindings can be customised
-via Options Menu Controls (see also \fxhttp://blast.sf.net/ \fP).
+via Options Menu Controls (see also \fxhttp://xblast.sf.net/ \fP).
 .PP
 
 

xblast-2.10.4-sdl-fixes.patch:

--- NEW FILE xblast-2.10.4-sdl-fixes.patch ---
--- xblast-2.10.4/sdl_tile.c~	2007-02-18 09:34:49.000000000 +0100
+++ xblast-2.10.4/sdl_tile.c	2007-02-18 09:34:49.000000000 +0100
@@ -355,7 +355,7 @@
 	assert (pixScore[block] != NULL);
 
 	Rect.x = x * STAT_WIDTH;
-#ifdef SMPF
+#if 1 /* def SMPF */
 	Rect.y = MAZE_H * BLOCK_HEIGHT + y * STAT_HEIGHT;
 #else
 	Rect.y = MAZE_H * BLOCK_HEIGHT;
--- xblast-2.10.4/sdl_text.c~	2007-02-18 12:10:07.000000000 +0100
+++ xblast-2.10.4/sdl_text.c	2007-02-18 12:10:07.000000000 +0100
@@ -79,7 +79,7 @@
 {
 	const CFGFont *cfgFont;
 	const CFGColor *cfgColor;
-	char *fontName = "Vera.ttf";
+	char *fontName = "/usr/share/fonts/bitstream-vera/Vera.ttf";
 
 	/*
 	 * Initialize SDL_ttf library


--- NEW FILE xblast.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=XBlast
Comment=Lay bombs and Blast the other players of the field
Exec=xblast
Icon=xblast
Terminal=false
StartupNotify=false
Type=Application
Categories=Game;ArcadeGame;


--- NEW FILE xblast.sh ---
#!/bin/bash

XBLAST=`which xblast-sdl 2> /dev/null`

if [ -z "$XBLAST" ]; then
    XBLAST=`which xblast-x11 2> /dev/null`
fi

if [ -z "$XBLAST" ]; then
    echo "error could find neither xblast-sdl nor xblast-x11"
    exit 1
fi

exec $XBLAST "$@"


--- NEW FILE xblast.spec ---
Name:           xblast
Version:        2.10.4
Release:        2%{?dist}
Summary:        Lay bombs and Blast the other players of the field (SDL version)
Group:          Amusements/Games
License:        GPL
URL:            http://xblast.sourceforge.net
Source0:        http://downloads.sourceforge.net/xblast/xblast-%{version}.tar.gz
Source1:        xblast.png
Source2:        xblast.desktop
Source3:        xblast.sh
Patch0:         xblast-2.10.4-sdl-fixes.patch
Patch1:         xblast-2.10.4-manpage.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  libXt-devel gettext gawk desktop-file-utils SDL_gfx-devel
BuildRequires:  SDL_image-devel SDL_ttf-devel SDL_mixer-devel SDL_net-devel
Requires:       %{name}-data >= 2.10.0, %{name}-common = %{version}-%{release}
Requires:       /usr/share/fonts/bitstream-vera/Vera.ttf
Provides:       %{name}-engine = %{version}-%{release}

%description
This is the new SDL version of XBlast, a multiplayer game where the "purpose"
is to Blast the other players of the gamefield by laying bombs close to them.
While at the same time you must avoid being blown up yourself.


%package x11
Summary:        Lay bombs and Blast the other players of the field (X11 version)
Group:          Amusements/Games
Requires:       %{name}-data >= 2.10.0, %{name}-common = %{version}-%{release}
Requires:       xorg-x11-fonts-ISO8859-1-75dpi
Provides:       %{name}-engine = %{version}-%{release}

%description x11
This is the original X11 version of XBlast, a multiplayer game where the
"purpose" is to Blast the other players of the gamefield by laying bombs close
to them. While at the same time you must avoid being blown up yourself.


%package common
Summary:        Files common to both the X11 and SDL version of XBlast
Group:          Amusements/Games
Requires:       %{name}-engine = %{version}-%{release}, hicolor-icon-theme

%description common
Files common to both the X11 and SDL version of XBlast, a multiplayer game
where the "purpose" is to Blast the other players of the gamefield by laying
bombs close to the other player.


%prep
%setup -q
%patch0 -p1 -z .sdl
%patch1 -p1 -z .man
sed -i 's|$(game_datadir)/locale|%{_datadir}/locale|g' Makefile.in

# stop rpmlint from complaining about executable source files in the -debuginfo
chmod -x chat.* version.c
# stop autoxxx from rerunning because of strange timestamps in the tarbal
touch aclocal.m4 configure Makefile.in config.h.in


%build
# first build the SDL version
%configure --with-otherdatadir=%{_datadir}/%{name} --enable-admin --enable-sdl
make %{?_smp_mflags}
mv xblast xblast-sdl

# and then the X11 version
make distclean
%configure --with-otherdatadir=%{_datadir}/%{name} --enable-admin --enable-sound
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install localedir=%{_datadir}/locale DESTDIR=$RPM_BUILD_ROOT
%find_lang %{name}

mv $RPM_BUILD_ROOT%{_bindir}/%{name} $RPM_BUILD_ROOT%{_bindir}/%{name}-x11
install -m 755 xblast-sdl $RPM_BUILD_ROOT%{_bindir}
install -p -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/%{name}

mkdir -p $RPM_BUILD_ROOT%{_mandir}/man6
install -m 644 %{name}.man $RPM_BUILD_ROOT%{_mandir}/man6/%{name}.6

# below is the desktop file and icon stuff.
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora            \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  %{SOURCE2}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
install -p -m 644 %{SOURCE1} \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps


%clean
rm -rf $RPM_BUILD_ROOT


%post common
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :

%postun common
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :


%files
%defattr(-,root,root,-)
%{_bindir}/%{name}-sdl

%files x11
%defattr(-,root,root,-)
%{_bindir}/%{name}-x11
%{_bindir}/xbsndsrv

%files -f %{name}.lang common
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README NEWS
%{_bindir}/%{name}
%{_mandir}/man6/%{name}.6.gz
%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
%{_datadir}/applications/fedora-%{name}.desktop


%changelog
* Thu Mar  1 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.10.4-2
- Use sf.net sourceforge URL from the Guidelines (bz 229476)
- Keep timestamp while installing the wrapper (bz 229476)
- Sanitize and install the manpage (bz 229476)
- Add "Requires: xorg-x11-fonts-ISO8859-1-75dpi" to xblast-x11 (bz 229476)
- Make xblast look for translations under /usr/share/locale (bz 229476)

* Thu Feb  8 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.10.4-1
- Initial Fedora Extras package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xblast/FC-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	2 Mar 2007 13:00:21 -0000	1.1
+++ .cvsignore	4 Mar 2007 10:30:13 -0000	1.2
@@ -0,0 +1 @@
+xblast-2.10.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xblast/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	2 Mar 2007 13:00:21 -0000	1.1
+++ sources	4 Mar 2007 10:30:13 -0000	1.2
@@ -0,0 +1 @@
+eca7620c34ab49bb62fa8ef01f73b2f3  xblast-2.10.4.tar.gz




More information about the fedora-extras-commits mailing list