[FlightGear] new upstream release
Fabrice Bellet
bellet at fedoraproject.org
Tue Feb 28 21:20:04 UTC 2012
commit be1cef65665b26b4dc05d78963ff1c3e14adb4c5
Author: Fabrice Bellet <fabrice at bellet.info>
Date: Tue Feb 28 22:20:02 2012 +0100
new upstream release
.gitignore | 1 +
0001-add-zlib-dependency-to-fgadmin.patch | 24 +++++++++++++++++++
0002-fix-build-with-gcc-4.7.0.patch | 24 +++++++++++++++++++
FlightGear-2.4.0-gcc47-2.patch | 10 --------
FlightGear-2.4.0-gcc47-3.patch | 18 ---------------
FlightGear-2.4.0-gcc47.patch | 12 ----------
FlightGear.spec | 35 ++++++++++++++---------------
sources | 2 +-
8 files changed, 67 insertions(+), 59 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0254df8..6605aab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
FlightGear-2.0.0.tar.gz
/flightgear-2.4.0.tar.bz2
+/flightgear-2.6.0.tar.bz2
diff --git a/0001-add-zlib-dependency-to-fgadmin.patch b/0001-add-zlib-dependency-to-fgadmin.patch
new file mode 100644
index 0000000..6c1fd85
--- /dev/null
+++ b/0001-add-zlib-dependency-to-fgadmin.patch
@@ -0,0 +1,24 @@
+From cda4e1097741c2fe968c07bd10a7668d6a012e6f Mon Sep 17 00:00:00 2001
+From: Fabrice Bellet <fabrice at bellet.info>
+Date: Sun, 22 Jan 2012 15:28:45 +0100
+Subject: [PATCH 1/2] add zlib dependency to fgadmin
+
+---
+ utils/fgadmin/src/CMakeLists.txt | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/utils/fgadmin/src/CMakeLists.txt b/utils/fgadmin/src/CMakeLists.txt
+index 222a4c6..a6f9485 100644
+--- a/utils/fgadmin/src/CMakeLists.txt
++++ b/utils/fgadmin/src/CMakeLists.txt
+@@ -9,6 +9,7 @@ target_link_libraries(fgadmin FGAdminUI
+ ${SIMGEAR_CORE_LIBRARIES}
+ ${PLIB_LIBRARIES}
+ ${FLTK_LIBRARIES}
++ ${ZLIB_LIBRARY}
+ ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
+ ${ZLIB_LIBRARY}
+ )
+--
+1.7.7.5
+
diff --git a/0002-fix-build-with-gcc-4.7.0.patch b/0002-fix-build-with-gcc-4.7.0.patch
new file mode 100644
index 0000000..efe083c
--- /dev/null
+++ b/0002-fix-build-with-gcc-4.7.0.patch
@@ -0,0 +1,24 @@
+From c9fb92d12fe60e819f0af20265796b1f85424c03 Mon Sep 17 00:00:00 2001
+From: Fabrice Bellet <fabrice at bellet.info>
+Date: Sun, 22 Jan 2012 15:30:26 +0100
+Subject: [PATCH 2/2] fix build with gcc-4.7.0
+
+---
+ utils/TerraSync/terrasync.cxx | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/utils/TerraSync/terrasync.cxx b/utils/TerraSync/terrasync.cxx
+index c70fbaa..25ea117 100644
+--- a/utils/TerraSync/terrasync.cxx
++++ b/utils/TerraSync/terrasync.cxx
+@@ -42,6 +42,7 @@
+
+ #include <stdlib.h> // atoi() atof() abs() system()
+ #include <signal.h> // signal()
++#include <unistd.h> // sleep() getpid() write()
+
+ #include <simgear/compiler.h>
+
+--
+1.7.7.5
+
diff --git a/FlightGear.spec b/FlightGear.spec
index c607a36..c320df5 100644
--- a/FlightGear.spec
+++ b/FlightGear.spec
@@ -1,8 +1,7 @@
Name: FlightGear
Summary: The FlightGear Flight Simulator
-Version: 2.4.0
-Release: 3%{?dist}
-
+Version: 2.6.0
+Release: 1%{?dist}
License: GPLv2+
Group: Amusements/Games
Source: http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Source/flightgear-%{version}.tar.bz2
@@ -15,20 +14,14 @@ Source4: fg-48.png
Source5: fg-64.png
Source6: fg-128.png
Source7: COPYING
-# taken from http://gitorious.org/fg/flightgear/commit/b1b4b7ecf48c4420d4445979c36cbf3f80be616a
-# Should be safe to drop when 2.6.0 lands.
-Patch1: FlightGear-2.4.0-gcc47.patch
-# compile fix of terrasync
-Patch2: FlightGear-2.4.0-gcc47-2.patch
-# http://gitorious.org/fg/flightgear/commit/617fb0299b138c6bc2c44fa3621c55cb16ef4258
-# Should be safe to drop when 2.6.0 lands.
-Patch3: FlightGear-2.4.0-gcc47-3.patch
+Patch1: 0001-add-zlib-dependency-to-fgadmin.patch
+Patch2: 0002-fix-build-with-gcc-4.7.0.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: openal-soft-devel >= 1.11.753, SimGear-devel >= %{version}
+BuildRequires: libpng-devel, freeglut-devel, libXi-devel, libXmu-devel
BuildRequires: OpenSceneGraph-devel >= 2.8.0, boost-devel >= 1.37.0
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
@@ -42,7 +35,6 @@ expanded and improved upon by anyone interested in contributing
%setup -q -n flightgear-%{version}
%patch1 -p1
%patch2 -p1
-%patch3 -p1
# make rpmlint happy
find -name \*.h -o -name \*.cpp -o -name \*.cxx -o -name \*.hxx \
@@ -63,13 +55,17 @@ done
cp %{SOURCE7} COPYING.icons
%build
-%configure
-# the application doesn't build with _smp_mflags.
-make
+%{cmake} \
+ -DSIMGEAR_SHARED=ON \
+ -DJPEG_FACTORY=ON \
+ -DFG_DATA_DIR:PATH=%{_datadir}/flightgear \
+ -DCMAKE_INSTALL_DOCDIR:PATH=%{_docdir}/%{name}-%{version} \
+.
+make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make DESTDIR=$RPM_BUILD_ROOT install
ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/fgfs-wrapper
desktop-file-install --vendor="fedora" \
@@ -120,6 +116,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/icons/hicolor/*/apps/*
%changelog
+* Sun Feb 19 2012 Fabrice Bellet <fabrice at bellet.info> 2.6.0-1
+- new upstream release
+
* Sat Jan 21 2012 Fabrice Bellet <fabrice at bellet.info> 2.4.0-3
- Fix gcc 4.7.0 compile issues in rawhide
diff --git a/sources b/sources
index d0e8287..8f10261 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e6e1f8b1def24326fa64ff001e195da7 flightgear-2.4.0.tar.bz2
+943f784f55c7e11ddce6082d2d1dbba4 flightgear-2.6.0.tar.bz2
More information about the scm-commits
mailing list