Author: jwrdegoede Update of /cvs/free/rpms/bubbros/F-9 In directory se02.es.rpmfusion.net:/tmp/cvs-serv8031 Modified Files: .cvsignore sources Added Files: bubbros-1.5-fixes.patch bubbros.desktop bubbros.spec Log Message: * Thu Jul 24 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl&gt; 1.6-2 - Release bump for rpmfusion bubbros-1.5-fixes.patch: --- NEW FILE bubbros-1.5-fixes.patch --- diff -up bubbros-1.6/BubBob.py.foo bubbros-1.6/BubBob.py --- bubbros-1.6/BubBob.py.foo 2007-09-08 17:03:41.000000000 +0200 +++ bubbros-1.6/BubBob.py 2008-07-24 13:44:29.000000000 +0200 @@ -27,16 +27,11 @@ import socket, tempfile sys.path.insert(0, LOCALDIR) os.chdir(LOCALDIR) -try: - username = '-'+os.getlogin() -except: - try: - import pwd - username = '-'+pwd.getpwuid(os.getuid())[0] - except: - username = '' -TAGFILENAME = 'BubBob-%s%s.url' % (socket.gethostname(), username) -TAGFILENAME = os.path.join(tempfile.gettempdir(), TAGFILENAME) +rcdir = os.path.join(os.environ.get("HOME", "."), ".bubbros") +if not os.path.isdir(rcdir): + os.makedirs(rcdir) +TAGFILENAME = 'BubBob-%s.url' % (socket.gethostname()) +TAGFILENAME = os.path.join(rcdir, TAGFILENAME) def load_url_file(): @@ -138,7 +133,7 @@ try: browser = webbrowser.get() name = getattr(browser, 'name', browser.__class__.__name__) print "Trying to open '%s' with '%s'..." % (url, name) - browser.open(url) + webbrowser.open(url) except: exc, val, tb = sys.exc_info() print '-'*60 diff -up bubbros-1.6/bubbob/bb.py.foo bubbros-1.6/bubbob/bb.py --- bubbros-1.6/bubbob/bb.py.foo 2007-09-08 17:03:41.000000000 +0200 +++ bubbros-1.6/bubbob/bb.py 2008-07-24 13:44:29.000000000 +0200 @@ -14,6 +14,10 @@ except: pass LOCALDIR = os.path.dirname(os.path.abspath(LOCALDIR)) # ---------- +rcdir = os.path.join(os.environ.get("HOME", "."), ".bubbros") +if not os.path.isdir(rcdir): + os.makedirs(rcdir) +# ---------- import random, time diff -up bubbros-1.6/bubbob/bonuses.py.foo bubbros-1.6/bubbob/bonuses.py --- bubbros-1.6/bubbob/bonuses.py.foo 2007-09-08 17:03:41.000000000 +0200 +++ bubbros-1.6/bubbob/bonuses.py 2008-07-24 13:44:29.000000000 +0200 @@ -1703,6 +1703,10 @@ class Chestnut(RandomBonus): try: + if sys.path[1][0:10] == '/usr/lib64': + sys.path.append('/usr/lib64/bubbros') + else: + sys.path.append('/usr/lib/bubbros') import statesaver except ImportError: print "'statesaver' module not compiled, no clock bonus" diff -up bubbros-1.6/bubbob/statesaver.c.foo bubbros-1.6/bubbob/statesaver.c --- bubbros-1.6/bubbob/statesaver.c.foo 2007-09-08 17:03:41.000000000 +0200 +++ bubbros-1.6/bubbob/statesaver.c 2008-07-24 13:44:29.000000000 +0200 @@ -75,10 +75,6 @@ static PyObject* genbuild(PyObject* g) Py_INCREF(g); /* exhausted -- can return 'g' itself */ return g; } - if (f->f_nfreevars || f->f_ncells) { - PyErr_SetString(PyExc_ValueError, "generator has cell or free vars"); - goto error; - } if (co->co_argcount == 0) dummy = NULL; @@ -143,11 +139,6 @@ static int gencopy(PyObject* g2, PyObjec } f2 = (PyFrameObject*) x; - if (f2->f_stacksize != f->f_stacksize) { - PyErr_SetString(PyExc_TypeError, "stack size mismatch"); - goto error; - } - if (f2->f_stacktop != NULL) while (f2->f_stacktop != f2->f_localsplus) { diff -up bubbros-1.6/common/stdlog.py.foo bubbros-1.6/common/stdlog.py --- bubbros-1.6/common/stdlog.py.foo 2007-09-08 17:03:41.000000000 +0200 +++ bubbros-1.6/common/stdlog.py 2008-07-24 13:44:29.000000000 +0200 @@ -6,7 +6,8 @@ class LogFile: def __init__(self, filename=None, limitsize=32768): if filename is None: - filename = sys.argv[0] + filename = os.path.join(os.environ.get('HOME', '.'), '.bubbros', + os.path.basename(sys.argv[0])) if filename.endswith('.py'): filename = filename[:-3] filename += '.log' diff -up bubbros-1.6/display/dpy_pygame.py.foo bubbros-1.6/display/dpy_pygame.py --- bubbros-1.6/display/dpy_pygame.py.foo 2007-09-08 17:03:41.000000000 +0200 +++ bubbros-1.6/display/dpy_pygame.py 2008-07-24 13:44:29.000000000 +0200 @@ -13,7 +13,7 @@ class Display: musthidemouse = 0 mousevisible = 1 - def __init__(self, width, height, title, transparency='yes', fullscreen='no'): + def __init__(self, width, height, title, transparency='yes', fullscreen='yes'): self.use_transparency = not transparency.startswith('n') self.use_fullscreen = fullscreen.startswith('y') @@ -200,7 +200,7 @@ def htmloptionstext(nameval): return ''' <%s> Full Screen (Esc key to exit)</input><%s><br> <%s> Draw slightly transparent bubbles</input><%s><br> -''' % (nameval("checkbox", "fullscreen", "yes", default="no"), +''' % (nameval("checkbox", "fullscreen", "yes", default="yes"), nameval("hidden", "fullscreen", "no"), nameval("checkbox", "transparency", "yes", default="yes"), nameval("hidden", "transparency", "no")) diff -up bubbros-1.6/display/modes.py.foo bubbros-1.6/display/modes.py --- bubbros-1.6/display/modes.py.foo 2007-09-08 17:03:41.000000000 +0200 +++ bubbros-1.6/display/modes.py 2008-07-24 13:44:29.000000000 +0200 @@ -29,6 +29,10 @@ class Mode: self.extraoptsdescr = extraoptsdescr self.options = options.copy() self.url = url + if sys.path[1][0:10] == '/usr/lib64': + sys.path.append('/usr/lib64/bubbros') + else: + sys.path.append('/usr/lib/bubbros') def getmodule(self): return __import__(self.prefix + self.name.lower(), globals(), @@ -94,18 +98,18 @@ class SoundMode(Mode): def graphicmodeslist(): return [ + GraphicMode('pygame', 'PyGame library (all platforms)', + ['--fullscreen=yes go full screen (Esc key to exit, default)', + '--fullscreen=no run in windowed mode', + '--transparency=yes slightly transparent bubbles (default)', + '--transparency=no disable it (a bit faster)'], + {'transparency': 'yes', 'fullscreen': 'yes'}, + url='http://www.pygame.org'), GraphicMode('X', 'XWindow (Linux/Unix)', ['--shm=yes use the Shared Memory extension (default)', '--shm=no disable it (for remote connections or old X servers)', ], {'shm': 'yes'}), - GraphicMode('windows', 'MS Windows', []), - GraphicMode('pygame', 'PyGame library (all platforms)', - ['--fullscreen=yes go full screen (Esc key to exit)', - '--transparency=yes slightly transparent bubbles (default)', - '--transparency=no disable it (a bit faster)'], - {'transparency': 'yes', 'fullscreen': 'no'}, - url='http://www.pygame.org'), GraphicMode('gtk', 'PyGTK (Gnome)', ['--zoom=xxx% scale image by xxx %'], {'zoom': '100'}, @@ -120,10 +124,6 @@ def soundmodeslist(): ['--freq=# mixer frequency (default 44100)', '--fmt=# data format (default S16_NE, --fmt=list for a list)'], {'freq': '44100', 'fmt': 'S16_NE'}), - SoundMode('windows', 'audio mixer for Windows', - ['--freq=# mixer frequency (default 44100)', - '--bits=# bits per sample (8 or default 16)'], - {'freq': '44100', 'bits': '16'}), SoundMode('off', 'no sounds', []), ] diff -up bubbros-1.6/display/pclient.py.foo bubbros-1.6/display/pclient.py --- bubbros-1.6/display/pclient.py.foo 2007-09-08 17:03:41.000000000 +0200 +++ bubbros-1.6/display/pclient.py 2008-07-24 13:44:29.000000000 +0200 @@ -162,8 +162,8 @@ class Playfield: if mode[-1].has_key('cfgfile'): self.trackcfgfile = mode[-1]['cfgfile'] else: - self.trackcfgfile = os.path.join(DataChunk.SOURCEDIR, - 'http2', 'config.txt') + self.trackcfgfile = os.path.join(os.environ.get('HOME', '.'), + '.bubbros', 'config.txt') self.udpsock = None self.udpsock_low = None self.udpsock2 = None diff -up bubbros-1.6/doc/BubBob.py.1.foo bubbros-1.6/doc/BubBob.py.1 --- bubbros-1.6/doc/BubBob.py.1.foo 2007-09-08 17:03:41.000000000 +0200 +++ bubbros-1.6/doc/BubBob.py.1 2008-07-24 13:44:29.000000000 +0200 @@ -1,23 +1,21 @@ -.\" $Id: BubBob.py.1,v 1.2 2005/04/13 18:24:17 opqdonut Exp $ +.\" $Id: bubbros.6,v 1.2 2005/04/13 18:24:17 opqdonut Exp $ .\" .\" Process this file with -.\" groff -man -Tascii BubBob.py.1 +.\" groff -man -Tascii bubbros.6 .\" -.TH BubBob.py 1 "APRIL 2005" Linux "User Manuals" +.TH bubbros 6 "APRIL 2005" Linux "User Manuals" .SH NAME -BubBob.py \- Generic startup script for bub-n-bros +bubbros \- Generic startup script for bub-n-bros .SH SYNOPSIS -.B BubBob.py -.br -.B python BubBob.py +.B bubbros .SH DESCRIPTION -.B BubBob.py +.B bubbros runs -.BR bb.py (1) +.BR bubbros-server (6) (the bub-n-bros server) and then tries to open the url of its control panel in your webbrowser. @@ -26,7 +24,7 @@ The environment variable BROWSER affects on Unix systems. .SH SEE ALSO -.BR bb.py (1) -.BR Client.py (1) +.BR bubbros-server (6) +.BR bubbros-client (6) .BR python (1) diff -up bubbros-1.6/doc/Client.py.1.foo bubbros-1.6/doc/Client.py.1 --- bubbros-1.6/doc/Client.py.1.foo 2007-09-08 17:03:41.000000000 +0200 +++ bubbros-1.6/doc/Client.py.1 2008-07-24 13:44:29.000000000 +0200 @@ -1,27 +1,23 @@ -.\" $Id: Client.py.1,v 1.3 2005/05/06 21:32:38 arigo Exp $ +.\" $Id: bubbros-client.6,v 1.3 2005/05/06 21:32:38 arigo Exp $ .\" .\" Process this file with -.\" groff -man -Tascii Client.py.1 +.\" groff -man -Tascii bubbros-client.6 .\" -.TH Client.py 1 "APRIL 2005" Linux "User Manuals" +.TH bubbros-client 6 "APRIL 2005" Linux "User Manuals" .SH NAME -Client.py \- the bub-n-bros client +bubbros-client \- the bub-n-bros client .SH SYNOPSIS -.B python Client.py [ +.B bubbros-client [ .I options .BI "] [" host [: port ]] -.PP -Note that this script is in the -.B display/ -subdirectory of the original directory layout. .SH DESCRIPTION This is the bub-n-bros client that connects to bub-n-bros servers started with -.BR bb.py "(1) or " BubBob.py (1) . +.BR bubbros-server "(6) or " bubbros (6) . It supports many different audio and video drivers and is very multi-platform. @@ -38,12 +34,6 @@ Connect to server running on given port defined, search for servers on the local network. .TP -.BI --bits= N -This option concerns only the -.B windows -audio driver. Set bits per sample. Valid values are 8 and 16 (default). - -.TP .BI "-d " DRIVER ", --display=" DRIVER Use video driver .IR DRIVER . @@ -57,9 +47,6 @@ running. See the .B --shm option. .TP -.B windows -MS Windows driver. -.TP .B pygame PyGame gaming library for python (if installed) has video output. Use it if this is specified. See @@ -86,21 +73,21 @@ You can get a list of supported formats .TP .BI --freq= N This option concerns only the -.BR linux " and " windows -audio drivers. Set mixing frequency to +.BR linux +audio driver. Set mixing frequency to .I N (in Hz). Defaults to 44100. .TP .B -m, --metaserver Connect with the help of the Metaserver (see -.BR bb.py (1) +.BR bubbros-server (6) for more info). Run -.I Client.py -m +.I bubbros-client -m to print a table of currently running servers, pick the the exact IP address and port of the server of your choice from the table, and run again -.I Client.py -m +.I bubbros-client -m .BR host:port . .TP @@ -145,11 +132,6 @@ Use the linux audio mixer. See the .BR --freq " and " --fmt " options." .TP -.B windows -Use the Windows audio mixer. See the -.BR --freq " and " --bits "options." - -.TP .B off No sounds. .RE @@ -195,6 +177,6 @@ display driver. Scale output by .IR N %. .SH SEE ALSO -.BR bb.py (1) -.BR Client.py (1) +.BR bubbros (6) +.BR bubbros-server (6) .BR python (1) \ No newline at end of file diff -up bubbros-1.6/doc/bb.py.1.foo bubbros-1.6/doc/bb.py.1 --- bubbros-1.6/doc/bb.py.1.foo 2007-09-08 17:03:41.000000000 +0200 +++ bubbros-1.6/doc/bb.py.1 2008-07-24 13:44:29.000000000 +0200 @@ -1,29 +1,21 @@ -.\" $Id: bb.py.1,v 1.3 2005/04/17 17:19:32 opqdonut Exp $ +.\" $Id: bubbros-server.6,v 1.3 2005/04/17 17:19:32 opqdonut Exp $ .\" .\" Process this file with -.\" groff -man -Tascii bb.py.1 +.\" groff -man -Tascii bubbros-server.6 .\" -.TH bb.py 1 "APRIL 2005" Linux "User Manuals" +.TH bubbros-server 6 "APRIL 2005" Linux "User Manuals" .SH NAME -bb.py \- the bub-n-bros server. +bubbros-server \- the bub-n-bros server. .SH SYNOPSIS -.B bb.py [ +.B bubbros-server [ .I level-file.bin .BI "] [" options ] -.br -.B python bb.py [ -.I level-file.bin -.BI "] [" options ] -.PP -Note that this script is in the -.B bubbob/ -subdirectory of the original directory layout. .SH DESCRIPTION -.B bb.py +.B bubbros-server starts an http server that acts as a control panel for the server. The server listens on port .B 8000 @@ -124,6 +116,6 @@ The server outputs helpful debug informa game servers. .SH SEE ALSO -.BR BubBob.py (1) -.BR Client.py (1) +.BR bubbros (6) +.BR bubbros-client (6) .BR python (1) diff -up bubbros-1.6/http2/httppages.py.foo bubbros-1.6/http2/httppages.py --- bubbros-1.6/http2/httppages.py.foo 2007-09-08 17:03:41.000000000 +0200 +++ bubbros-1.6/http2/httppages.py 2008-07-24 13:44:29.000000000 +0200 @@ -38,7 +38,8 @@ class Options: class PageServer: - CONFIGFILE = 'config.txt' + CONFIGFILE = os.path.join(os.environ.get('HOME', '.'), '.bubbros', + 'config.txt') localservers = None def __init__(self, Game): diff -up bubbros-1.6/java/Makefile.foo bubbros-1.6/java/Makefile --- bubbros-1.6/java/Makefile.foo 2007-09-08 17:03:41.000000000 +0200 +++ bubbros-1.6/java/Makefile 2008-07-24 13:44:29.000000000 +0200 @@ -1,2 +1,2 @@ pclient.class: pclient.java - javac -target 1.1 pclient.java + javac -target 1.1 -source 1.3 pclient.java --- NEW FILE bubbros.desktop --- [Desktop Entry] Encoding=UTF-8 Name=BubBros Comment=Bub and Brothers game inspired by the classic Bubble and Bobble Exec=bubbros Icon=bubbros Terminal=false StartupNotify=false Type=Application Categories=Game;ArcadeGame; --- NEW FILE bubbros.spec --- Name: bubbros Version: 1.6 Release: 2%{?dist} Summary: Bub and Brothers game inspired by the classic Bubble and Bobble Group: Amusements/Games License: MIT and Artistic Licenses URL: http://bub-n-bros.sourceforge.net/ Source0: http://downloads.sourceforge.net/bub-n-bros/%{name}-%{version}.tar.bz2 Source1: bubbros.desktop Patch0: bubbros-1.5-fixes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel ImageMagick desktop-file-utils libX11-devel BuildRequires: libXext-devel xorg-x11-proto-devel java-1.4.2-gcj-compat-devel Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") Requires: pygame pygtk2 htmlview hicolor-icon-theme %description This is a direct clone of the MacOS game Bub & Bob of McSebi. Thanks Sebi for all the cool graphics and sounds! Features: * 1 to 10 players -- the best fun is with at least 3 players! * Same gameplay as the famous McSebi's Bub & Bob. * Over-the-network game and/or up to 3 players on the same computer. * Completely original crazy bonuses! * Capture other players in a bubble! * New levels, including a random level generator! %prep %setup -q #no backups for this patch, otherwise they end up getting installed! %patch0 -p1 sed -i 's:#! /usr/bin/env python:#!%{__python}:' BubBob.py bubbob/bb.py \ display/Client.py chmod +x display/Client.py # for %doc mv bubbob/levels/README.txt levels.txt %build make %{?_smp_mflags} pushd bubbob/images python buildcolors.py popd pushd java rm *.class make popd convert bubbob/images/dragon_0.ppm -transparent '#010101' -crop 32x32+0+0 \ %{name}.png %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name} mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name} mkdir -p $RPM_BUILD_ROOT%{_mandir}/man6 # copying the complete dirs and then removing the unwanted bits is easier :) cp -a BubBob.py bubbob common display http2 java metaserver \ $RPM_BUILD_ROOT%{_datadir}/%{name} rm -fr $RPM_BUILD_ROOT%{_datadir}/%{name}/bubbob/build rm -fr $RPM_BUILD_ROOT%{_datadir}/%{name}/bubbob/doc rm -fr $RPM_BUILD_ROOT%{_datadir}/%{name}/display/build rm -fr $RPM_BUILD_ROOT%{_datadir}/%{name}/display/windows rm $RPM_BUILD_ROOT%{_datadir}/%{name}/display/*_windows.py rm -fr $RPM_BUILD_ROOT%{_datadir}/%{name}/http2/sf rm $RPM_BUILD_ROOT%{_datadir}/%{name}/http2/header.png rm $RPM_BUILD_ROOT%{_datadir}/%{name}/java/pclient.java rm `find $RPM_BUILD_ROOT%{_datadir}/%{name} -name '*.c'` rm `find $RPM_BUILD_ROOT%{_datadir}/%{name} -name 'Makefile'` rm `find $RPM_BUILD_ROOT%{_datadir}/%{name} -name 'setup.py'` # put the .so files in %{libdir} mv `find $RPM_BUILD_ROOT%{_datadir}/%{name} -name '*.so'` \ $RPM_BUILD_ROOT%{_libdir}/%{name} # create the symlinks in /usr/bin, these must be absolute links! ln -s %{_datadir}/%{name}/BubBob.py $RPM_BUILD_ROOT%{_bindir}/bubbros ln -s %{_datadir}/%{name}/bubbob/bb.py $RPM_BUILD_ROOT%{_bindir}/bubbros-server ln -s %{_datadir}/%{name}/display/Client.py \ $RPM_BUILD_ROOT%{_bindir}/bubbros-client # install the manpages install -m 644 doc/BubBob.py.1 $RPM_BUILD_ROOT%{_mandir}/man6/bubbros.6 install -m 644 doc/bb.py.1 $RPM_BUILD_ROOT%{_mandir}/man6/bubbros-server.6 install -m 644 doc/Client.py.1 $RPM_BUILD_ROOT%{_mandir}/man6/bubbros-client.6 # below is the desktop file and icon stuff. mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications desktop-file-install --vendor dribble \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ %{SOURCE1} mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps install -p -m 644 %{name}.png \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps %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 LICENSE.txt artistic.txt levels.txt %{_bindir}/bubbros* %{_libdir}/%{name} %{_datadir}/%{name} %{_datadir}/applications/dribble-%{name}.desktop %{_datadir}/icons/hicolor/32x32/apps/%{name}.png %{_mandir}/man6/bubbros*.6.gz %changelog * Thu Jul 24 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl&gt; 1.6-2 - Release bump for rpmfusion * Mon Sep 10 2007 Hans de Goede <j.w.r.degoede(a)hhs.nl&gt; 1.6-1 - New upstream release 1.6 * Mon Jan 15 2007 Hans de Goede <j.w.r.degoede(a)hhs.nl&gt; 1.5-3 - Rebuild (with compile and run fixes) for new python2.5 * Tue Aug 1 2006 Hans de Goede <j.w.r.degoede(a)hhs.nl&gt; 1.5-2 - Add missing BuildRequires: libX11-devel libXext-devel xorg-x11-proto-devel - Add Requires: htmlview - Recompile java code instead of using precompiled .class files - Don't install java source code, only class files * Fri Jul 28 2006 Hans de Goede <j.w.r.degoede(a)hhs.nl&gt; 1.5-1 - initial Dribble package Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/bubbros/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 31 May 2008 14:07:17 -0000 1.1 +++ .cvsignore 24 Jul 2008 11:40:17 -0000 1.2 @@ -0,0 +1 @@ +bubbros-1.6.tar.bz2 Index: sources =================================================================== RCS file: /cvs/free/rpms/bubbros/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 31 May 2008 14:07:17 -0000 1.1 +++ sources 24 Jul 2008 11:40:17 -0000 1.2 @@ -0,0 +1 @@ +00aa5e26f5f0ed4c10765e4b33b28a09 bubbros-1.6.tar.bz2