[amoebax] New upstream release 0.2.1
Hans de Goede
jwrdegoede at fedoraproject.org
Mon Apr 29 15:14:15 UTC 2013
commit c726325ec5ce2aad2a6118bc49a5db8a23f64cea
Author: Hans de Goede <hdegoede at redhat.com>
Date: Mon Apr 29 17:18:04 2013 +0200
New upstream release 0.2.1
- run autoreconf for aarch64 support (rhbz#924996)
amoebax-0.2.0-gcc43.patch | 113 ---------------------------------------------
amoebax.spec | 38 +++++++++++----
sources | 1 -
3 files changed, 27 insertions(+), 125 deletions(-)
---
diff --git a/amoebax-0.2.0-gcc43.patch b/amoebax-0.2.0-gcc43.patch
index 4c4f098..1a1357f 100644
--- a/amoebax-0.2.0-gcc43.patch
+++ b/amoebax-0.2.0-gcc43.patch
@@ -1,116 +1,3 @@
---- amoebax-0.2.0/src/ControlSetupState.cxx 2007-06-25 08:15:23.000000000 +0200
-+++ amoebax-0.2.0.new/src/ControlSetupState.cxx 2008-01-12 12:11:55.000000000 +0100
-@@ -20,6 +20,7 @@
- #include <config.h>
- #endif // !HAVE_CONFIG_H
- #include <sstream>
-+#include <stdlib.h>
- #include "ControlSetupState.h"
- #include "File.h"
- #include "Joystick.h"
-@@ -241,7 +242,7 @@
- {
- // Is an axis.
- std::ostringstream name;
-- name << (control < 0 ? "-" : "+") << "Axis " << std::abs (control) - 1;
-+ name << (control < 0 ? "-" : "+") << "Axis " << abs (control) - 1;
- joyName = name.str ();
- }
- else
---- amoebax-0.2.0/src/Font.cxx 2007-02-19 15:43:49.000000000 +0100
-+++ amoebax-0.2.0.new/src/Font.cxx 2008-01-12 12:17:34.000000000 +0100
-@@ -23,6 +23,7 @@
- #include <config.h>
- #endif // HAVE_CONFIG_H
- #include <numeric>
-+#include <algorithm>
- #include <SDL.h>
- #include "Font.h"
-
---- amoebax-0.2.0/src/Joystick.cxx 2007-07-30 08:22:41.000000000 +0200
-+++ amoebax-0.2.0.new/src/Joystick.cxx 2008-01-12 12:20:24.000000000 +0100
-@@ -19,6 +19,7 @@
- #if defined (HAVE_CONFIG_H)
- #include <config.h>
- #endif // !HAVE_CONFIG_H
-+#include <stdlib.h>
- #include "Joystick.h"
-
- using namespace Amoebax;
-@@ -120,10 +121,10 @@
- {
- if ( m_PlayerControls.joystick.index == joystick )
- {
-- if ( std::abs (m_PlayerControls.joystick.moveLeft) - 1 == axis ||
-- std::abs (m_PlayerControls.joystick.moveRight) - 1 == axis )
-+ if ( abs (m_PlayerControls.joystick.moveLeft) - 1 == axis ||
-+ abs (m_PlayerControls.joystick.moveRight) - 1 == axis )
- {
-- if ( std::abs (value) > k_DeadZone )
-+ if ( abs (value) > k_DeadZone )
- {
- if ( (value < 0 && m_PlayerControls.joystick.moveLeft < 0 ||
- value > 0 && m_PlayerControls.joystick.moveLeft > 0 ) &&
-@@ -153,7 +154,7 @@
- setAxisXDirection (k_AxisCenter);
- }
- }
-- else if ( std::abs (m_PlayerControls.joystick.pushDown) - 1 == axis )
-+ else if ( abs (m_PlayerControls.joystick.pushDown) - 1 == axis )
- {
- if ( (m_PlayerControls.joystick.pushDown > 0 && value > k_DeadZone) ||
- (m_PlayerControls.joystick.pushDown < 0 && value < -k_DeadZone) )
---- amoebax-0.2.0/src/MainMenuState.cxx 2007-06-05 13:08:12.000000000 +0200
-+++ amoebax-0.2.0.new/src/MainMenuState.cxx 2008-01-12 12:21:12.000000000 +0100
-@@ -19,6 +19,7 @@
- #if defined (HAVE_CONFIG_H)
- #include <config.h>
- #endif // HAVE_CONFIG_H
-+#include <algorithm>
- #include <SDL.h>
- #include "AdvancedAIPlayer.h"
- #include "AnticipatoryAIPlayer.h"
---- amoebax-0.2.0/src/OptionsMenuState.cxx 2007-06-25 08:15:23.000000000 +0200
-+++ amoebax-0.2.0.new/src/OptionsMenuState.cxx 2008-01-12 12:22:48.000000000 +0100
-@@ -21,6 +21,7 @@
- #endif // HAVE_CONFIG_H
- #include <SDL.h>
- #include <sstream>
-+#include <algorithm>
- #include "ControlSetupState.h"
- #include "File.h"
- #include "Font.h"
---- amoebax-0.2.0/src/Sound.h 2007-02-19 15:43:21.000000000 +0100
-+++ amoebax-0.2.0.new/src/Sound.h 2008-01-12 12:09:37.000000000 +0100
-@@ -20,6 +20,7 @@
- #define AMOEBAX_SOUND_H
-
- #include <SDL_mixer.h>
-+#include <string>
-
- namespace Amoebax
- {
---- amoebax-0.2.0/src/System.cxx 2007-06-18 16:24:38.000000000 +0200
-+++ amoebax-0.2.0.new/src/System.cxx 2008-01-12 12:24:16.000000000 +0100
-@@ -28,6 +28,7 @@
- #include <sstream>
- #include <stdexcept>
- #include <string>
-+#include <algorithm>
-
- #if defined (IS_WIN32_HOST)
- #include <windows.h>
---- amoebax-0.2.0/src/TwoPlayersState.cxx 2007-07-30 08:22:41.000000000 +0200
-+++ amoebax-0.2.0.new/src/TwoPlayersState.cxx 2008-01-12 12:25:06.000000000 +0100
-@@ -22,6 +22,7 @@
- #include <cassert>
- #include <SDL.h>
- #include <sstream>
-+#include <algorithm>
- #include "Amoeba.h"
- #include "DrawAmoeba.h"
- #include "DrawChainLabel.h"
-diff -up amoebax-0.2.0/src/binreloc.cxx~ amoebax-0.2.0/src/binreloc.cxx
--- amoebax-0.2.0/src/binreloc.cxx~ 2007-03-13 18:19:40.000000000 +0100
+++ amoebax-0.2.0/src/binreloc.cxx 2009-02-24 08:41:27.000000000 +0100
@@ -739,7 +739,8 @@ br_strndup (const char *str, size_t size
diff --git a/amoebax.spec b/amoebax.spec
index 97fd5e1..941fc57 100644
--- a/amoebax.spec
+++ b/amoebax.spec
@@ -1,6 +1,6 @@
Name: amoebax
-Version: 0.2.0
-Release: 11%{?dist}
+Version: 0.2.1
+Release: 1%{?dist}
Summary: Action-Puzzle Game
Group: Amusements/Games
License: GPLv2+ and Free Art
@@ -8,7 +8,7 @@ URL: http://www.emma-soft.com/games/amoebax/
Source0: http://www.emma-soft.com/games/amoebax/download/amoebax-%{version}.tar.bz2
Patch0: amoebax-0.2.0-gcc43.patch
BuildRequires: SDL_mixer-devel SDL_image-devel zlib-devel libpng-devel
-BuildRequires: libvorbis-devel doxygen desktop-file-utils
+BuildRequires: libvorbis-devel doxygen desktop-file-utils libtool
Requires: hicolor-icon-theme
%description
@@ -28,14 +28,20 @@ mode will let you have a good time with your friends. There is also catchy
music, funny sound effects, and beautiful screens that sure appeal to everyone
in the family.
+
%prep
%setup -q
%patch0 -p1
+rm m4/objc.m4
+touch ChangeLog
+autoreconf -i -f
+
%build
%configure
make %{?_smp_mflags}
+
%install
%make_install
@@ -44,32 +50,42 @@ rm $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/manual.pdf
# below is the desktop file and icon stuff.
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+%if 0%{?fedora} && 0%{?fedora} < 19
+ --vendor fedora --delete-original \
+%endif
$RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps
mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.svg \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps
+
%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
+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
+ touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+
%files
%doc AUTHORS COPYING* NEWS README* THANKS TODO doc/manual.pdf
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_mandir}/man6/%{name}.6.gz
-%{_datadir}/applications/%{name}.desktop
+%{_datadir}/applications/*%{name}.desktop
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
+
%changelog
+* Mon Apr 29 2013 Hans de Goede <hdegoede at redhat.com> - 0.2.1-1
+- New upstream release 0.2.1
+- run autoreconf for aarch64 support (rhbz#924996)
+
* Sat Feb 09 2013 Rahul Sundaram <sundaram at fedoraproject.org> - 0.2.0-11
- remove vendor tag from desktop file. https://fedorahosted.org/fpc/ticket/247
- clean up spec to follow current guidelines
diff --git a/sources b/sources
index 0b56bae..e69de29 100644
--- a/sources
+++ b/sources
@@ -1 +0,0 @@
-1fecc5e4c8c4151b39f84baa5a18897b amoebax-0.2.0.tar.bz2
More information about the scm-commits
mailing list