rpms/frozen-bubble/FC-5 fb-server.init, NONE, 1.1 .cvsignore, 1.2, 1.3 frozen-bubble.spec, 1.2, 1.3 sources, 1.2, 1.3 filter-depends.sh, 1.1, NONE filter-provides.sh, 1.1, NONE frozen-bubble-1.0.0-FBLE.pm.patch, 1.1, NONE frozen-bubble-1.0.0-perl-SDL.patch, 1.1, NONE frozen-bubble-build.patch, 1.1, NONE frozen-bubble-debian.patch, 1.1, NONE

Matthias Saou (thias) fedora-extras-commits at redhat.com
Tue Nov 14 12:19:06 UTC 2006 

Author: thias

Update of /cvs/extras/rpms/frozen-bubble/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6775/FC-5

Modified Files:
	.cvsignore frozen-bubble.spec sources 
Added Files:
	fb-server.init 
Removed Files:
	filter-depends.sh filter-provides.sh 
	frozen-bubble-1.0.0-FBLE.pm.patch 
	frozen-bubble-1.0.0-perl-SDL.patch frozen-bubble-build.patch 
	frozen-bubble-debian.patch 
Log Message:
Update to 2.0.0.



--- NEW FILE fb-server.init ---
#!/bin/sh
#
# fb-server      Frozen-Bubble server
#
# chkconfig: - 99 01
# description: this is the Frozen-Bubble server; it allows people to play \
#              Frozen-Bubble over the Internet.
# processname: fb-server
# pidfile: /var/run/fb-server.pid
# config: /etc/fb-server*.conf

# Source function library.
. /etc/rc.d/init.d/functions

# Source networking configuration.
. /etc/sysconfig/network

conffiles=/etc/fb-server*.conf
servicename=fb-server

# Check that networking is up.
[ ${NETWORKING} = "no" ] && exit 0

start() {
	echo -n $"Starting Frozen Bubble server(s): "
        ATLEASTONE=-1
        for file in $conffiles; do
            daemon --user fbubble "fb-server -c $file &>/dev/null"
            RETVAL=$?
            if [ "$ATLEASTONE" -ne 0 ]; then
                ATLEASTONE=$RETVAL
            fi
            echo
        done
	if [ $ATLEASTONE -eq 0 ]; then
            touch /var/lock/subsys/$servicename
        fi
	return $ATLEASTONE
}

stop() {
	echo -n $"Stopping Frozen Bubble server(s): "
        killproc fb-server
	RETVAL=$?
	echo
	if [ $RETVAL -eq 0 ]; then
            rm -f /var/lock/subsys/$servicename
        fi
	return $RETVAL
}

restart() {
	stop
	start
}

# See how we were called.
case "$1" in
  start)
	start
	;;
  stop)
	stop
	;;
  restart)
	restart
	;;
  status)
        status fb-server
        RETVAL=$?
        ;;
  condrestart)
	[ -f /var/lock/subsys/$servicename ] && restart || :
	;;
  *)
	echo $"Usage: $0 {start|stop|restart|status|condrestart}"
	exit 1
esac

exit $RETVAL


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/frozen-bubble/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Aug 2006 05:26:10 -0000	1.2
+++ .cvsignore	14 Nov 2006 12:18:36 -0000	1.3
@@ -1 +1 @@
-frozen-bubble-1.0.0.tar.bz2
+frozen-bubble-2.0.0.tar.bz2


Index: frozen-bubble.spec
===================================================================
RCS file: /cvs/extras/rpms/frozen-bubble/FC-5/frozen-bubble.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- frozen-bubble.spec	28 Aug 2006 11:26:03 -0000	1.2
+++ frozen-bubble.spec	14 Nov 2006 12:18:36 -0000	1.3
@@ -1,30 +1,19 @@
 Summary:        Frozen Bubble arcade game
 Name:           frozen-bubble
-Version:        1.0.0
-Release:        10%{?dist}
+Version:        2.0.0
+Release:        1%{?dist}
 License:        GPL
 Group:          Amusements/Games
