Mailinglist Archive: opensuse-commit (1093 mails)
| < Previous | Next > |
commit bzflag for openSUSE:Factory
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Fri, 19 Mar 2010 10:36:34 +0100
- Message-id: <20100319093634.A1ADD20299@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package bzflag for openSUSE:Factory
checked in at Fri Mar 19 10:36:34 CET 2010.
--------
--- bzflag/bzflag.changes 2008-09-08 13:55:12.000000000 +0200
+++ /mounts/work_src_done/STABLE/bzflag/bzflag.changes 2010-03-18
13:13:43.000000000 +0100
@@ -1,0 +2,5 @@
+Thu Mar 18 12:13:15 UTC 2010 - prusnak@xxxxxxxxxx
+
+- cleanup spec file
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
bzflag-1.10.4-ncursespollution.diff
bzflag-2.0.10_array-subscript2.patch
bzflag-decl.diff
bzflag-icon.png
New:
----
bzflag-1.10.4-ncursespollution.patch
bzflag-2.0.10-array-subscript.patch
bzflag-decl.patch
bzflag.png
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ bzflag.spec ++++++
--- /var/tmp/diff_new_pack.w8Lgnj/_old 2010-03-19 10:34:32.000000000 +0100
+++ /var/tmp/diff_new_pack.w8Lgnj/_new 2010-03-19 10:34:32.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package bzflag (Version 2.0.12)
#
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,23 +20,22 @@
Name: bzflag
BuildRequires: bc curl-devel freeglut-devel gcc-c++ libcares-devel
libdrm-devel ncurses-devel update-desktop-files
-License: GPL v2 or later
+License: GPLv2+
Group: Amusements/Games/3D/Shoot
-AutoReqProv: on
Version: 2.0.12
-Release: 1
+Release: 5
Summary: 3D Networked Multiplayer Tank Battle Game
Url: http://BZFlag.org/
-Source: %name-%version.tar.bz2
+Source: %{name}-%{version}.tar.bz2
Source2: rc.bzflagserver
-Source3: bzflag-maps.tar.bz2
+Source3: %{name}-maps.tar.bz2
Source4: sysconfig.bzflagserver-bzflag
-Source5: bzflag.desktop
-Source6: bzflag-icon.png
-Patch: bzflag-1.10.4-ncursespollution.diff
-Patch1: bzflag-decl.diff
-Patch3: bzflag-char-signedness.patch
-Patch5: %{name}-2.0.10_array-subscript2.patch
+Source5: %{name}.desktop
+Source6: %{name}.png
+Patch: %{name}-1.10.4-ncursespollution.patch
+Patch1: %{name}-decl.patch
+Patch3: %{name}-char-signedness.patch
+Patch5: %{name}-2.0.10-array-subscript.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: %insserv_prereq %fillup_prereq
@@ -46,7 +45,7 @@
use of 3D graphics (OpenGL), a fast CPU or a supported 3D video card is
heavily recommended.
-Find server maps in /usr/share/games/bzflag/maps.
+Find server maps in /usr/share/bzflag/maps.
@@ -68,7 +67,6 @@
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
%configure \
- --datadir=/usr/share/games \
--with-pic
make %{?jobs:-j %jobs} all
@@ -84,18 +82,15 @@
%install
#Init script for the BZFlag server
-mkdir -p $RPM_BUILD_ROOT/etc/init.d
-install -m 755 rc.bzflagserver $RPM_BUILD_ROOT/etc/init.d/bzflagserver
-mkdir -p $RPM_BUILD_ROOT/usr/sbin
-ln -s ../../etc/init.d/bzflagserver $RPM_BUILD_ROOT/usr/sbin/rcbzflagserver
+install -D -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/bzflagserver
+mkdir -p $RPM_BUILD_ROOT%{_sbindir}
+ln -s %{_sysconfdir}/init.d/bzflagserver
$RPM_BUILD_ROOT%{_sbindir}/rcbzflagserver
make MKDIR_P="mkdir -p --" DESTDIR=$RPM_BUILD_ROOT install
-install -d -m 755 $RPM_BUILD_ROOT/var/adm/fillup-templates
-install -m 644 %{S:4} $RPM_BUILD_ROOT/var/adm/fillup-templates
-mkdir -p $RPM_BUILD_ROOT/usr/share/games/bzflag/maps
-install -m 644 maps/*bzmap $RPM_BUILD_ROOT/usr/share/games/bzflag/maps
-mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps/
-install -m 644 %{S:6} $RPM_BUILD_ROOT/usr/share/pixmaps/bzflag.png
-%suse_update_desktop_file -i %name Game ActionGame
+install -D -m 644 %{SOURCE4}
$RPM_BUILD_ROOT%{_localstatedir}/adm/fillup-templates/sysconfig.bzflagserver-bzflag
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/bzflag/maps
+install -m 644 maps/*bzmap $RPM_BUILD_ROOT%{_datadir}/bzflag/maps
+install -D -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/pixmaps/bzflag.png
+%suse_update_desktop_file -i %{name}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -104,14 +99,15 @@
%defattr(-, root, root)
%doc AUTHORS BUGS COPYING PORTING README DEVINFO README.UNIX
%doc RELNOTES TODO README.Linux misc/bzfs.conf
-/etc/init.d/bzflagserver
-/usr/sbin/rcbzflagserver
-/usr/bin/*
-/usr/share/games/bzflag
-/usr/share/applications/bzflag.desktop
-/usr/share/pixmaps/bzflag.png
-%_mandir/man6/*
-%_mandir/man5/*
-/var/adm/fillup-templates/sysconfig.bzflagserver-bzflag
+%{_sysconfdir}/init.d/bzflagserver
+%{_sbindir}/rcbzflagserver
+%{_bindir}/*
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/*
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/pixmaps/%{name}.png
+%{_mandir}/man5/*
+%{_mandir}/man6/*
+%{_localstatedir}/adm/fillup-templates/sysconfig.bzflagserver-bzflag
%changelog
++++++ bzflag-1.10.4-ncursespollution.patch ++++++
--- bzflag-1.10.8.20041007/src/bzadmin/CursesUI.h
+++ bzflag-1.10.8.20041007/src/bzadmin/CursesUI.h
@@ -29,6 +29,8 @@
#include "global.h"
#include "UIMap.h"
+#undef bool
+
#define CMDLENGTH (MessageLen - 3)
++++++ bzflag-2.0.10-array-subscript.patch ++++++
--- src/bzflag/ServerStartMenu.cxx
+++ src/bzflag/ServerStartMenu.cxx
@@ -319,14 +319,6 @@
void ServerStartMenu::setSettings(const char* _settings)
{
- // FIXME -- temporary to automatically upgrade old configurations
- if (strlen(_settings) == 14) {
- strcpy(settings, _settings);
- settings[12] = settings[13];
- settings[13] = settings[14];
- return;
- }
-
if (strlen(_settings) != strlen(settings)) return;
strcpy(settings, _settings);
}
++++++ bzflag-decl.patch ++++++
--- src/ogl/OpenGLGState.cxx
+++ src/ogl/OpenGLGState.cxx
@@ -128,6 +128,8 @@
Unsorted unsorted;
};
+class SortedGState;
+
//
// OpenGLGStateRep
//
++++++ bzflag.desktop ++++++
--- /var/tmp/diff_new_pack.w8Lgnj/_old 2010-03-19 10:34:32.000000000 +0100
+++ /var/tmp/diff_new_pack.w8Lgnj/_new 2010-03-19 10:34:32.000000000 +0100
@@ -13,3 +13,4 @@
Name[hu]=3D-s hálózati többjátékos tankcsata játék
GenericName[hu]=3D-s hálózati többjátékos tankcsata játék
GenericName[cs]=3D síťová tanková bitva pro více hráčů
+Categories=Game;ActionGame;
++++++ rc.bzflagserver ++++++
--- /var/tmp/diff_new_pack.w8Lgnj/_old 2010-03-19 10:34:32.000000000 +0100
+++ /var/tmp/diff_new_pack.w8Lgnj/_new 2010-03-19 10:34:32.000000000 +0100
@@ -11,7 +11,7 @@
# /usr/sbin/rcbzflagserver
#
# LSB compliant service control script; see http://www.linuxbase.org/spec/
-#
+#
# System startup script for the BZFlag gameserver
#
### BEGIN INIT INFO
@@ -22,9 +22,9 @@
# Default-Stop: 0 1 2 6
# Short-Description: bzflag server daemon
# Description: Start bzflagserver to provide a server for the popular
-# tank game BZFlag, http://www.bzflag.org
+# tank game BZFlag, http://www.bzflag.org
### END INIT INFO
-#
+#
# Note on Required-Start: It does specify the init script ordering,
# not real dependencies. Depencies have to be handled by admin
# resp. the configuration tools (s)he uses.
@@ -34,12 +34,12 @@
rc_reset
if [ -f /etc/sysconfig/bzflagserver ]; then
- . /etc/sysconfig/bzflagserver
+ . /etc/sysconfig/bzflagserver
else
- echo "Could not find /etc/sysconfig/bzflagserver"
- echo "Please start the bzflagserver manually"
- rc_failed 1
- rc_status -v
+ echo "Could not find /etc/sysconfig/bzflagserver"
+ echo "Please start the bzflagserver manually"
+ rc_failed 1
+ rc_status -v
fi
# Check for missing binaries (stale symlinks should not happen)
@@ -48,85 +48,85 @@
# See /etc/sysconfig/bzflagserver for options to the bzfs
if [ "$BZFLAGSERVER_PUBLIC" = "yes" ] ; then
- PUBLIC="-public"
+ PUBLIC="-public"
fi
if [ "$BZFLAGSERVER_NEWBIE" = "yes" ] ; then
- HANDICAP="-handicap"
+ HANDICAP="-handicap"
fi
case "$1" in
start)
- echo -n "Starting bzflagserver"
+ echo -n "Starting bzflagserver"
- if [ "$BZFLAGSERVER_SRVMSG" ] ; then
- startproc -u nobody -g nobody $BZFLAGSERVER_BIN \
- $BZFLAGSERVER_OPTS $PUBLIC -p "$BZFLAGSERVER_PORT" \
- -world "/usr/share/games/bzflag/maps/$BZFLAGSERVER_WORLD" \
- -srvmsg "$BZFLAGSERVER_SRVMSG" $HANDICAP
- else
- startproc -u nobody -g nobody $BZFLAGSERVER_BIN \
- $BZFLAGSERVER_OPTS $PUBLIC -p "$BZFLAGSERVER_PORT" \
- -world "/usr/share/games/bzflag/maps/$BZFLAGSERVER_WORLD" \
- $HANDICAP
- fi
- # Remember status and be verbose
- rc_status -v
- ;;
+ if [ "$BZFLAGSERVER_SRVMSG" ] ; then
+ startproc -u nobody -g nobody $BZFLAGSERVER_BIN \
+ $BZFLAGSERVER_OPTS $PUBLIC -p "$BZFLAGSERVER_PORT" \
+ -world "/usr/share/games/bzflag/maps/$BZFLAGSERVER_WORLD" \
+ -srvmsg "$BZFLAGSERVER_SRVMSG" $HANDICAP
+ else
+ startproc -u nobody -g nobody $BZFLAGSERVER_BIN \
+ $BZFLAGSERVER_OPTS $PUBLIC -p "$BZFLAGSERVER_PORT" \
+ -world "/usr/share/games/bzflag/maps/$BZFLAGSERVER_WORLD" \
+ $HANDICAP
+ fi
+ # Remember status and be verbose
+ rc_status -v
+ ;;
stop)
- echo -n "Shutting down bzflagserver"
- ## Stop daemon with killproc(8) and if this fails
- ## set echo the echo return value.
-
- killproc -TERM $BZFLAGSERVER_BIN
-
- # Remember status and be verbose
- rc_status -v
- ;;
+ echo -n "Shutting down bzflagserver"
+ ## Stop daemon with killproc(8) and if this fails
+ ## set echo the echo return value.
+
+ killproc -TERM $BZFLAGSERVER_BIN
+
+ # Remember status and be verbose
+ rc_status -v
+ ;;
try-restart)
- ## Stop the service and if this succeeds (i.e. the
- ## service was running before), start it again.
- ## Note: try-restart is not (yet) part of LSB (as of 0.7.5)
- $0 status >/dev/null && $0 restart
-
- # Remember status and be quiet
- rc_status
- ;;
+ ## Stop the service and if this succeeds (i.e. the
+ ## service was running before), start it again.
+ ## Note: try-restart is not (yet) part of LSB (as of 0.7.5)
+ $0 status >/dev/null && $0 restart
+
+ # Remember status and be quiet
+ rc_status
+ ;;
restart)
- ## Stop the service and regardless of whether it was
- ## running or not, start it again.
- $0 stop
- $0 start
-
- # Remember status and be quiet
- rc_status
- ;;
+ ## Stop the service and regardless of whether it was
+ ## running or not, start it again.
+ $0 stop
+ $0 start
+
+ # Remember status and be quiet
+ rc_status
+ ;;
force-reload)
- $0 stop && $0 start
- rc_status
- ;;
+ $0 stop && $0 start
+ rc_status
+ ;;
reload)
- rc_failed 3
- rc_status -v
- ;;
+ rc_failed 3
+ rc_status -v
+ ;;
status)
- echo -n "Checking for service bzflagserver: "
- ## Check status with checkproc(8), if process is running
- ## checkproc will return with exit status 0.
-
- # Return value is slightly different for the status command:
- # 0 - service running
- # 1 - service dead, but /var/run/ pid file exists
- # 2 - service dead, but /var/lock/ lock file exists
- # 3 - service not running
-
- # NOTE: checkproc returns LSB compliant status values.
- checkproc $BZFLAGSERVER_BIN
- rc_status -v
- ;;
+ echo -n "Checking for service bzflagserver: "
+ ## Check status with checkproc(8), if process is running
+ ## checkproc will return with exit status 0.
+
+ # Return value is slightly different for the status command:
+ # 0 - service running
+ # 1 - service dead, but /var/run/ pid file exists
+ # 2 - service dead, but /var/lock/ lock file exists
+ # 3 - service not running
+
+ # NOTE: checkproc returns LSB compliant status values.
+ checkproc $BZFLAGSERVER_BIN
+ rc_status -v
+ ;;
*)
- echo "Usage: $0
{start|stop|status|try-restart|restart|force-reload|reload}"
- exit 1
- ;;
+ echo "Usage: $0
{start|stop|status|try-restart|restart|force-reload|reload}"
+ exit 1
+ ;;
esac
rc_exit
++++++ sysconfig.bzflagserver-bzflag ++++++
--- /var/tmp/diff_new_pack.w8Lgnj/_old 2010-03-19 10:34:32.000000000 +0100
+++ /var/tmp/diff_new_pack.w8Lgnj/_new 2010-03-19 10:34:32.000000000 +0100
@@ -1,8 +1,8 @@
-## Path: Applications/Games/BZFlagserver
-## Description: Configuration of the BZFlag server
-## Type: string
-## Default: "teleport.bzmap"
-## ServiceRestart: bzflagserver
+## Path: Applications/Games/BZFlagserver
+## Description: Configuration of the BZFlag server
+## Type: string
+## Default: "teleport.bzmap"
+## ServiceRestart: bzflagserver
#
# The map to use on the server. Have a look at the available maps in
# /usr/share/games/bzflag/maps for available maps.
@@ -17,28 +17,28 @@
#
BZFLAGSERVER_OPTS="+f good -st 15 +s 5"
-## Type: string
+## Type: string
## Default: ""
#
# Define a server welcome message
#
BZFLAGSERVER_SRVMSG=""
-## Type: yesno
+## Type: yesno
## Default: off
#
# Define whether the server should be public for other players on the internet
#
BZFLAGSERVER_PUBLIC="no"
-## Type: integer
+## Type: integer
## Default: 5155
#
# What port should the server listen to? The BZFlag game standard is 5155.
#
BZFLAGSERVER_PORT="5155"
-## Type: yesno
+## Type: yesno
## Default: off
#
# Define whether the server should punish people who are too good players
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |