[asc] New upstream version 2.4.0.0 Rebuild for new boost
Hans de Goede
jwrdegoede at fedoraproject.org
Sat Jul 23 19:05:51 UTC 2011
commit 6bf3d29e72e69b6980925b57225f4cfbb26a9b18
Author: Hans de Goede <hdegoede at redhat.com>
Date: Sat Jul 23 21:07:09 2011 +0200
New upstream version 2.4.0.0
Rebuild for new boost
.gitignore | 1 +
asc-2.0.1.0-gcc43.patch | 158 -----------------------------------------------
asc.spec | 30 ++++-----
sources | 2 +-
4 files changed, 15 insertions(+), 176 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7c197e7..7ef4846 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
asc-2.2.0.0.tar.bz2
+/asc-2.4.0.0.tar.bz2
diff --git a/asc.spec b/asc.spec
index 6b6d71d..373375e 100644
--- a/asc.spec
+++ b/asc.spec
@@ -1,14 +1,12 @@
Name: asc
-Version: 2.2.0.0
-Release: 11%{?dist}
+Version: 2.4.0.0
+Release: 1%{?dist}
Summary: Advanced Strategic Command
Group: Amusements/Games
License: GPLv2+
URL: http://www.asc-hq.org/
Source0: http://downloads.sourceforge.net/asc-hq/asc-%{version}.tar.bz2
Source1: %{name}.desktop
-Patch0: asc-2.0.1.0-gcc43.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL_image-devel SDL_mixer-devel SDL_sound-devel
BuildRequires: bzip2-devel libjpeg-devel libsigc++-devel physfs-devel
BuildRequires: libvorbis-devel libpng-devel libtiff-devel boost-devel
@@ -21,7 +19,6 @@ ASC is a free, turn based strategy game.
%prep
%setup -q
-%patch0 -p1 -z .foo
sed -i 's|$datadir/games/|$datadir/|g' configure
sed -i 's|$(datadir)/games/|$(datadir)/|g' `find -name Makefile.in`
chmod -x source/libs/paragui/include/paragui.h
@@ -36,7 +33,6 @@ convert data/%{name}.ico %{name}.png
%install
-rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# below is the desktop file and icon stuff.
@@ -52,22 +48,18 @@ install -m 644 %{name}-0.png \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
-%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
+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
%defattr(-,root,root,-)
@@ -80,6 +72,10 @@ fi
%changelog
+* Sat Jul 23 2011 Hans de Goede <hdegoede at redhat.com> - 2.4.0.0-1
+- New upstream version 2.4.0.0
+- Rebuild for new boost
+
* Thu Apr 07 2011 Hans de Goede <hdegoede at redhat.com> - 2.2.0.0-11
- Rebuild for new boost
diff --git a/sources b/sources
index a5d4e63..66f9f9c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a5207e63109bb81b432542d0b43e9970 asc-2.2.0.0.tar.bz2
+8c18a7cf84cb53b04527d864301d405d asc-2.4.0.0.tar.bz2
More information about the scm-commits
mailing list