diff --git a/.cvsignore b/.cvsignore index a483a7a..938222c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -ballz-1.0.tar.gz +ballz-1.0.1.tar.gz diff --git a/ballz-1.0-fullscreen.patch b/ballz-1.0-fullscreen.patch deleted file mode 100644 index 662c37d..0000000 --- a/ballz-1.0-fullscreen.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ballz-1.0/src/game.cpp~ 2007-04-17 20:08:11.000000000 +0200 -+++ ballz-1.0/src/game.cpp 2007-04-17 20:08:11.000000000 +0200 -@@ -48,7 +48,7 @@ - - set_window_title("Darkbits - B.A.L.L.Z."); - -- int driver = GFX_AUTODETECT_WINDOWED; -+ int driver = GFX_AUTODETECT; - set_color_depth(32); - if (set_gfx_mode(driver, 640, 480, 0, 0) < 0) { - set_color_depth(24); diff --git a/ballz-1.0-guichan081.patch b/ballz-1.0-guichan081.patch deleted file mode 100644 index 24d7c88..0000000 --- a/ballz-1.0-guichan081.patch +++ /dev/null @@ -1,62 +0,0 @@ ---- ballz-1.0/src/game.cpp.orig 2008-07-28 19:49:24.000000000 -0700 -+++ ballz-1.0/src/game.cpp 2008-07-28 19:49:35.000000000 -0700 -@@ -144,7 +144,7 @@ - "up with the whole idea of making this game in Per's and\n" - "Johanna's apartment."); - mCreditsText->setOpaque(false); -- mCreditsText->setBorderSize(0); -+ mCreditsText->setFrameSize(0); - mCreditsContainer->add(mCreditsText, 40, 180); - - mLevelsContainer = new gcn::Container(); -@@ -173,7 +173,7 @@ - mInfoTextFont->setGlyphSpacing(-1); - mInfoText->setFont(mInfoTextFont); - mInfoText->setOpaque(false); -- mInfoText->setBorderSize(0); -+ mInfoText->setFrameSize(0); - mMainMenuContainer->add(mInfoText, 110, 200); - } - ---- ballz-1.0/src/gui/ballzscrollarea.cpp.orig 2008-07-28 19:54:05.000000000 -0700 -+++ ballz-1.0/src/gui/ballzscrollarea.cpp 2008-07-28 19:54:18.000000000 -0700 -@@ -37,7 +37,7 @@ - setScrollPolicy(SHOW_NEVER, SHOW_ALWAYS); - addKeyListener(this); - setFocusable(false); -- setBorderSize(0); -+ setFrameSize(0); - } - - void BallzScrollArea::draw(gcn::Graphics *graphics) ---- ballz-1.0/src/gui/ballzlistbox.cpp.orig 2008-07-28 19:57:26.000000000 -0700 -+++ ballz-1.0/src/gui/ballzlistbox.cpp 2008-07-28 19:57:36.000000000 -0700 -@@ -36,7 +36,7 @@ - - BallzListBox::BallzListBox() - { -- setBorderSize(0); -+ setFrameSize(0); - mSelectedImage = ResourceHandler::getInstance()->getBitmap("hand.bmp"); - } - ---- ballz-1.0/src/gui/levelselector.cpp.orig 2008-07-28 19:54:46.000000000 -0700 -+++ ballz-1.0/src/gui/levelselector.cpp 2008-07-28 19:54:54.000000000 -0700 -@@ -40,7 +40,7 @@ - - LevelSelector::LevelSelector() - { -- setBorderSize(0); -+ setFrameSize(0); - mSelectedImage = ResourceHandler::getInstance()->getBitmap("hand.bmp"); - mSelected = -1; - setWidth(300); -@@ -170,7 +170,7 @@ void LevelSelector::keyPressed(gcn::KeyE - - if (key.getValue() == gcn::Key::ENTER || key.getValue() == gcn::Key::SPACE) - { -- generateAction(); -+ distributeActionEvent(); - keyEvent.consume(); - } - else if (key.getValue() == gcn::Key::UP) diff --git a/ballz-1.0-syslibs.patch b/ballz-1.0-syslibs.patch deleted file mode 100644 index c956cda..0000000 --- a/ballz-1.0-syslibs.patch +++ /dev/null @@ -1,216 +0,0 @@ -diff -ur ballz-1.0/src/Makefile.am ballz-1.0.new/src/Makefile.am ---- ballz-1.0/src/Makefile.am 2007-04-05 22:21:32.000000000 +0200 -+++ ballz-1.0.new/src/Makefile.am 2007-04-17 14:18:19.000000000 +0200 -@@ -70,151 +70,6 @@ - gui/ballzlistbox.cpp\ - gui/ballzlistbox.hpp\ - gui/ballzscrollarea.cpp\ --gui/ballzscrollarea.hpp\ --guichan/actionevent.cpp\ --guichan/actionevent.hpp\ --guichan/actionlistener.hpp\ --guichan/allegro.hpp\ --guichan/basiccontainer.cpp\ --guichan/basiccontainer.hpp\ --guichan/cliprectangle.cpp\ --guichan/cliprectangle.hpp\ --guichan/color.cpp\ --guichan/color.hpp\ --guichan/deathlistener.hpp\ --guichan/defaultfont.cpp\ --guichan/defaultfont.hpp\ --guichan/event.cpp\ --guichan/event.hpp\ --guichan/exception.cpp\ --guichan/exception.hpp\ --guichan/focushandler.cpp\ --guichan/focushandler.hpp\ --guichan/focuslistener.hpp\ --guichan/font.cpp\ --guichan/font.hpp\ --guichan/graphics.cpp\ --guichan/graphics.hpp\ --guichan/gui.cpp\ --guichan/gui.hpp\ --guichan/image.cpp\ --guichan/image.hpp\ --guichan/imagefont.cpp\ --guichan/imagefont.hpp\ --guichan/imageloader.hpp\ --guichan/input.hpp\ --guichan/inputevent.cpp\ --guichan/inputevent.hpp\ --guichan/key.cpp\ --guichan/key.hpp\ --guichan/keyevent.cpp\ --guichan/keyevent.hpp\ --guichan/keyinput.cpp\ --guichan/keyinput.hpp\ --guichan/keylistener.hpp\ --guichan/listmodel.hpp\ --guichan/mouseevent.cpp\ --guichan/mouseevent.hpp\ --guichan/mouseinput.cpp\ --guichan/mouseinput.hpp\ --guichan/mouselistener.hpp\ --guichan/platform.hpp\ --guichan/rectangle.cpp\ --guichan/rectangle.hpp\ --guichan/widget.cpp\ --guichan/widget.hpp\ --guichan/allegro/allegrofont.hpp\ --guichan/allegro/allegrographics.cpp\ --guichan/allegro/allegrographics.hpp\ --guichan/allegro/allegroimage.cpp\ --guichan/allegro/allegroimage.hpp\ --guichan/allegro/allegroimageloader.cpp\ --guichan/allegro/allegroimageloader.hpp\ --guichan/allegro/allegroinput.cpp\ --guichan/allegro/allegroinput.hpp\ --guichan/widgets/button.cpp\ --guichan/widgets/button.hpp\ --guichan/widgets/container.cpp\ --guichan/widgets/container.hpp\ --guichan/widgets/checkbox.cpp\ --guichan/widgets/checkbox.hpp\ --guichan/widgets/dropdown.hpp\ --guichan/widgets/dropdown.cpp\ --guichan/widgets/icon.cpp\ --guichan/widgets/icon.hpp\ --guichan/widgets/label.cpp\ --guichan/widgets/label.hpp\ --guichan/widgets/listbox.cpp\ --guichan/widgets/listbox.hpp\ --guichan/widgets/radiobutton.cpp\ --guichan/widgets/radiobutton.hpp\ --guichan/widgets/scrollarea.cpp\ --guichan/widgets/scrollarea.hpp\ --guichan/widgets/slider.cpp\ --guichan/widgets/slider.hpp\ --guichan/widgets/textbox.cpp\ --guichan/widgets/textbox.hpp\ --guichan/widgets/textfield.cpp\ --guichan/widgets/textfield.hpp\ --guichan/widgets/window.cpp\ --guichan/widgets/window.hpp\ --dumb/aldumb.h\ --dumb/dumb.h\ --dumb/allegro/alplay.c\ --dumb/allegro/datduh.c\ --dumb/allegro/datit.c\ --dumb/allegro/datitq.c\ --dumb/allegro/datmod.c\ --dumb/allegro/dats3m.c\ --dumb/allegro/dats3mq.c\ --dumb/allegro/datunld.c\ --dumb/allegro/datxm.c\ --dumb/allegro/datxmq.c\ --dumb/allegro/packfile.c\ --dumb/core/atexit.c\ --dumb/core/duhlen.c\ --dumb/core/duhtag.c\ --dumb/core/dumbfile.c\ --dumb/core/loadduh.c\ --dumb/core/makeduh.c\ --dumb/core/rawsig.c\ --dumb/core/readduh.c\ --dumb/core/register.c\ --dumb/core/rendduh.c\ --dumb/core/rendsig.c\ --dumb/core/unload.c\ --dumb/it/itload.c\ --dumb/it/itload2.c\ --dumb/it/itmisc.c\ --dumb/it/itorder.c\ --dumb/it/itread.c\ --dumb/it/itread2.c\ --dumb/it/itrender.c\ --dumb/it/itunload.c\ --dumb/it/loadmod.c\ --dumb/it/loadmod2.c\ --dumb/it/loads3m.c\ --dumb/it/loads3m2.c\ --dumb/it/loadxm.c\ --dumb/it/loadxm2.c\ --dumb/it/readmod.c\ --dumb/it/readmod2.c\ --dumb/it/reads3m.c\ --dumb/it/reads3m2.c\ --dumb/it/readxm.c\ --dumb/it/readxm2.c\ --dumb/it/xmeffect.c\ --dumb/helpers/clickrem.c\ --dumb/helpers/memfile.c\ --dumb/helpers/resamp2.inc\ --dumb/helpers/resamp3.inc\ --dumb/helpers/resample.inc\ --dumb/helpers/resample.c\ --dumb/helpers/sampbuf.c\ --dumb/helpers/silence.c\ --dumb/helpers/stdfile.c\ --dumb/internal/aldumb.h\ --dumb/internal/dumb.h\ --dumb/internal/it.h -- -+gui/ballzscrollarea.hpp - -+ballz_LDFLAGS = -ldumb -laldmb -lguichan -lguichan_allegro -diff -ur ballz-1.0/src/gui/ballzlistbox.cpp ballz-1.0.new/src/gui/ballzlistbox.cpp ---- ballz-1.0/src/gui/ballzlistbox.cpp 2007-04-04 20:00:50.000000000 +0200 -+++ ballz-1.0.new/src/gui/ballzlistbox.cpp 2007-04-17 14:53:12.000000000 +0200 -@@ -70,7 +70,9 @@ - { - if (isFocused()) - { -- allegroGraphics->drawBitmap(mSelectedImage, 0, y + 1); -+ gcn::AllegroImage image(mSelectedImage, 0); -+ allegroGraphics->drawImage(&image, 0, 0, 0, -+ y + 1, image.getWidth(), image.getHeight()); - } - } - -diff -ur ballz-1.0/src/gui/datawriter.cpp ballz-1.0.new/src/gui/datawriter.cpp ---- ballz-1.0/src/gui/datawriter.cpp 2007-04-04 20:01:03.000000000 +0200 -+++ ballz-1.0.new/src/gui/datawriter.cpp 2007-04-17 14:48:01.000000000 +0200 -@@ -105,15 +105,21 @@ - - if (mImage == BALLZ) - { -- allegroGraphics->drawBitmap(mBallzImage, 8, 8); -+ gcn::AllegroImage image(mBallzImage, 0); -+ allegroGraphics->drawImage(&image, 0, 0, 8, 8, image.getWidth(), -+ image.getHeight()); - } - else if (mImage == THEPROFESSOR) - { -- allegroGraphics->drawBitmap(mTheProfessorImage, 8, 8); -- } -- else if (mImage == THECOLONEL) -- { -- allegroGraphics->drawBitmap(mTheColonelImage, 8, 8); -+ gcn::AllegroImage image(mTheProfessorImage, 0); -+ allegroGraphics->drawImage(&image, 0, 0, 8, 8, image.getWidth(), -+ image.getHeight()); -+ } -+ else if (mImage == THECOLONEL) -+ { -+ gcn::AllegroImage image(mTheColonelImage, 0); -+ allegroGraphics->drawImage(&image, 0, 0, 8, 8, image.getWidth(), -+ image.getHeight()); - } - - unsigned int i; -diff -ur ballz-1.0/src/gui/levelselector.cpp ballz-1.0.new/src/gui/levelselector.cpp ---- ballz-1.0/src/gui/levelselector.cpp 2007-04-04 20:01:09.000000000 +0200 -+++ ballz-1.0.new/src/gui/levelselector.cpp 2007-04-17 14:50:38.000000000 +0200 -@@ -148,7 +148,9 @@ - { - if (isFocused()) - { -- allegroGraphics->drawBitmap(mSelectedImage, 0, y); -+ gcn::AllegroImage image(mSelectedImage, 0); -+ allegroGraphics->drawImage(&image, 0, 0, 0, y, -+ image.getWidth(), image.getHeight()); - } - } - diff --git a/ballz.desktop b/ballz.desktop deleted file mode 100644 index 5727547..0000000 --- a/ballz.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=B.A.L.L.Z. -Comment=Platform game with some puzzle elements -Exec=ballz -Icon=ballz.png -Terminal=false -Type=Application -Categories=Game;ActionGame; diff --git a/ballz.spec b/ballz.spec index 1356dba..0fe3bc5 100644 --- a/ballz.spec +++ b/ballz.spec @@ -1,21 +1,13 @@ Name: ballz -Version: 1.0 -Release: 4%{?dist} +Version: 1.0.1 +Release: 1%{?dist} Summary: Platform game with some puzzle elements Group: Amusements/Games License: BSD -# Was http://darkbits.org/ but that site is down -URL: http://www.allegro.cc/forums/thread/590831 -# http://darkbits.org/%{name}-%{version}.tar.gz but site is down -Source0: %{name}-%{version}.tar.gz -Source1: %{name}.desktop -Patch0: ballz-1.0-syslibs.patch -Patch1: ballz-1.0-fullscreen.patch -Patch2: ballz-1.0-guichan081.patch +URL: http://code.google.com/p/db-tins07/ +Source0: http://db-tins07.googlecode.com/files/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: dumb-devel guichan-devel desktop-file-utils automake -BuildRequires: ImageMagick -Requires: hicolor-icon-theme +BuildRequires: allegro-devel dumb-devel guichan-devel desktop-file-utils %description Ballz is a platformer with some puzzle elements. You take control of a ball @@ -29,62 +21,37 @@ not Speedhack’. %prep %setup -q -%patch0 -p1 -z .syslibs -%patch1 -p1 -z .fullscreen -%patch2 -p1 -# we use the system version of these libs -rm -fr src/guichan* src/dumb -# remove hardcoded optflags from configure -sed -i 's/-O2 -ffast-math -fomit-frame-pointer/ -ffast-math/g' configure.ac -autoreconf -f %build %configure make %{?_smp_mflags} -convert -transparent black data/%{name}.bmp %{name}.png %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT - -# 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 \ - %{SOURCE1} -mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps -install -m 644 %{name}.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps +desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop %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 README BSD-license +%doc AUTHORS README BSD-license ChangeLog %{_bindir}/%{name} %{_datadir}/%{name} -%{_datadir}/applications/fedora-%{name}.desktop -%{_datadir}/icons/hicolor/48x48/apps/%{name}.png +%{_datadir}/applications/* +%{_datadir}/pixmaps/* +%{_mandir}/man6/* %changelog +* Wed Oct 15 2008 Sylvain Beucler - 1.0.1-1 +- New upstream release that includes all patches and simplifies packaging + * Wed Jul 30 2008 Hans de Goede 1.0-4 - Rebuild for new guichan diff --git a/sources b/sources index a2dbac3..9a787f7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1a98a0a87985f2425d2fde5715be50ed ballz-1.0.tar.gz +d195173086e33055e9736a25216520f9 ballz-1.0.1.tar.gz