rpms/frozen-bubble/devel filter-depends.sh, NONE, 1.1 filter-provides.sh, NONE, 1.1 frozen-bubble-1.0.0-FBLE.pm.patch, NONE, 1.1 frozen-bubble-1.0.0-perl-SDL.patch, NONE, 1.1 frozen-bubble-build.patch, NONE, 1.1 frozen-bubble-debian.patch, NONE, 1.1 frozen-bubble.desktop, NONE, 1.1 frozen-bubble.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Sat Aug 26 05:26:10 UTC 2006
Author: jwrdegoede
Update of /cvs/extras/rpms/frozen-bubble/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18940/devel
Modified Files:
.cvsignore sources
Added 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 frozen-bubble.desktop
frozen-bubble.spec
Log Message:
auto-import frozen-bubble-1.0.0-9 on branch devel from frozen-bubble-1.0.0-9.src.rpm
--- NEW FILE filter-depends.sh ---
#!/bin/sh
/usr/lib/rpm/redhat/find-requires "$@" | grep -vE \
'^perl\(FBLE\)$|^perl\(fb.*\).*$'
--- NEW FILE filter-provides.sh ---
#!/bin/sh
/usr/lib/rpm/redhat/find-provides "$@" | grep -vE \
'^perl\(FBLE\)$|^perl\(fb.*\).*$'
frozen-bubble-1.0.0-FBLE.pm.patch:
--- NEW FILE frozen-bubble-1.0.0-FBLE.pm.patch ---
--- c_stuff/lib/FBLE.pm 2003-02-16 18:14:28.000000000 -0500
+++ FBLE.pm 2004-02-06 12:32:57.000000000 -0500
@@ -1094,11 +1094,11 @@
$rect{screenshot} = SDL::Rect->new(-x => $POS_1P{p1}{left_limit} - 40, '-y' => 0,
-width => $POS_1P{p1}{right_limit} - $POS_1P{p1}{left_limit} + 80,
-height => $POS_1P{bottom_limit} - $POS_1P{init_top_limit} + 190);
- fb_c_stuff::shrink($app->{-surface},
- $file_browser_screenshots[$list_browser_highlight_offset]->display_format()->{-surface},
+ fb_c_stuff::shrink($$app,
+ ${$file_browser_screenshots[$list_browser_highlight_offset]->display_format()},
$rect{middle}->x + $rect{middle}->width - $rect{screenshot}->width/4 - 12,
$rect{middle}->y + $rect{middle}->height/2 - $rect{screenshot}->height/8 - 3,
- $rect{screenshot}{-rect}, 4);
+ ${$rect{screenshot}}, 4);
}
@@ -1371,7 +1371,7 @@
$rect{ls_name_erase} = SDL::Rect->new(-x => 195, '-y' => 0, -width => 445-195, -height => 35);
$background->blit($rect{ls_name_erase}, $app, $rect{ls_name_erase});
$app->update;
- $app->print(($background->width - SDL_TEXTWIDTH(uc($levelset_name)))/2 - 6, 7, uc($levelset_name));
+ $app->print(($background->width - SDL::SFont::SDL_TEXTWIDTH(uc($levelset_name)))/2 - 6, 7, uc($levelset_name));
}
sub print_text_generic {
frozen-bubble-1.0.0-perl-SDL.patch:
--- NEW FILE frozen-bubble-1.0.0-perl-SDL.patch ---
--- ../../Builds/frozen-bubble-1.0.0/frozen-bubble 2003-02-16 18:45:27.000000000 -0500
+++ frozen-bubble 2004-02-06 12:33:08.000000000 -0500
@@ -50,6 +50,7 @@
use SDL;
use SDL::App;
+use SDL::SFont;
use SDL::Surface;
use SDL::Event;
use SDL::Cursor;
@@ -179,7 +180,7 @@
$elem or return -1;
-f $elem or return 0;
$mus = SDL::Music->new($elem);
- if ($mus->{-data}) {
+ if ($$mus) {
print STDERR "[Playlist] playing `$elem'\n";
$mixer->play_music($mus, 0);
return 1;
@@ -191,9 +192,9 @@
while ($tryanother->() == 0) {};
} else {
$mus = SDL::Music->new("$FPATH$musics{$name}");
- $mus->{-data} or print STDERR "Warning, could not create new music from `$FPATH$musics{$name}' (reason: ", $app->error, ").\n";
+ $mus or print STDERR "Warning, could not create new music from `$FPATH$musics{$name}' (reason: ", $app->error, ").\n";
if ($pos) {
- fb_c_stuff::fade_in_music_position($mus->{-data}, -1, 500, $pos);
+ fb_c_stuff::fade_in_music_position($$mus, -1, 500, $pos);
} else {
$mixer->play_music($mus, -1);
}
@@ -212,7 +213,7 @@
foreach (@sounds) {
my $sound_path = "$FPATH/snd/$_.wav";
$sound{$_} = SDL::Sound->new($sound_path);
- if ($sound{$_}{-data}) {
+ if ($sound{$_}) {
$sound{$_}->volume(80);
} else {
print STDERR "Warning, could not create new sound from `$sound_path'.\n";
@@ -307,7 +308,7 @@
sub add_image($) {
my $file = "$FPATH/gfx/$_[0]";
my $img = SDL::Surface->new(-name => $file);
- $img->{-surface} or die "FATAL: Couldn't load `$file' into a SDL::Surface.\n";
+ $$img or die "FATAL: Couldn't load `$file' into a SDL::Surface.\n";
add_default_rect($img);
return $img;
}
@@ -880,7 +881,7 @@
$background_orig->blit($drect, $surface, $drect);
push @update_rects, $drect;
iter_players_ { #- sometimes called from within a iter_players so...
- $surface->print($POS{$::p_}{scoresx}-SDL_TEXTWIDTH($pdata{$::p_}{score})/2, $POS{scoresy}, $pdata{$::p_}{score});
+ $surface->print($POS{$::p_}{scoresx}-SDL::SFont::SDL_TEXTWIDTH($pdata{$::p_}{score})/2, $POS{scoresy}, $pdata{$::p_}{score});
};
}
@@ -1437,7 +1438,7 @@
$font = SDL::Font->new("$FPATH/gfx/font-hi.png");
my $centered_print = sub($$$) {
my ($x, $y, $txt) = @_;
- $app->print($x+($imgbin{hiscore_frame}->width-SDL_TEXTWIDTH(uc($txt)))/2 - 6,
+ $app->print($x+($imgbin{hiscore_frame}->width-SDL::SFont::SDL_TEXTWIDTH(uc($txt)))/2 - 6,
$y+$imgbin{hiscore_frame}->height - 8, uc($txt));
};
@@ -1473,7 +1474,7 @@
}
put_image($imgbin{hiscore_frame}, $high_posx - 7, $high_posy - 6);
- fb_c_stuff::shrink($app->{-surface}, $background->display_format->{-surface}, $high_posx, $high_posy, $high_rect->{-rect}, 4);
+ fb_c_stuff::shrink($$app, ${$background->display_format()}, $high_posx, $high_posy, $$high_rect, 4);
$centered_print->($high_posx, $high_posy, $high->{name});
$centered_print->($high_posx, $high_posy+20, $high->{level} eq 'WON' ? "WON!" : "LVL-".$high->{level});
my $min = int($high->{time}/60);
@@ -1510,7 +1511,7 @@
foreach my $i (@{$w->{intro}}) {
if ($i) {
- my $xpos = (640-SDL_TEXTWIDTH($i))/2;
+ my $xpos = (640-SDL::SFont::SDL_TEXTWIDTH($i))/2;
$app->print($xpos, $ypos, $i);
}
$ypos += 22;
@@ -1521,7 +1522,7 @@
my $ok = 1;
entries:
foreach my $entry (@{$w->{entries}}) {
- $xpos = (640-$imgbin{void_panel}->width)/2 + 120 - SDL_TEXTWIDTH($entry->{'q'})/2;
+ $xpos = (640-$imgbin{void_panel}->width)/2 + 120 - SDL::SFont::SDL_TEXTWIDTH($entry->{'q'})/2;
$app->print($xpos, $ypos, $entry->{'q'});
$app->flip;
my $srect_mulchar_redraw = SDL::Rect->new(-width => $imgbin{void_panel}->width, -height => 30,
@@ -1555,7 +1556,7 @@
if ($ok) {
${$_->{a}} = $_->{answer} foreach @{$w->{entries}};
- $xpos = (640-SDL_TEXTWIDTH($w->{outro}))/2;
+ $xpos = (640-SDL::SFont::SDL_TEXTWIDTH($w->{outro}))/2;
$ypos = (480+$imgbin{void_panel}->height)/2 - 35;
$app->print($xpos, $ypos, $w->{outro});
$app->flip;
@@ -1642,7 +1643,7 @@
$background->blit($apprects{main}, $app, $apprects{main});
$app->flip;
} else {
- fb_c_stuff::effect($app->{-surface}, $background->display_format->{-surface});
+ fb_c_stuff::effect($$app, ${$background->display_format()});
}
$display_on_app_disabled = 0;
frozen-bubble-build.patch:
--- NEW FILE frozen-bubble-build.patch ---
--- Makefile~ 2003-02-03 16:36:55.000000000 +0200
+++ Makefile 2004-07-03 15:27:29.820364547 +0300
@@ -26,8 +26,10 @@
install frozen-bubble frozen-bubble-editor $(BINDIR)
install -d $(DATADIR)/frozen-bubble
cp -a gfx snd data $(DATADIR)/frozen-bubble
+ rm -f $(DATADIR)/frozen-bubble/gfx/shoot/create.pl
+ rm -f $(DATADIR)/frozen-bubble/gfx/shoot/Makefile
install -d $(MANDIR)/man6
- install doc/*.6 $(MANDIR)/man6
+ install -m 644 doc/*.6 $(MANDIR)/man6
clean:
@for n in $(DIRS); do \
frozen-bubble-debian.patch:
--- NEW FILE frozen-bubble-debian.patch ---
--- frozen-bubble-1.0.0.orig/frozen-bubble
+++ frozen-bubble-1.0.0/frozen-bubble
@@ -44,6 +44,7 @@
$graphics_level @update_rects $CANON_ROTATIONS_NB %malus_bubble %falling_bubble %exploding_bubble %malus_gfx
%sticking_bubble $version $time %imgbin $TIME_HURRY_WARN $TIME_HURRY_MAX $TIMEOUT_PINGUIN_SLEEP $FREE_FALL_CONSTANT
$direct @PLAYERS %levels $display_on_app_disabled $total_time $time_1pgame $fullscreen $rcfile $hiscorefile $HISCORES
+ $total_launched_bubbles
$lev_number $playermalus $loaded_levelset $direct_levelset $chainreaction %chains %history);
use Data::Dumper;
@@ -151,7 +152,7 @@
my $h = int($total_time/3600);
my $m = int(($total_time-$h*3600)/60);
my $s = int($total_time-$h*3600-$m*60);
- print "\nAddicted for ", $h ? "$h"."h " : "", $m ? "$m"."m " : "", "$s"."s.\n";
+ print "\nAddicted for ", $h ? "$h"."h " : "", $m ? "$m"."m " : "", "$s"."s. ", $total_launched_bubbles, " bubbles were launched.\n";
}
}
@@ -985,6 +990,7 @@
&& !(any { exists $_->{chaindestx} } @{$falling_bubble{$::p}})
&& !@{$malus_bubble{$::p}}) {
play_sound('launch');
+ $total_launched_bubbles++;
$launched_bubble{$::p} = $tobe_launched{$::p};
$launched_bubble{$::p}->{direction} = $angle{$::p};
$tobe_launched{$::p} = undef;
@@ -1284,6 +1290,7 @@
$event->set_unicode(1);
SDL::Cursor::show(0);
$total_time = $app->ticks;
+ $total_launched_bubbles = 0;
$imgbin{loading} = add_image('loading.png');
put_image($imgbin{loading}, 10, 10);
$app->print(30, 60, uc("tip! use '-h' on command-line to get more options"));
@@ -2151,6 +2164,9 @@
exit 0;
}
}
+ if ($event->type == SDL_QUIT) {
+ exit 0;
+ }
$menu_update->();
}
--- NEW FILE frozen-bubble.desktop ---
[Desktop Entry]
Name=Frozen Bubble
Comment=Frozen Bubble arcade game
Exec=frozen-bubble
Icon=frozen-bubble.png
Terminal=false
Type=Application
Encoding=UTF-8
Categories=Application;Game;ArcadeGame;
--- NEW FILE frozen-bubble.spec ---
Summary: Frozen Bubble arcade game
Name: frozen-bubble
Version: 1.0.0
Release: 9%{?dist}
License: GPL
Group: Amusements/Games
Source0: http://zarb.org/~gc/fb/frozen-bubble-1.0.0.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
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
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
sound effects, 7 unique graphical transition effects and a level editor.
You need this game.
%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
%build
make %{?_smp_mflags} OPTIMIZE="${RPM_OPT_FLAGS}" PREFIX="%{_prefix}" \
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
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
# Move some directories around
mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}/perl
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.
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 \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
install -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 \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
%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 AUTHORS CHANGES COPYING README
%{_bindir}/%{name}*
%{_libdir}/%{name}
%{_datadir}/%{name}
%{_mandir}/man6/%{name}*.6.gz
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}.png
%changelog
* Wed Aug 23 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0.0-9
- Filter out the autogenerated Provides for our private perl modules and also
filter out the matching AutoRequires to still get an installable package
* Sun Aug 20 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0.0-8
- Apply patch from Wart (wart at kobold.org) to move private perl stuff to
%%{_libdir}/%%{_name}
- Drop unnescesarry perl BR (already implied by perl-SDL).
- Fix inconsistent use of $RPM_BUILD_ROOT vs ${RPM_BUILD_ROOT} (only use the
former)
* Tue Aug 15 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0.0-7
- Update to work with new perl-SDL-2.1.3 see BZ 202437
* Mon Aug 14 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0.0-6
- Submit to Fedora Extras since perl-SDL is in FE now, so frozen-bubble can
move to FE too
- Cleanup BR's a bit to match FE-guidelines
- Install all sizes icons into /usr/share/icons, instead of just the biggest
one into /usr/share/pixmaps
- Add scriptlets to update icon cache
* Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- switch to new release field
* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- add dist
* Tue Nov 16 2004 Thorsten Leemmhuis <fedora [AT] leemhuis [DOT] info> - 0:1.0.0-0.lvn.5
- Update to new Debian patch
* Sat Jul 3 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:1.0.0-0.lvn.4
- Apply patch from Debian to make fb work with perl-SDL >= 1.20.3.
- Install Perl modules into vendor install dirs, require (:MODULE_COMPAT_*).
- Fix Source0 URL.
- Remove unneeded files.
- Fix file permissions.
- s/fedora/livna/ in desktop entry, other small improvements.
* Fri Jun 27 2003 Phillip Compton <pcompton at proteinmedia dot com> 0:1.0.0-0.fdr.3
- Removed BuildConflicts.
- Added Epochs to BuildReqs.
- Split Desktop entry into seperate file.
* Sun Jun 22 2003 Phillip Compton <pcompton at proteinmedia dot com> 0:1.0.0-0.fdr.2
- Fixed file permissions.
- Added in suggested fixes from Adrian Reber.
* Tue May 27 2003 Phillip Compton <pcompton at proteinmedia dot com> 0:1.0.0-0.fdr.1
- Fedorafied.
* Tue Apr 1 2003 Matthias Saou <matthias.saou at est.une.marmotte.net>
- Replace the __find_requires with AutoReq: as it works better.
- Remove .xvpics from installed files.
* Mon Mar 31 2003 Matthias Saou <matthias.saou at est.une.marmotte.net>
- Rebuilt for Red Hat Linux 9.
* Tue Feb 18 2003 Matthias Saou <matthias.saou at est.une.marmotte.net>
- Added missing man pages, thanke to Michal Ambroz.
* Mon Feb 17 2003 Matthias Saou <matthias.saou at est.une.marmotte.net>
- Update to 1.0.0.
* Mon Oct 28 2002 Matthias Saou <matthias.saou at est.une.marmotte.net>
- Rebuilt for Red Hat Linux 8.0 (at last!).
- New menu entry.
* Thu Feb 7 2002 Matthias Saou <matthias.saou at est.une.marmotte.net>
- Update to 0.9.3.
* Thu Feb 7 2002 Matthias Saou <matthias.saou at est.une.marmotte.net>
- Spec file modifications for a Red Hat Linux release.
* Wed Feb 6 2002 Guillaume Cottenceau <gc at mandrakesoft.com> 0.9.1-1mdk
- first mdk rpm
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/frozen-bubble/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 26 Aug 2006 05:21:15 -0000 1.1
+++ .cvsignore 26 Aug 2006 05:26:10 -0000 1.2
@@ -0,0 +1 @@
+frozen-bubble-1.0.0.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/frozen-bubble/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 26 Aug 2006 05:21:15 -0000 1.1
+++ sources 26 Aug 2006 05:26:10 -0000 1.2
@@ -0,0 +1 @@
+2be5ead2aee72adc3fb643630a774b59 frozen-bubble-1.0.0.tar.bz2
More information about the scm-commits
mailing list