[machineball] Rebuilt for new allegro-4.4
Hans de Goede
jwrdegoede at fedoraproject.org
Wed Jul 13 18:54:58 UTC 2011
commit e476e3df214e7c4d720e0c4057b6e83b91ee8266
Author: Hans de Goede <hdegoede at redhat.com>
Date: Wed Jul 13 20:56:06 2011 +0200
Rebuilt for new allegro-4.4
machineball-fixes.patch | 2 +-
machineball.spec | 25 +++++++++++--------------
2 files changed, 12 insertions(+), 15 deletions(-)
---
diff --git a/machineball-fixes.patch b/machineball-fixes.patch
index 801b203..708c7eb 100644
--- a/machineball-fixes.patch
+++ b/machineball-fixes.patch
@@ -5,7 +5,7 @@
machineball : main.o window.o intro.o menu.o game.o text.o timer.o controls.o ball.o glode.o camera.o render.o court.o machine.o powerup.o explosion.o models.o mbdata.o options.o mbdata.o
- gcc main.o window.o intro.o menu.o game.o text.o timer.o controls.o ball.o glode.o camera.o render.o court.o machine.o powerup.o explosion.o models.o mbdata.o options.o -o machineball -laldmb -ldumb -lagl `allegro-config --libs` -lGL -lGLU -lode
-+ g++ main.o window.o intro.o menu.o game.o text.o timer.o controls.o ball.o glode.o camera.o render.o court.o machine.o powerup.o explosion.o models.o mbdata.o options.o -o machineball -laldmb -ldumb -lagl `allegro-config --libs` -lGL -lGLU -lode -lm
++ g++ main.o window.o intro.o menu.o game.o text.o timer.o controls.o ball.o glode.o camera.o render.o court.o machine.o powerup.o explosion.o models.o mbdata.o options.o -o machineball -laldmb -ldumb -lalleggl `allegro-config --libs` -lGL -lGLU -lode -lm
main.o : main.cpp
diff --git a/machineball.spec b/machineball.spec
index 63ead3e..8bfbef3 100644
--- a/machineball.spec
+++ b/machineball.spec
@@ -1,6 +1,6 @@
Name: machineball
Version: 1.0
-Release: 10%{?dist}
+Release: 11%{?dist}
Summary: A futuristic ball game with simple rules
Group: Amusements/Games
License: GPL+
@@ -9,7 +9,6 @@ Source0: http://benny.kramekweb.com/%{name}/%{name}-src-%{version}-1.tar.
Source1: machineball.desktop
Patch0: machineball-fixes.patch
Patch1: machineball-config-only-once.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: alleggl-devel libGLU-devel ode-devel dumb-devel allegro-tools
BuildRequires: desktop-file-utils
Requires: hicolor-icon-theme opengl-games-utils
@@ -32,7 +31,6 @@ make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS"
%install
-rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/usr/bin
install -m 755 %{name} $RPM_BUILD_ROOT/usr/bin
ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/%{name}-wrapper
@@ -50,22 +48,18 @@ for i in "16x16" "24x24" "32x32" "48x48" "64x64"; do
done
-%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
+/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%postun
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+ /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
+%posttrans
+/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
%files
%defattr(-,root,root,-)
@@ -76,6 +70,9 @@ fi
%changelog
+* Wed Jul 13 2011 Hans de Goede <hdegoede at redhat.com> - 1.0-11
+- Rebuilt for new allegro-4.4
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list