Hello community,
here is the log from the commit of package frozen-bubble
checked in at Fri Nov 7 15:07:03 CET 2008.
--------
--- frozen-bubble/frozen-bubble.changes 2008-06-27 20:42:03.000000000 +0200
+++ /mounts/work_src_done/STABLE/frozen-bubble/frozen-bubble.changes 2008-11-07 11:46:40.320058897 +0100
@@ -1,0 +2,11 @@
+Fri Nov 7 11:46:14 CET 2008 - sndirsch@suse.de
+
+- reviewed changes by Dirk Stöcker
+
+-------------------------------------------------------------------
+Tue Nov 4 12:00:00 CEST 2008 - opensuse@dstoecker.de
+
+- updated to 2.2.0 RC1 (removing two now integrated patches)
+- NOTE that connections to older FB servers are no longer possible
+
+-----------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
fb_autokick_command.diff
frozen-bubble-2.1.0_20080623.tar.bz2
malusdelay.patch
New:
----
de.po
frozen-bubble-2.2.0rc1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ frozen-bubble.spec ++++++
--- /var/tmp/diff_new_pack.R22930/_old 2008-11-07 15:06:22.000000000 +0100
+++ /var/tmp/diff_new_pack.R22930/_new 2008-11-07 15:06:22.000000000 +0100
@@ -1,10 +1,17 @@
#
-# spec file for package frozen-bubble (Version 2.1.0_20080623)
+# spec file for package frozen-bubble (Version 2.2.0rc1)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
@@ -14,11 +21,7 @@
Name: frozen-bubble
BuildRequires: Mesa-devel pango-devel
%if 0%{?suse_version}
-%if %suse_version > 930
BuildRequires: SDL_mixer-devel
-%else
-BuildRequires: SDL-devel SDL_mixer
-%endif
BuildRequires: SDL_Pango-devel SDL_image-devel SDL_perl update-desktop-files
%endif
%if 0%{?fedora_version}
@@ -32,7 +35,7 @@
Requires: perl = %{perl_version}
Requires: SDL_perl
AutoReqProv: on
-Version: 2.1.0_20080623
+Version: 2.2.0rc1
Release: 1
Summary: Puzzle with Bubbles
Source: %{name}-%{version}.tar.bz2
@@ -40,15 +43,20 @@
Source2: %name.png
Source3: suse_frozen2.png
Source4: fb-server
+Source5: de.po
Patch1: fb_keys.diff
-Patch2: fb_autokick_command.diff
-Patch3: malusdelay.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: %{name}-server = %{version}
%description
Shoot up bubbles. Similar to the console game Puzzle-Bobble.
+Colorful 3D rendered penguin animations, 100 levels of 1p game, hours
+and hours of 2p game, nights and nights of 2p/3p/4p/5p game over LAN or
+Internet, a level-editor, 3 professional quality digital soundtracks,
+15 stereo sound effects, 8 unique graphical transition effects, 8
+unique logo eye-candies.
+
Authors:
@@ -72,9 +80,9 @@
%prep
%setup -q
+cp %{SOURCE5} po/
+cp server/init/README server/README.init
%patch1 -p1
-%patch2 -p1
-%patch3 -p1
%build
make OPTIMIZE="$RPM_OPT_FLAGS" PREFIX=/usr INSTALLDIRS=vendor DATADIR=/usr/share LIBDIR=%{_libdir}
@@ -130,20 +138,27 @@
/usr/share/frozen-bubble/
%attr (644,root,root) %{_mandir}/man6/frozen-bubble.6.gz
%attr (644,root,root) %{_mandir}/man6/frozen-bubble-editor.6.gz
+%if 0%{?suse_version} >= 1100
%attr (644,root,root) %{_mandir}/man3/fb_net_discover.3pm.gz
+%endif
/usr/share/applications/%name.desktop
/usr/share/pixmaps/%name.png
%exclude /usr/share/frozen-bubble/gfx/gen
%files server
%defattr(-, root, root)
-%doc AUTHORS COPYING README
+%doc server/AUTHORS COPYING server/README* server/init/fb-server.conf
%defattr(755, root, root)
%{_libdir}/frozen-bubble/fb-server
/etc/init.d/fb-server
/usr/sbin/rcfb-server
%changelog
+* Fri Nov 07 2008 sndirsch@suse.de
+- reviewed changes by Dirk Stöcker
+* Tue Nov 04 2008 opensuse@dstoecker.de
+- updated to 2.2.0 RC1 (removing two now integrated patches)
+- NOTE that connections to older FB servers are no longer possible
* Fri Jun 27 2008 sndirsch@suse.de
- verified that dstoecker's changes are fine
* Fri Jun 27 2008 opensuse@dstoecker.de
@@ -168,7 +183,7 @@
- make no use of %%optipng macro on openSUSE 10.2 (Bug #326968)
* Mon Sep 10 2007 sndirsch@suse.de
- make use of %%optipng macro (Bug #309087)
-* Tue Dec 19 2006 sndirsch@suse.de
+* Mon Dec 18 2006 sndirsch@suse.de
- removed bogus %%post/%%postun scripts (Bug #229374)
* Tue Dec 12 2006 dmueller@suse.de
- add missing require for .desktop file
@@ -186,7 +201,7 @@
* multiplayer: you can view who's attacking you
* Tue Nov 07 2006 sndirsch@suse.de
- added missing mini images for the colourblind balls (Bug #218841)
-* Tue Nov 07 2006 sndirsch@suse.de
+* Mon Nov 06 2006 sndirsch@suse.de
- fixed file permissions
* Mon Oct 30 2006 sndirsch@suse.de
- fixed sever startup for LAN game
@@ -227,7 +242,7 @@
- added libmikmod to #neededforbuild
* Fri Jul 22 2005 sndirsch@suse.de
- added SDL_mixer-devel to #neededforbuild
-* Sat Mar 20 2004 sndirsch@suse.de
+* Fri Mar 19 2004 sndirsch@suse.de
- removed .orig files to fix build
* Mon Sep 22 2003 sndirsch@suse.de
- added 48x48 Icon as additional source
@@ -244,11 +259,11 @@
- added desktop file
* Sun Jul 13 2003 sndirsch@suse.de
- fixed build
-* Sat Jun 14 2003 sndirsch@suse.de
+* Fri Jun 13 2003 sndirsch@suse.de
- fixed filelist
* Wed Jun 04 2003 sndirsch@suse.de
- fixed filelist for non-i386 archs
-* Thu May 15 2003 sndirsch@suse.de
+* Wed May 14 2003 sndirsch@suse.de
- fixed filelist
* Wed Apr 16 2003 coolo@suse.de
- use BuildRoot
@@ -263,5 +278,5 @@
- added missing 'Requires: SDL_perl'
* Fri Oct 25 2002 sndirsch@suse.de
- fixed %%files section (use macros now)
-* Fri Oct 25 2002 sndirsch@suse.de
+* Thu Oct 24 2002 sndirsch@suse.de
- created package
++++++ de.po ++++++
++++ 731 lines (skipped)
++++++ fb_keys.diff ++++++
--- /var/tmp/diff_new_pack.R22930/_old 2008-11-07 15:06:23.000000000 +0100
+++ /var/tmp/diff_new_pack.R22930/_new 2008-11-07 15:06:23.000000000 +0100
@@ -1,7 +1,7 @@
diff -u -r frozen-bubble-2.1.0_20080620/frozen-bubble frozen-bubble-2.1.0_20080620_new/frozen-bubble
--- frozen-bubble-2.1.0_20080620/frozen-bubble 2008-06-20 12:18:34.000000000 +0200
+++ frozen-bubble-2.1.0_20080620_new/frozen-bubble 2008-06-20 12:18:43.000000000 +0200
-@@ -4944,18 +4944,18 @@
+@@ -5376,18 +5376,18 @@
my $change_keys = sub {
ask_from({ intro => [ t("Please enter new keys:") ],
entries => [
@@ -33,98 +33,68 @@
diff -u -r frozen-bubble-2.1.0_20080620/po/de.po frozen-bubble-2.1.0_20080620_new/po/de.po
--- frozen-bubble-2.1.0_20080620/po/de.po 2008-06-20 12:18:36.000000000 +0200
+++ frozen-bubble-2.1.0_20080620_new/po/de.po 2008-06-20 12:18:53.000000000 +0200
-@@ -603,45 +603,55 @@
- msgid "Please enter new keys:"
+@@ -686,44 +686,44 @@
msgstr "Bitte neue Tasten eingeben:"
--#: ../frozen-bubble:4654
+ #: ../frozen-bubble:5379
-msgid "Player 1; turn left?"
-msgstr "Spieler 1; nach links?"
--
--#: ../frozen-bubble:4655
++msgid "Player 1; turn left? (%s)"
++msgstr "Spieler 1; nach links (%s)?"
+
+ #: ../frozen-bubble:5380
-msgid "Player 1; turn right?"
-msgstr "Spieler 1; nach rechts?"
--
--#: ../frozen-bubble:4656
++msgid "Player 1; turn right (%s)?"
++msgstr "Spieler 1; nach rechts (%s)?"
+
+ #: ../frozen-bubble:5381
-msgid "Player 1; fire?"
-msgstr "Spieler 1; schiessen?"
--
--#: ../frozen-bubble:4657
++msgid "Player 1; fire (%s)?"
++msgstr "Spieler 1; schiessen (%s)?"
+
+ #: ../frozen-bubble:5382
-msgid "Player 1; center?"
-msgstr "Spieler 1; zentrieren?"
--
--#: ../frozen-bubble:4659
++msgid "Player 1; center (%s)?"
++msgstr "Spieler 1; zentrieren (%s)?"
+
+ #: ../frozen-bubble:5384
-msgid "Player 2; turn left?"
-msgstr "Spieler 2; nach links?"
--
--#: ../frozen-bubble:4660
++msgid "Player 2; turn left (%s)?"
++msgstr "Spieler 2; nach links (%s)?"
+
+ #: ../frozen-bubble:5385
-msgid "Player 2; turn right?"
-msgstr "Spieler 2; nach rechts?"
--
--#: ../frozen-bubble:4661
++msgid "Player 2; turn right (%s)?"
++msgstr "Spieler 2; nach rechts (%s)?"
+
+ #: ../frozen-bubble:5386
-msgid "Player 2; fire?"
-msgstr "Spieler 2; schiessen?"
--
--#: ../frozen-bubble:4662
++msgid "Player 2; fire (%s)?"
++msgstr "Spieler 2; schiessen (%s)?"
+
+ #: ../frozen-bubble:5387
-msgid "Player 2; center?"
-msgstr "Spieler 2; zentrieren?"
--
--#: ../frozen-bubble:4664
++msgid "Player 2; center (%s)?"
++msgstr "Spieler 2; zentrieren (%s)?"
+
+ #: ../frozen-bubble:5389
-msgid "Toggle fullscreen?"
-msgstr "Auf Vollbild umschalten?"
--
--#: ../frozen-bubble:4665
++msgid "Toggle fullscreen (%s)?"
++msgstr "Auf Vollbild umschalten (%s)?"
+
+ #: ../frozen-bubble:5390
-msgid "Chat (net/lan game)?"
-msgstr "Chat (Internet/Netzwerk Spiel)?"
-+#: ../frozen-bubble:4893
-+#, perl-format
-+msgid "Player 1; turn left (%s)?"
-+msgstr "Spieler 1; nach links (%s)?"
-+
-+#: ../frozen-bubble:4894
-+#, perl-format
-+msgid "Player 1; turn right (%s)?"
-+msgstr "Spieler 1; nach rechts (%s)?"
-+
-+#: ../frozen-bubble:4895
-+#, perl-format
-+msgid "Player 1; fire (%s)?"
-+msgstr "Spieler 1; schiessen (%s)?"
-+
-+#: ../frozen-bubble:4896
-+#, perl-format
-+msgid "Player 1; center (%s)?"
-+msgstr "Spieler 1; zentrieren (%s)?"
-+
-+#: ../frozen-bubble:4898
-+#, perl-format
-+msgid "Player 2; turn left (%s)?"
-+msgstr "Spieler 2; nach links (%s)?"
-+
-+#: ../frozen-bubble:4899
-+#, perl-format
-+msgid "Player 2; turn right (%s)?"
-+msgstr "Spieler 2; nach rechts (%s)?"
-+
-+#: ../frozen-bubble:4900
-+#, perl-format
-+msgid "Player 2; fire (%s)?"
-+msgstr "Spieler 2; schiessen (%s)?"
-+
-+#: ../frozen-bubble:4901
-+#, perl-format
-+msgid "Player 2; center (%s)?"
-+msgstr "Spieler 2; zentrieren (%s)?"
-+
-+#: ../frozen-bubble:4903
-+#, perl-format
-+msgid "Toggle fullscreen (%s)?"
-+msgstr "Vollbild (%s)?"
-+
-+#: ../frozen-bubble:4904
-+#, perl-format
-+msgid "Chat in net game (%s)?"
-+msgstr "Chat im Netzspiel (%s)?"
++msgid "Chat (net/lan game) (%s)?"
++msgstr "Chat (Internet/Netzwerk Spiel) (%s)?"
- #: ../frozen-bubble:4667
+ #: ../frozen-bubble:5392
msgid "Thanks!"
++++++ fb-server ++++++
--- /var/tmp/diff_new_pack.R22930/_old 2008-11-07 15:06:23.000000000 +0100
+++ /var/tmp/diff_new_pack.R22930/_new 2008-11-07 15:06:23.000000000 +0100
@@ -16,10 +16,12 @@
# Required-Stop: $network $syslog
# Default-Start: 3 5
# Default-Stop: 0 1 2 4 6
-# Description: Frozen Bubble server
+# Description: Frozen Bubble multiple server autohandler
+# Short-Description: Frozen Bubble server
### END INIT INFO
FB_SERVER_BIN=/usr/lib/frozen-bubble/fb-server
+FB_USER=nobody
test -x $FB_SERVER_BIN || exit 5
# Shell functions sourced from /etc/rc.status:
@@ -58,22 +60,31 @@
CMD=`ps -A -o %a --no-headers |grep -e "nice -10 $FB_SERVER_BIN -c $file" | grep -v grep`
if [ -z "$CMD" ]; then
echo -n "Starting Frozen bubble server ($file)"
- su -l fbuser -s /bin/sh -c "$FB_SERVER_BIN -c $file >/dev/null"
+ su -l $FB_USER -s /bin/sh -c "$FB_SERVER_BIN -c $file >/dev/null"
rc_status -v
fi
done
- ;;
+ ;;
stop)
for file in $CONFFILES; do
CMD=`ps -A -o %p%a --no-headers |grep -e "$FB_SERVER_BIN -c $file" | grep -v grep`
PID=`echo $CMD | perl -pe 's/^ *(\d+) .*$/$1/'`
if [ "$PID" ]; then
- echo -n "Shutting down Frozen bubble server ($file)"
+ echo -n "Shutting down Frozen bubble server ($file)"
kill -TERM $PID
rc_status -v
fi
done
- ;;
+ ;;
+ reload) # no reloading possible, do a restart
+ ## Stop the service and regardless of whether it was
+ ## running or not, start it again.
+ $0 stop
+ sleep 2
+ $0 start
+ # Remember status and be quiet
+ rc_status
+ ;;
restart)
## Stop the service and regardless of whether it was
## running or not, start it again.
@@ -84,9 +95,9 @@
rc_status
;;
*)
- echo "Usage: $0 {start|stop|restart}"
- exit 1
- ;;
+ echo "Usage: $0 {start|stop|restart|reload}"
+ exit 1
+ ;;
esac
rc_exit
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org