-Source0:        http://zarb.org/~gc/fb/frozen-bubble-1.0.0.tar.bz2
+Source0:        http://www.frozen-bubble.org/data/frozen-bubble-%{version}.tar.bz2
 Source1:        frozen-bubble.desktop
-Source2:        filter-depends.sh
-Source3:        filter-provides.sh
-Patch0:         %{name}-build.patch
-Patch1:         %{name}-debian.patch
-Patch2:         %{name}-1.0.0-FBLE.pm.patch
-Patch3:         %{name}-1.0.0-perl-SDL.patch
+Source2:        fb-server.init
 URL:            http://www.frozen-bubble.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  perl-SDL >= 2.1.3, SDL_mixer-devel, desktop-file-utils
+BuildRequires:  perl-SDL >= 2.1.3, SDL_mixer-devel, SDL_Pango-devel
+BuildRequires:  glib2-devel, gettext, desktop-file-utils
 Requires:       perl-SDL >= 2.1.3
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
-# hack filter out the autogenerated Provides for our private perl modules
-# (which are installed outside the perlvendorroot) and also filter out
-# the matching AutoRequires to still get an installable package
-%define _use_internal_dependency_generator 0
-%define __find_requires %{SOURCE2}
-%define __find_provides %{SOURCE3}
-
 %description
 Full-featured, colorful animated penguin eyecandy, 100 levels of 1p game, hours
 and hours of 2p game, 3 professional quality 20-channels musics, 15 stereo
@@ -32,31 +21,51 @@
 You need this game.
 
 
+%package server
+Summary: Frozen Bubble network game dedicated server
+Group: System Environment/Daemons
+
+%description server
+Frozen Bubble network game dedicated server. The server is already included
+with the game in order to be launched automatically for LAN games, so you
+only need to install this package if you want to run a fully dedicated
+Frozen Bubble network game server.
+
+
 %prep
 %setup -q
-%patch0 -p0 -z .build
-%patch1 -p1 -z .deb
-# no backups for this patch otherwise they end up getting installed
-%patch2 -p0
-%patch3 -p0 -z .perl-SDL
-# The "min 1.19.0" requirement check for perl-SDL is broken
-sed -i 's|@if ! perl.*||g' Makefile
 # Add a directory to the module path for the app's private perl modules
 sed -ie "s#use fb_stuff;#use lib qw(%{_libdir}/%{name}/perl);\n&#" frozen-bubble
 sed -ie "s#use fb_stuff;#use lib qw(%{_libdir}/%{name}/perl);\n&#" frozen-bubble-editor
+# Rename this README since the main server README has the same name
+mv server/init/README server/README.init
+# Change the example server configuration file to be a working one, which only
+# launches a LAN server and doesn't try to register itself on the Internet
+sed -ie "s#^a .*#z\nq\nL#" server/init/fb-server.conf
 
 
 %build
