Hello community, here is the log from the commit of package frozen-bubble for openSUSE:Factory checked in at 2012-12-21 09:28:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/frozen-bubble (Old) and /work/SRC/openSUSE:Factory/.frozen-bubble.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "frozen-bubble", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/frozen-bubble/frozen-bubble.changes 2012-02-21 12:18:37.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.frozen-bubble.new/frozen-bubble.changes 2012-12-21 09:28:39.000000000 +0100 @@ -1,0 +2,15 @@ +Thu Dec 20 09:14:24 UTC 2012 - [email protected] + +- Added missing BuildRequirements +- Created unused-result patch +- Build manifest + +------------------------------------------------------------------- +Wed Sep 19 19:05:31 UTC 2012 - [email protected] + +- update to 2.212 (2.2.1beta1) + * use new SDL Perl API + * ported to CPAN; should now work "natively" on Windows and Mac OSX + * integrates all functional openSUSE patches + +------------------------------------------------------------------- Old: ---- frozen-bubble-2.2.0-german.patch frozen-bubble-2.2.0-keys.patch frozen-bubble-2.2.0-total_launched_bubbles.patch frozen-bubble-2.2.0.tar.bz2 New: ---- frozen-bubble-2.212-configpath.patch frozen-bubble-2.212-unused-result.patch frozen-bubble-2.212_20121024.tar.bz2 msgfmt.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ frozen-bubble.spec ++++++ --- /var/tmp/diff_new_pack.p5Esp6/_old 2012-12-21 09:28:42.000000000 +0100 +++ /var/tmp/diff_new_pack.p5Esp6/_new 2012-12-21 09:28:42.000000000 +0100 @@ -17,43 +17,53 @@ Name: frozen-bubble -Version: 2.2.0 +# 2.212 == 2.2.1beta1 +Version: 2.212 Release: 0 Summary: Puzzle with Bubbles License: GPL-2.0+ Group: Amusements/Games/Action/Arcade Url: http://www.frozen-bubble.org/ -Source: %{name}-%{version}.tar.bz2 +Source: %{name}-%{version}_20121024.tar.bz2 Source1: %{name}.desktop Source2: %{name}.png Source3: suse_frozen2.png Source4: fb-server -Patch1: frozen-bubble-2.2.0-keys.patch -Patch2: frozen-bubble-2.2.0-german.patch -Patch3: frozen-bubble-2.2.0-total_launched_bubbles.patch +# PATCH-FIX-OPENSUSE frozen-bubble-2.212-configpath.patch +Patch1: frozen-bubble-2.212-configpath.patch +# PATCH-FIX-OPENSUSE msgfmt.diff +Patch2: msgfmt.diff +# PATCH-FIX-UPSTREAM frozen-bubble-2.212-unused-result.patch +Patch3: frozen-bubble-2.212-unused-result.patch BuildRequires: Mesa-devel BuildRequires: SDL_Pango-devel BuildRequires: SDL_image-devel BuildRequires: SDL_mixer-devel -BuildRequires: pango-devel -%if 0%{?suse_version} && 0%{?suse_version} > 1010 BuildRequires: fdupes -BuildRequires: perl-SDL_Perl >= 2.1.3 +BuildRequires: perl-SDL >= 2.400 BuildRequires: update-desktop-files -Requires(pre): %fillup_prereq -Requires(pre): %insserv_prereq -Requires(pre): net-tools -Requires: perl-SDL_Perl >= 2.1.3 -%endif -%if 0%{?fedora_version} -BuildRequires: gettext -BuildRequires: perl-SDL >= 2.1.3 -BuildRequires: glib2-devel -Requires: perl-SDL >= 2.1.3 -%endif +BuildRequires: perl(Alien::SDL) +BuildRequires: perl(Compress::Bzip2) +BuildRequires: perl(File::Slurp) +BuildRequires: perl(IPC::System::Simple) +BuildRequires: perl(Locale::Maketext::Extract) +BuildRequires: perl(Locale::Maketext::Lexicon) +BuildRequires: perl(Locale::Maketext::Simple) +BuildRequires: perl(Locale::Msgfmt) +BuildRequires: perl(Tie::Simple) +BuildRequires: pkgconfig(pango) Requires: %{name}-server = %{version} Requires: perl = %{perl_version} +Requires: perl-SDL >= 2.400 +Requires: perl(Alien::SDL) +Requires: perl(Compress::Bzip2) +Requires: perl(Locale::Maketext::Lexicon) +Requires: perl(Locale::Maketext::Simple) +Requires: perl(Tie::Simple) BuildRoot: %{_tmppath}/%{name}-%{version}-build +Requires(pre): %fillup_prereq +Requires(pre): %insserv_prereq +Requires(pre): net-tools %description Shoot up bubbles. Similar to the console game Puzzle-Bobble. @@ -83,56 +93,34 @@ %patch3 -p1 %build -export CPPFLAGS="%{optflags}" -export CFLAGS="%{optflags}" -%if 0%{?suse_version} <= 1010 -pushd server -%endif -make OPTIMIZE="%{optflags}" PREFIX=%{_prefix} INSTALLDIRS=vendor DATADIR=%{_datadir} LIBDIR=%{_libdir} -%if 0%{?suse_version} <= 1010 -popd -%endif +perl Build.PL destdir=%{buildroot} installdirs=vendor --prefix=%{_prefix} +./Build manifest +./Build + +%check +./Build test %install -%if 0%{?suse_version} <= 1010 -pushd server -%endif -make install DESTDIR=%{buildroot} PREFIX=/usr DATADIR=/usr/share LIBDIR=%{_libdir} -%if 0%{?suse_version} <= 1010 -popd -%endif -# install server part +install -d -m 1755 %{buildroot}%{_datadir}/%{name} +./Build install + +mv %{buildroot}%{perl_vendorarch}/auto/share/dist/Games-FrozenBubble/* %{buildroot}%{_datadir}/%{name}/ + +mkdir -p %{buildroot}%{_datadir}/pixmaps/ +install -m 644 $RPM_SOURCE_DIR/%{name}.png %{buildroot}%{_datadir}/pixmaps + mkdir -p %{buildroot}/%{_sysconfdir}/init.d %{buildroot}/%{_sbindir} -sed "s+\(FB_SERVER_BIN=\).*+\1%{_libdir}/frozen-bubble/fb-server+" %{SOURCE4} >%{buildroot}/%{_sysconfdir}/init.d/frozen-bubble-server -sed "s+\(FLPATH = '\).*'+\1%{_libdir}/frozen-bubble'+" c_stuff/lib/fb_stuff.pm >c_stuff/lib/fb_stuff.pm_ +install -m 755 %{SOURCE4} %{buildroot}/%{_sysconfdir}/init.d/frozen-bubble-server ln -s /etc/init.d/frozen-bubble-server %{buildroot}%{_sbindir}/rcfb-server ln -s /etc/init.d/frozen-bubble-server %{buildroot}%{_sbindir}/rcfrozen-bubble-server -install -d -m 1755 %{buildroot}%{_localstatedir}/run/fb-server +install -d -m 755 %{buildroot}/%{_sysconfdir} touch %{buildroot}/%{_sysconfdir}/fb-server.conf -%if 0%{?suse_version} <= 1010 -exit 0 -%endif -%if 0%{?suse_version} > 1010 -%perl_process_packlist -%endif -%if 0%{?suse_version} < 1140 -rm %{buildroot}%{perl_vendorarch}/auto/fb_c_stuff/.packlist -rm %{buildroot}%{_localstatedir}/adm/perl-modules/frozen-bubble -%endif -mv c_stuff/lib/fb_stuff.pm_ c_stuff/lib/fb_stuff.pm -mkdir -p %{buildroot}%{_datadir}/pixmaps/ -install -m 644 $RPM_SOURCE_DIR/%{name}.png %{buildroot}%{_datadir}/pixmaps -%if 0%{?suse_version} + +install -d -m 1755 %{buildroot}%{_localstatedir}/run/fb-server + %suse_update_desktop_file -i %{name} Game ArcadeGame %fdupes %{buildroot}${_datadir} -%endif -chmod 644 %{buildroot}%{_mandir}/man6/frozen-bubble.6 \ - %{buildroot}%{_mandir}/man6/frozen-bubble-editor.6 -%find_lang %{name} - -%clean -rm -rf %{buildroot} -%if 0%{?suse_version} +%perl_process_packlist %post server %{fillup_and_insserv -f frozen-bubble-server} @@ -167,39 +155,32 @@ %postun server %restart_on_update frozen-bubble-server %insserv_cleanup -%endif -%if ! 0%{?suse_version} || 0%{?suse_version} > 1010 -%files -f %{name}.lang +%files %defattr(-, root, root) %doc AUTHORS COPYING README -%dir %{perl_vendorarch}/auto/fb_c_stuff -%dir %{_libdir}/frozen-bubble -%{perl_vendorarch}/FBLE.pm -%{perl_vendorarch}/auto/fb_c_stuff/fb_c_stuff.bs -%{perl_vendorarch}/auto/fb_c_stuff/fb_c_stuff.so -%{perl_vendorarch}/fb_c_stuff.pm -%{perl_vendorarch}/fb_config.pm -%{perl_vendorarch}/fb_net.pm -%{perl_vendorarch}/fb_stuff.pm -%{perl_vendorarch}/fbsyms.pm -%{perl_vendorarch}/fb_net_discover.pm -%{_bindir}/frozen-bubble +%dir %{perl_vendorarch}/Games +%dir %{perl_vendorarch}/Games/FrozenBubble +%dir %{perl_vendorarch}/auto/Games +%dir %{perl_vendorarch}/auto/Games/FrozenBubble +%{perl_vendorarch}/Games/FrozenBubble/* +%{perl_vendorarch}/Games/FrozenBubble.pm +%{perl_vendorarch}/auto/Games/FrozenBubble/CStuff* +%{_bindir}/%{name} %{_bindir}/frozen-bubble-editor -%{_datadir}/frozen-bubble/ -%attr (644,root,root) %{_mandir}/man6/frozen-bubble.6.gz -%attr (644,root,root) %{_mandir}/man6/frozen-bubble-editor.6.gz +%{_datadir}/%{name}/ +%exclude %{_datadir}/%{name}/locale/*.po +%attr (644,root,root) %{_mandir}/man*/frozen-bubble* +%attr (644,root,root) %{_mandir}/man*/Games* %{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/%{name}.png -%exclude %{_datadir}/frozen-bubble/gfx/gen -%endif %files server %defattr(-, root, root) %doc server/AUTHORS COPYING server/README* server/init/fb-server.conf %ghost %config(noreplace) %{_sysconfdir}/fb-server.conf %defattr(755, root, root) -%{_libdir}/frozen-bubble/fb-server +%{_bindir}/fb-server %{_sysconfdir}/init.d/frozen-bubble-server %{_sbindir}/rcfb-server %{_sbindir}/rcfrozen-bubble-server ++++++ fb-server ++++++ --- /var/tmp/diff_new_pack.p5Esp6/_old 2012-12-21 09:28:42.000000000 +0100 +++ /var/tmp/diff_new_pack.p5Esp6/_new 2012-12-21 09:28:42.000000000 +0100 @@ -22,7 +22,7 @@ # them with this init script. ### END INIT INFO -FB_SERVER_BIN=/usr/lib/frozen-bubble/fb-server +FB_SERVER_BIN=/usr/bin/fb-server FB_USER=nobody test -x $FB_SERVER_BIN || { echo "$FB_SERVER_BIN not installed"; ++++++ frozen-bubble-2.212-configpath.patch ++++++ diff -ur frozen-bubble-2.212/lib/Games/FrozenBubble/Config.pm frozen-bubble-2.212_fix/lib/Games/FrozenBubble/Config.pm --- frozen-bubble-2.212/lib/Games/FrozenBubble/Config.pm 2012-03-11 19:49:35.000000000 +0100 +++ frozen-bubble-2.212_fix/lib/Games/FrozenBubble/Config.pm 2012-09-19 19:38:05.419853533 +0200 @@ -5,6 +5,6 @@ use vars qw(@ISA @EXPORT $FPATH $FLPATH); @ISA = qw(Exporter); @EXPORT = qw($FPATH $FLPATH); -$FPATH = dist_dir('Games-FrozenBubble'); +$FPATH = "/usr/share/frozen-bubble"; $FLPATH = File::Which::which('fb-server'); 1; ++++++ frozen-bubble-2.212-unused-result.patch ++++++ diff -Naur frozen-bubble-2.212.orig/server/tools.c frozen-bubble-2.212/server/tools.c --- frozen-bubble-2.212.orig/server/tools.c 2012-10-24 19:53:38.000000000 +0200 +++ frozen-bubble-2.212/server/tools.c 2012-12-20 10:08:37.398020046 +0100 @@ -261,8 +261,12 @@ if (user_to_switch != NULL) { struct passwd* user = getpwnam(user_to_switch); if (user) { - setgid(user->pw_gid); - setuid(user->pw_uid); + if(setgid(user->pw_gid) == -1) { + printf("failed to set gid\n"); + } + if(setuid(user->pw_uid) == -1) { + printf("failed to set uid\n"); + } } else { l2(OUTPUT_TYPE_ERROR, "Cannot switch user to %s: %s", user_to_switch, strerror(errno)); } ++++++ msgfmt.diff ++++++ diff -ur frozen-bubble-2.212/Build.PL frozen-bubble-2.212_fix/Build.PL --- frozen-bubble-2.212/Build.PL 2012-10-24 19:53:38.000000000 +0200 +++ frozen-bubble-2.212_fix/Build.PL 2012-10-31 23:08:54.479237399 +0100 @@ -116,7 +116,7 @@ 'File::Slurp' => 0, 'Compress::Bzip2' => 0, 'IPC::System::Simple' => 0, - + 'Locale::Msgfmt' => '0.14', }, requires => { 'perl' => '5.008', @@ -135,7 +135,7 @@ 'SDL' => '2.511', 'Time::HiRes' => 0, 'Locale::Maketext::Simple' => 0, - 'Locale::Maketext::Extract' => 0, + 'Tie::Simple' => 0, 'File::Glob' => 0, 'File::Which' => 0, 'Compress::Bzip2' => 0, diff -ur frozen-bubble-2.212/inc/My/Builder.pm frozen-bubble-2.212_fix/inc/My/Builder.pm --- frozen-bubble-2.212/inc/My/Builder.pm 2012-10-24 19:53:38.000000000 +0200 +++ frozen-bubble-2.212_fix/inc/My/Builder.pm 2012-10-31 23:20:34.863408331 +0100 @@ -8,10 +8,12 @@ use File::Slurp qw(read_file write_file); use File::Spec::Functions qw(catdir catfile rootdir); use IO::File qw(); +use Alien::SDL; use Module::Build '0.36' => qw(); use autodie qw(:all move read_file write_file); use parent 'Module::Build'; use Locale::Maketext::Extract; +use Locale::Msgfmt; use lib 'lib'; use Games::FrozenBubble; @@ -44,6 +46,7 @@ my ($self) = @_; #$self->depends_on('messages'); #temporarily disabled by kmx, the new ACTION_messages() needs more testing $self->depends_on('server'); + msgfmt({in => "share/locale/", out => "share/locale/"}); $self->SUPER::ACTION_build; return; } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
