corsepiu pushed to FlightGear (master). "Rebuild for Gcc-5.0.1 (FTBFS, RHBZ#1212707). (..more)"

notifications at fedoraproject.org notifications at fedoraproject.org
Fri Apr 17 09:53:04 UTC 2015


>From 16d449348f09a90ef4ec0ce88525d151f97eea32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu at fedoraproject.org>
Date: Fri, 17 Apr 2015 11:52:50 +0200
Subject: Rebuild for Gcc-5.0.1 (FTBFS, RHBZ#1212707).

- Modernize spec.
- Add %license.

diff --git a/FlightGear.spec b/FlightGear.spec
index 2a0770e..96db314 100644
--- a/FlightGear.spec
+++ b/FlightGear.spec
@@ -1,9 +1,8 @@
 Name:           FlightGear
 Summary:        The FlightGear Flight Simulator
 Version:        3.4.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        GPLv2+
-Group:          Amusements/Games
 Source0:        http://mirrors.ibiblio.org/flightgear/ftp/Source/flightgear-%{version}.tar.bz2
 Source1:        %{name}.desktop
 # these icons were previously available from
@@ -21,7 +20,6 @@ Patch5:         0005-explicitely-link-with-libX11.patch
 Patch6:         0006-make-fglauncher-a-static-library.patch
 
 URL:            http://www.flightgear.org/
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  openal-soft-devel, SimGear-devel >= %{version}
 BuildRequires:  libpng-devel, freeglut-devel, libXi-devel, libXmu-devel
 BuildRequires:  OpenSceneGraph-devel >= 3.0.0, boost-devel >= 1.44.0
@@ -74,7 +72,6 @@ cp %{SOURCE7} COPYING.icons
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/fgfs-wrapper
 
@@ -164,12 +161,9 @@ fi
 %posttrans
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
-%defattr(-, root, root, -)
-%doc AUTHORS COPYING COPYING.icons NEWS README Thanks docs-mini/*
+%doc AUTHORS NEWS README Thanks docs-mini/*
+%license COPYING COPYING.icons
 %{_bindir}/*
 %{_mandir}/*/*
 %{_datadir}/appdata/*.appdata.xml
@@ -177,6 +171,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Fri Apr 17 2015 Ralf Corsépius <corsepiu at fedoraproject.org> - 3.4.0-3
+- Rebuild for Gcc-5.0.1 (FTBFS, RHBZ#1212707).
+- Modernize spec.
+- Add %%license.
+
 * Thu Mar 26 2015 Richard Hughes <rhughes at redhat.com> - 3.4.0-2
 - Add an AppData file for the software center
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/FlightGear.git/commit/?h=master&id=16d449348f09a90ef4ec0ce88525d151f97eea32


More information about the scm-commits mailing list