[CriticalMass] Remove no longer needed autoreconf call, %configure from redhat-rpm-config
Hans de Goede
jwrdegoede at fedoraproject.org
Fri May 10 07:25:01 UTC 2013
commit 0dea313d58e37669e6cc6da0e2661aba3fd9630f
Author: Hans de Goede <hdegoede at redhat.com>
Date: Fri May 10 09:28:59 2013 +0200
Remove no longer needed autoreconf call, %configure from redhat-rpm-config
>= 9.1.0-42 updates config.guess and config.sub for new architecture support
CriticalMass.spec | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
---
diff --git a/CriticalMass.spec b/CriticalMass.spec
index ed3036c..92b22f4 100644
--- a/CriticalMass.spec
+++ b/CriticalMass.spec
@@ -1,6 +1,6 @@
Name: CriticalMass
Version: 1.5
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: SDL/OpenGL space shoot'em up game also known as critter
Group: Amusements/Games
License: GPLv2+
@@ -11,7 +11,7 @@ Patch0: CriticalMass-1.0.2-res-change-rh566533.patch
Patch1: CriticalMass-1.5-libpng15.patch
Patch2: CriticalMass-1.5-gcc47.patch
BuildRequires: SDL_image-devel SDL_mixer-devel libpng-devel curl-devel
-BuildRequires: tinyxml-devel desktop-file-utils libtool
+BuildRequires: tinyxml-devel desktop-file-utils
Requires: hicolor-icon-theme opengl-games-utils
# Also known as critter, so make "yum install critter" work
Provides: critter = %{version}-%{release}
@@ -23,15 +23,15 @@ unprepared, your government was unable to defend its precious resources. As
a last effort to recapture some of the "goodies", you have been placed into
a tiny spacecraft and sent after them.
+
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
-touch AUTHORS ChangeLog NEWS README
-autoreconf -i -f
sed -i 's/curl-gnutls/curl/g' configure
+
%build
%configure
# ./configure doesn't properly pick up our CFLAGS, and we need to override
@@ -40,6 +40,7 @@ sed -i 's/curl-gnutls/curl/g' configure
CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE=1 -D_REENTRANT -DGAME_HAS_HERO_PARTICLE -I/usr/include/SDL"
make CFLAGS="$CFLAGS" CXXFLAGS="$CFLAGS -std=c++0x"
+
%install
%make_install
ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/critter-wrapper
@@ -59,6 +60,7 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/256x256/apps
install -p -m 644 critter.png \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/256x256/apps
+
%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -71,6 +73,7 @@ fi
%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
%files
%doc COPYING Readme.html TODO
%{_bindir}/critter*
@@ -80,6 +83,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/icons/hicolor/256x256/apps/critter.png
%changelog
+* Fri May 10 2013 Hans de Goede <hdegoede at redhat.com> - 1.5-9
+- Remove no longer needed autoreconf call, %%configure from redhat-rpm-config
+ >= 9.1.0-42 updates config.guess and config.sub for new architecture support
+
* Wed May 1 2013 Hans de Goede <hdegoede at redhat.com> - 1.5-8
- run autoreconf for aarch64 support (rhbz#925196)
More information about the scm-commits
mailing list