[adanaxisgpl] Various specfile cleanups Fix building with gcc-4.7
Hans de Goede
jwrdegoede at fedoraproject.org
Fri Jan 13 09:38:47 UTC 2012
commit 6a4a9928972b6424832bddaa28f5b1c9a9ce10ba
Author: Hans de Goede <hdegoede at redhat.com>
Date: Fri Jan 13 10:39:57 2012 +0100
Various specfile cleanups
Fix building with gcc-4.7
adanaxisgpl-1.2.5-gcc47.patch | 12 ++++
adanaxisgpl.spec | 115 ++++++++++++++---------------------------
2 files changed, 51 insertions(+), 76 deletions(-)
---
diff --git a/adanaxisgpl-1.2.5-gcc47.patch b/adanaxisgpl-1.2.5-gcc47.patch
new file mode 100644
index 0000000..c2f093b
--- /dev/null
+++ b/adanaxisgpl-1.2.5-gcc47.patch
@@ -0,0 +1,12 @@
+diff -up adanaxisgpl-1.2.5/src/Mushcore/MushcoreSingleton.h~ adanaxisgpl-1.2.5/src/Mushcore/MushcoreSingleton.h
+--- adanaxisgpl-1.2.5/src/Mushcore/MushcoreSingleton.h~ 2007-04-18 11:23:13.000000000 +0200
++++ adanaxisgpl-1.2.5/src/Mushcore/MushcoreSingleton.h 2012-01-13 10:36:18.638100466 +0100
+@@ -83,7 +83,7 @@ template<class SingletonType>
+ inline void
+ MushcoreSingleton<SingletonType>::SingletonUncheckedNew(void)
+ {
+- SingletonPtrSet(new SingletonType);
++ MushcoreSingleton::SingletonPtrSet(new SingletonType);
+
+ #ifdef MUSHCORE_SINGLETON_TESTING
+ cerr << "Created " << typeid(SingletonType).name() << " singleton " << endl;
diff --git a/adanaxisgpl.spec b/adanaxisgpl.spec
index 9e54558..0428143 100644
--- a/adanaxisgpl.spec
+++ b/adanaxisgpl.spec
@@ -1,59 +1,21 @@
-# Spec file for Mandriva Linux
-# $Id: adanaxisgpl.spec,v 1.6 2009/07/24 16:34:49 jkeating Exp $
-# $Log: adanaxisgpl.spec,v $
-# Revision 1.6 2009/07/24 16:34:49 jkeating
-# - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-#
-# Revision 1.4 2007/10/18 00:04:13 southa
-# Fedora packaging review comments
-#
-# Revision 1.3 2007/10/17 23:44:50 southa
-# Fedora packaging review comments
-#
-# Revision 1.2 2007/09/27 12:10:09 southa
-# Fixed changelog
-#
-# Revision 1.1 2007/09/27 11:52:44 southa
-# Fedora release
-#
-# Revision 1.1 2007/06/30 16:02:14 southa
-# Generic packaging
-#
-# Revision 1.3 2007/06/29 16:48:30 southa
-# Mandriva build
-#
-# Revision 1.2 2007/06/29 14:41:54 southa
-# Mandriva release
-#
-# Revision 1.1 2007/06/29 12:05:04 southa
-# Mandriva packaging
-#
-
-%define title Adanaxis GPL
-%define longtitle Adanaxis GPL - an action game in four spatial dimensions
-
Summary: Action game in four spatial dimensions
Name: adanaxisgpl
Version: 1.2.5
-Release: 7%{?dist}
+Release: 8%{?dist}
License: GPLv2
Group: Amusements/Games
URL: http://www.mushware.com/
-
Source0: http://www.mushware.com/files/%{name}-1.2.5.tar.gz
-
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-
-BuildRequires: desktop-file-utils
-BuildRequires: freeglut-devel
-BuildRequires: expat-devel
-BuildRequires: libjpeg-devel
-BuildRequires: libtiff-devel
-BuildRequires: libvorbis-devel
-BuildRequires: pcre-devel
-BuildRequires: SDL_mixer-devel
-
Patch0: adanaxisgpl-1.2.5-const.patch
+Patch1: adanaxisgpl-1.2.5-gcc47.patch
+BuildRequires: desktop-file-utils
+BuildRequires: freeglut-devel
+BuildRequires: expat-devel
+BuildRequires: libjpeg-devel
+BuildRequires: libtiff-devel
+BuildRequires: libvorbis-devel
+BuildRequires: pcre-devel
+BuildRequires: SDL_mixer-devel
%description
Adanaxis is a fast-moving first person shooter set in deep space, where the
@@ -69,25 +31,23 @@ http://www.mushware.com/.
Hardware-accelerated 3D is recommended, ideally with support for OpenGL
Shading Language.
+
%prep
%setup -q
-%patch0 -p1 -b .const
+%patch0 -p1
+%patch1 -p1
+
%build
%configure
make %{?_smp_mflags}
-%install
-rm -rf %{buildroot}
-make DESTDIR=%{buildroot} INSTALL="install -p" CPPROG="cp -p" install
-
# Build .desktop files
-
cat > %{name}.desktop <<EOF
[Desktop Entry]
Encoding=UTF-8
-Name=%{title}
-Comment=%{longtitle}
+Name=Adanaxis GPL
+Comment=An action game in four spatial dimensions
Exec=%{_bindir}/%{name}
Icon=%{name}
Terminal=false
@@ -98,9 +58,8 @@ EOF
cat > %{name}-recover.desktop <<EOF
[Desktop Entry]
-Encoding=UTF-8
-Name=%{title} (Recovery Mode)
-Comment=%{longtitle} (Launch in Recovery Mode)
+Name=Adanaxis GPL (Recovery Mode)
+Comment=An action game in four spatial dimensions (Launch in Recovery Mode)
Exec=%{_bindir}/%{name} --recover
Icon=%{name}
Terminal=false
@@ -109,8 +68,11 @@ StartupNotify=false
Categories=Game;ActionGame;
EOF
-# Install desktop files
+%install
+make DESTDIR=%{buildroot} INSTALL="install -p" CPPROG="cp -p" install
+
+# Install desktop files
mkdir -p %{buildroot}%{_datadir}/applications
desktop-file-install --vendor=mushware \
--dir %{buildroot}%{_datadir}/applications \
@@ -127,35 +89,36 @@ install -p -m 644 x11/icons/%{name}-16.png %{buildroot}%{_datadir}/icons/hicolor
install -p -m 644 x11/icons/%{name}-32.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
install -p -m 644 x11/icons/%{name}-48.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+
%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
-%clean
-rm -rf %{buildroot}
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
%files
-%defattr(0755,root,root,0755)
-%_bindir/*
-%defattr(0644,root,root,0755)
-%doc COPYING README INSTALL ChangeLog AUTHORS
-%dir %{_datadir}/%{name}
+%doc COPYING README ChangeLog AUTHORS
+%{_bindir}/*
+%{_datadir}/%{name}
%{_datadir}/applications/*
-%{_datadir}/%{name}/*
%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
-%_mandir/man6/%{name}*.6*
+%{_mandir}/man6/%{name}*.6*
+
%changelog
+* Thu Jan 12 2012 Hans de Goede <hdegoede at redhat.com> - 1.2.5-8
+- Various specfile cleanups
+- Fix building with gcc-4.7
+
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.5-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
More information about the scm-commits
mailing list