[FlightGear] new upstream release
Fabrice Bellet
bellet at fedoraproject.org
Tue Sep 6 11:56:22 UTC 2011
commit d20a4f35607a170bfc5e95a0c317bedcf14c2955
Author: Fabrice Bellet <fabrice at bellet.info>
Date: Tue Sep 6 13:56:01 2011 +0200
new upstream release
.gitignore | 1 +
FlightGear-0.9.10-no-automake-in-configure.patch | 13 ------
FlightGear-2.0.0-bug133-AILocalTraffic.patch | 34 ----------------
FlightGear-2.0.0-bug133-ATCmgr.patch | 14 -------
...htGear-2.0.0-requested-visual-unavailable.patch | 14 -------
FlightGear.desktop | 3 +-
FlightGear.spec | 42 ++++++++-----------
sources | 2 +-
8 files changed, 21 insertions(+), 102 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7b524fa..0254df8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
FlightGear-2.0.0.tar.gz
+/flightgear-2.4.0.tar.bz2
diff --git a/FlightGear.desktop b/FlightGear.desktop
index 4e66aff..8f06478 100644
--- a/FlightGear.desktop
+++ b/FlightGear.desktop
@@ -1,10 +1,9 @@
[Desktop Entry]
-Encoding=UTF-8
Name=FlightGear
GenericName=Flight Simulator
Comment=Open source and multi-platform flight simulator
Exec=fgfs-wrapper
-Icon=FlightGear.png
+Icon=FlightGear
Terminal=false
Type=Application
Categories=Game;Simulation;
diff --git a/FlightGear.spec b/FlightGear.spec
index 28dea73..adb77a6 100644
--- a/FlightGear.spec
+++ b/FlightGear.spec
@@ -1,11 +1,11 @@
Name: FlightGear
Summary: The FlightGear Flight Simulator
-Version: 2.0.0
-Release: 6%{?dist}
+Version: 2.4.0
+Release: 1%{?dist}
License: GPLv2+
Group: Amusements/Games
-Source: http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Source/FlightGear-%{version}.tar.gz
+Source: http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Source/flightgear-%{version}.tar.bz2
Source1: %{name}.desktop
# these icons were previously available from
# http://jrbabcock.home.comcast.net/flightgear/icons
@@ -15,16 +15,14 @@ Source4: fg-48.png
Source5: fg-64.png
Source6: fg-128.png
Source7: COPYING
-Patch0: FlightGear-0.9.10-no-automake-in-configure.patch
-Patch1: FlightGear-2.0.0-requested-visual-unavailable.patch
-Patch2: FlightGear-2.0.0-bug133-AILocalTraffic.patch
-Patch3: FlightGear-2.0.0-bug133-ATCmgr.patch
URL: http://www.flightgear.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: openal-soft-devel >= 1.11.753, SimGear-devel >= %{version}, freeglut-devel
BuildRequires: OpenSceneGraph-devel >= 2.8.0, boost-devel >= 1.37.0
-BuildRequires: desktop-file-utils
-Requires: FlightGear-data >= 2.0.0, opengl-games-utils
+BuildRequires: desktop-file-utils, apr-devel, subversion-devel
+BuildRequires: automake autoconf intltool libtool
+Requires: FlightGear-data >= 2.4.0, opengl-games-utils
+Requires: hicolor-icon-theme
%description
The Flight Gear project is working to create a sophisticated flight
@@ -33,18 +31,11 @@ flight simulator ideas. We are developing a solid basic sim that can be
expanded and improved upon by anyone interested in contributing
%prep
-%setup -q
-# automake shouldn't be called in configure Summary page
-%patch0 -p1 -b .no-automake-in-configure
-%patch1 -p1 -b .visual-unavailable
-%patch2 -p1 -b .bug133
-%patch3 -p1 -b .bug133
+%setup -q -n flightgear-%{version}
# make rpmlint happy
find -name \*.h -o -name \*.cpp -o -name \*.cxx -o -name \*.hxx \
-o -name \*.hpp |xargs chmod -x
-rm -f docs-mini/README.electrical.~1.5.~ \
- docs-mini/README.xmlsound.~1.1.1.1.~
for f in docs-mini/README.xmlparticles Thanks
do
iconv -f iso-8859-1 -t utf-8 -o ${f}.utf8 ${f}
@@ -94,18 +85,18 @@ install -m 0644 %{SOURCE6} \
%post
update-desktop-database &> /dev/null ||:
-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
update-desktop-database &> /dev/null ||:
-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 || :
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -118,6 +109,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/icons/hicolor/*/apps/*
%changelog
+* Mon Sep 05 2011 Fabrice Bellet <fabrice at bellet.info> 2.4.0-1
+- new upstream release
+
* Tue Jun 14 2011 Ralf Corsépius <corsepiu at fedoraproject.org> - 2.0.0-6
- Rebuild against OSG-2.8.5.
diff --git a/sources b/sources
index a6ded57..d0e8287 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-549aa45171480082f5b6e5e8d5ce8930 FlightGear-2.0.0.tar.gz
+e6e1f8b1def24326fa64ff001e195da7 flightgear-2.4.0.tar.bz2
More information about the scm-commits
mailing list