-make %{?_smp_mflags} OPTIMIZE="${RPM_OPT_FLAGS}" PREFIX="%{_prefix}" \
-  INSTALLDIRS=vendor
+make %{?_smp_mflags} \
+    OPTIMIZE="${RPM_OPT_FLAGS}" \
+    CFLAGS="${RPM_OPT_FLAGS} `pkg-config glib-2.0 --cflags`" \
+    LIBS="`pkg-config glib-2.0 --libs`" \
+    PREFIX=%{_prefix} \
+    LIBDIR=%{_libexecdir} \
+    DATADIR=%{_datadir} \
+    INSTALLDIRS=vendor
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install PREFIX=$RPM_BUILD_ROOT%{_prefix} \
-  PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/{build_fbsyms,perllocal.pod}
-find $RPM_BUILD_ROOT -name .xvpics | xargs rm -rf
+make install \
+    PREFIX=%{_prefix} \
+    LIBDIR=%{_libexecdir} \
+    DATADIR=%{_datadir} \
+    DESTDIR=$RPM_BUILD_ROOT
+%find_lang %{name}
+
+# Clean up unneeded files
+rm -f `find $RPM_BUILD_ROOT -name perllocal.pod`
 chmod -R u+w $RPM_BUILD_ROOT/*
 rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/auto/fb_c_stuff/.packlist
 rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/auto/fb_c_stuff/fb_c_stuff.bs
@@ -66,22 +75,29 @@
 mv $RPM_BUILD_ROOT%{perl_vendorarch}/auto $RPM_BUILD_ROOT%{_libdir}/%{name}/perl
 mv $RPM_BUILD_ROOT%{perl_vendorarch}/*.pm $RPM_BUILD_ROOT%{_libdir}/%{name}/perl
 
-# below is the desktop file and icon stuff.
+# Desktop file and icon stuff
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora            \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora                       \
   %{SOURCE1}
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
-install -p -m 644 icons/frozen-bubble-icon-16x16.png \
+install -D -p -m 644 icons/frozen-bubble-icon-16x16.png \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
-install -p -m 644 icons/frozen-bubble-icon-32x32.png \
+install -D -p -m 644 icons/frozen-bubble-icon-32x32.png \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
-install -p -m 644 icons/frozen-bubble-icon-48x48.png \
+install -D -p -m 644 icons/frozen-bubble-icon-48x48.png \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
 
+# Install server init script and default configuration
+install -D -p -m 755 %{SOURCE2} \
+    $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/fb-server
+install -D -p -m 644 server/init/fb-server.conf \
+    $RPM_BUILD_ROOT%{_sysconfdir}/fb-server.conf
+
+# Duplicate the server (it's tiny) to be used in both the game and standalone
+# server package
+cp -a $RPM_BUILD_ROOT%{_libexecdir}/%{name}/fb-server \
+      $RPM_BUILD_ROOT%{_bindir}/
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -100,18 +116,48 @@
 fi
 
 
-%files
+%post server
+/usr/sbin/useradd -r -s /sbin/nologin -d / fbubble || :
+/sbin/chkconfig --add fb-server
+
+%preun server
+if [ $1 -eq 0 ]; then
+    /sbin/service fb-server stop &>/dev/null || :
+    /sbin/chkconfig --del fb-server
+fi
+
+%postun server
+/usr/sbin/userdel fbubble || :
+if [ $1 -ge 1 ]; then
+    /sbin/service fb-server condrestart &>/dev/null || :
+fi
+
+
+%files -f %{name}.lang
 %defattr(-, root, root)
-%doc AUTHORS CHANGES COPYING README
+%doc AUTHORS COPYING NEWS README TIPS
 %{_bindir}/%{name}*
-%{_libdir}/%{name}
-%{_datadir}/%{name}
+%{_libdir}/%{name}/
+%{_libexecdir}/%{name}/
+%{_datadir}/%{name}/
 %{_mandir}/man6/%{name}*.6.gz
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
 
+%files server
+%defattr(-, root, root)
+%doc COPYING server/AUTHORS server/README*
+%config(noreplace) %{_sysconfdir}/fb-server.conf
+%{_sysconfdir}/rc.d/init.d/fb-server
+%{_bindir}/fb-server
+
 
 %changelog
+* Fri Oct 27 2006 Matthias Saou <http://freshrpms.net/> 2.0.0-1
+- Update to 2.0.0.
+- Add new SDL_Pango dependency.
+- New server standalone sub-package for the dedicated server.
+
 * Mon Aug 28 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0.0-10
 - FE6 Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/frozen-bubble/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Aug 2006 05:26:10 -0000	1.2
+++ sources	14 Nov 2006 12:18:36 -0000	1.3
@@ -1 +1 @@
-2be5ead2aee72adc3fb643630a774b59  frozen-bubble-1.0.0.tar.bz2
+9fdd84f56e5221e6c58c12eab72459d9  frozen-bubble-2.0.0.tar.bz2


--- filter-depends.sh DELETED ---


--- filter-provides.sh DELETED ---


--- frozen-bubble-1.0.0-FBLE.pm.patch DELETED ---


--- frozen-bubble-1.0.0-perl-SDL.patch DELETED ---


--- frozen-bubble-build.patch DELETED ---


--- frozen-bubble-debian.patch DELETED ---

More information about the fedora-extras-commits mailing list