[vegastrike] Fix building with gcc-4.7
Hans de Goede
jwrdegoede at fedoraproject.org
Tue Jan 17 19:31:24 UTC 2012
commit bef59ad2c1e64f1010bc9996e751b76ac87c0288
Author: Hans de Goede <hdegoede at redhat.com>
Date: Tue Jan 17 20:33:18 2012 +0100
Fix building with gcc-4.7
vegastrike.spec | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
---
diff --git a/vegastrike.spec b/vegastrike.spec
index 01ad1c7..217cc37 100644
--- a/vegastrike.spec
+++ b/vegastrike.spec
@@ -1,6 +1,6 @@
Name: vegastrike
Version: 0.5.1
-Release: 0.5.beta1.2%{?dist}
+Release: 0.6.beta1.2%{?dist}
Summary: 3D OpenGL spaceflight simulator
Group: Amusements/Games
License: GPLv2+
@@ -23,7 +23,7 @@ Patch9: vegastrike-0.5.0-glext.patch
Patch11: vegastrike-0.5.1-gcc46.patch
Patch12: vegastrike-0.5.1-boost146.patch
Patch13: vegastrike-libpng15.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch14: vegastrike-0.5.1-gcc47.patch
BuildRequires: libGLU-devel freeglut-devel libXi-devel libXmu-devel gtk2-devel
BuildRequires: libjpeg-devel libpng-devel boost-devel expat-devel python-devel
BuildRequires: SDL_mixer-devel openal-soft-devel freealut-devel
@@ -52,6 +52,7 @@ Yet danger lurks in the space beyond.
%patch11 -p0
%patch12 -p0
%patch13 -z libpng
+%patch14 -p1
iconv -f ISO-8859-1 -t UTF-8 README > README.tmp
touch -r README README.tmp
mv README.tmp README
@@ -68,7 +69,6 @@ make %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT
#make install PREFIX=$RPM_BUILD_ROOT doesn't work
%makeinstall
install -p -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}
@@ -92,12 +92,7 @@ desktop-file-install --vendor fedora \
%{SOURCE3}
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
%files
-%defattr(-,root,root,-)
%doc AUTHORS COPYING DOCUMENTATION README ToDo.txt
%{_bindir}/vega*
%{_bindir}/vs*
@@ -107,6 +102,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Jan 17 2012 Hans de Goede <hdegoede at redhat.com> - 0.5.1-0.6.beta1.2
+- Fix building with gcc-4.7
+
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.1-0.5.beta1.2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
More information about the scm-commits
mailing list