[duel3] Rebuilt for new allegro-4.4
Hans de Goede
jwrdegoede at fedoraproject.org
Wed Jul 13 19:31:44 UTC 2011
commit 6a12e3519907584bb9bc6b0e600a7f2fa27e1f50
Author: Hans de Goede <hdegoede at redhat.com>
Date: Wed Jul 13 21:32:53 2011 +0200
Rebuilt for new allegro-4.4
Duel3_20060225-fixes.patch | 2 +-
duel3.spec | 25 +++++++++++--------------
2 files changed, 12 insertions(+), 15 deletions(-)
---
diff --git a/Duel3_20060225-fixes.patch b/Duel3_20060225-fixes.patch
index a5ff21a..3b7dfef 100644
--- a/Duel3_20060225-fixes.patch
+++ b/Duel3_20060225-fixes.patch
@@ -756,7 +756,7 @@
+BINDIR = $(PREFIX)/bin/
+DATADIR = $(PREFIX)/share/$(TARGET)
+CFLAGS = -g -Wall -O2 -Wno-non-virtual-dtor
-+LDFLAGS = `allegro-config --libs` -ldumb -laldmb -lagl -lGL -lGLU
++LDFLAGS = `allegro-config --libs` -ldumb -laldmb -lalleggl -lGL -lGLU
+DEFINES = -DDATADIR=\"$(DATADIR)/\"
+OBJS = main.o Standards.o CCamera.o CVector2.o BRect.o SObject.o Model.o Weapon.o Animation.o PObject.o Ship.o Proj.o Arena.o Player.o Game.o Widget.o ShipArray.o Starfield.o CVector3.o particle.o particlesystem.o particlegenerator.o asteroid.o Controller.o SfxSingleton.o GameMode.o AsteroidsGameMode.o NewMenu.o Button.o CheckBox.o ShipSelector.o MissileAvoid.o AIPlayer.o Turret.o MissileAvoid2p.o GameSettingsSingleton.o ScoreKeeper.o AsteroidsGameMode2p.o Powerup.o unix.o
+
diff --git a/duel3.spec b/duel3.spec
index fc370bd..38605e0 100644
--- a/duel3.spec
+++ b/duel3.spec
@@ -1,7 +1,7 @@
%define snapshot 20060225
Name: duel3
Version: 0.1
-Release: 0.9.%{snapshot}%{?dist}
+Release: 0.10.%{snapshot}%{?dist}
Summary: One on one spaceship duel in a 2D arena
Group: Amusements/Games
License: BSD
@@ -14,7 +14,6 @@ Source4: music-credits.txt
Patch0: Duel3_20060225-fixes.patch
Patch1: Duel3_20060225-windowed-mode.patch
Patch2: Duel3_20060225-fix-buf-oflow.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: alleggl-devel dumb-devel libGLU-devel desktop-file-utils
Requires: hicolor-icon-theme opengl-games-utils
@@ -57,7 +56,6 @@ popd
%install
-rm -rf $RPM_BUILD_ROOT
pushd Source
make install PREFIX=$RPM_BUILD_ROOT%{_prefix}
popd
@@ -73,22 +71,18 @@ install -p -m 644 %{SOURCE3} \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps
-%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,-)
@@ -100,6 +94,9 @@ fi
%changelog
+* Wed Jul 13 2011 Hans de Goede <hdegoede at redhat.com> - 0.1-0.10.20060225
+- Rebuilt for new allegro-4.4
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1-0.9.20060225
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list