[SimGear] new upstream release
Fabrice Bellet
bellet at fedoraproject.org
Tue Feb 28 20:41:11 UTC 2012
commit 32916329604fc76d4dae6d4113b10ba726448003
Author: Fabrice Bellet <fabrice at bellet.info>
Date: Tue Feb 28 21:41:09 2012 +0100
new upstream release
.gitignore | 1 +
0001-add-more-arches.patch | 25 +
...ld-bundled-copy-of-expat-use-system-expat.patch | 105 ++
0003-remove-unneeded-header.patch | 27 +
SimGear-1.9.0-headers.patch | 25 -
SimGear-2.0.0-more-archs.patch | 12 -
SimGear-2.4.0-dependencies.patch | 214 ----
SimGear-2.4.0-dont-build-noinst-programs.patch | 336 -------
SimGear-2.4.0-expat.patch | 76 --
SimGear-2.4.0-gcc47.patch | 12 -
SimGear-2.4.0-shared.patch | 1038 --------------------
SimGear.spec | 88 +--
b261836f7182b5442b464907c8b084bde0bfded3.patch | 166 ----
sources | 2 +-
14 files changed, 178 insertions(+), 1949 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e8b6c72..ade419f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
SimGear-2.0.0.tar.gz
/simgear-2.4.0.tar.bz2
+/simgear-2.6.0.tar.bz2
diff --git a/0001-add-more-arches.patch b/0001-add-more-arches.patch
new file mode 100644
index 0000000..f1b9f75
--- /dev/null
+++ b/0001-add-more-arches.patch
@@ -0,0 +1,25 @@
+From c39bf197c059ff2dc12a154b13b9b5b129ec2a05 Mon Sep 17 00:00:00 2001
+From: Fabrice Bellet <fabrice at bellet.info>
+Date: Sun, 22 Jan 2012 14:39:46 +0100
+Subject: [PATCH 1/3] add more arches
+
+---
+ simgear/nasal/naref.h | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/simgear/nasal/naref.h b/simgear/nasal/naref.h
+index beedece..d9fe70d 100644
+--- a/simgear/nasal/naref.h
++++ b/simgear/nasal/naref.h
+@@ -15,7 +15,7 @@
+ defined(_M_X64)
+ # define NASAL_LE
+ #elif defined(__sparc) || defined(__ppc__) || defined(__PPC) || \
+- defined(__mips) || defined(__ARMEB__)
++ defined(__mips) || defined(__ARMEB__) || defined(__powerpc__) || defined(__powerpc64__) || defined(__alpha__) || defined(__s390__)
+ # define NASAL_BE
+ #else
+ # error Unrecognized CPU architecture
+--
+1.7.7.6
+
diff --git a/0002-nuke-old-bundled-copy-of-expat-use-system-expat.patch b/0002-nuke-old-bundled-copy-of-expat-use-system-expat.patch
new file mode 100644
index 0000000..0c67f2d
--- /dev/null
+++ b/0002-nuke-old-bundled-copy-of-expat-use-system-expat.patch
@@ -0,0 +1,105 @@
+From ef78b966702e3463dd7b15d42787346fc6e8f22a Mon Sep 17 00:00:00 2001
+From: Fabrice Bellet <fabrice at bellet.info>
+Date: Sun, 22 Jan 2012 14:41:59 +0100
+Subject: [PATCH 2/3] nuke old bundled copy of expat, use system expat
+
+---
+ CMakeLists.txt | 4 +++-
+ simgear/CMakeLists.txt | 2 +-
+ simgear/props/CMakeLists.txt | 4 +++-
+ simgear/xml/CMakeLists.txt | 15 ---------------
+ simgear/xml/easyxml.cxx | 2 +-
+ 5 files changed, 8 insertions(+), 19 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 037ede6..cdafb35 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -112,6 +112,7 @@ set (BOOST_CXX_FLAGS "-DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION -DBOOST_BIMAP_DI
+
+ find_package(ZLIB REQUIRED)
+ find_package(Threads REQUIRED)
++find_package(EXPAT REQUIRED)
+
+ if(SIMGEAR_HEADLESS)
+ message(STATUS "headless mode")
+@@ -229,7 +230,8 @@ include_directories(${PROJECT_BINARY_DIR}/simgear)
+
+ include_directories(${OPENSCENEGRAPH_INCLUDE_DIRS}
+ ${Boost_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR}
+- ${ALUT_INCLUDE_DIR} ${OPENAL_INCLUDE_DIR} )
++ ${ALUT_INCLUDE_DIR} ${OPENAL_INCLUDE_DIR}
++ ${EXPAT_INCLUDE_DIR} )
+
+
+ add_definitions(-DHAVE_CONFIG_H)
+diff --git a/simgear/CMakeLists.txt b/simgear/CMakeLists.txt
+index 684e2ee..4d45799 100644
+--- a/simgear/CMakeLists.txt
++++ b/simgear/CMakeLists.txt
+@@ -56,7 +56,7 @@ if(SIMGEAR_SHARED)
+ set_property(TARGET SimGearCore PROPERTY VERSION ${SIMGEAR_VERSION})
+ set_property(TARGET SimGearCore PROPERTY SOVERSION ${SIMGEAR_SOVERSION})
+
+- target_link_libraries(SimGearCore ${ZLIB_LIBRARY} ${RT_LIBRARY})
++ target_link_libraries(SimGearCore ${ZLIB_LIBRARY} ${RT_LIBRARY} ${EXPAT_LIBRARY})
+ install(TARGETS SimGearCore LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+
+ if(NOT SIMGEAR_HEADLESS)
+diff --git a/simgear/props/CMakeLists.txt b/simgear/props/CMakeLists.txt
+index f0dcbed..b79479e 100644
+--- a/simgear/props/CMakeLists.txt
++++ b/simgear/props/CMakeLists.txt
+@@ -27,7 +27,9 @@ if(ENABLE_TESTS)
+ if (SIMGEAR_SHARED)
+ set(TEST_LIBS SimGearCore)
+ else()
+- set(TEST_LIBS sgprops sgxml sgstructure sgmisc sgdebug)
++ set(TEST_LIBS
++ sgprops sgxml sgstructure sgmisc sgdebug
++ ${EXPAT_LIBRARY})
+ endif()
+
+
+diff --git a/simgear/xml/CMakeLists.txt b/simgear/xml/CMakeLists.txt
+index 0365e86..e2dae9e 100644
+--- a/simgear/xml/CMakeLists.txt
++++ b/simgear/xml/CMakeLists.txt
+@@ -7,21 +7,6 @@ set(HEADERS
+ )
+
+ set(SOURCES
+- asciitab.h
+- hashtable.h
+- iasciitab.h
+- latin1tab.h
+- nametab.h
+- utf8tab.h
+- xmldef.h
+- xmlparse.h
+- xmlrole.h
+- xmltok.h
+- xmltok_impl.h
+- hashtable.c
+- xmlparse.c
+- xmlrole.c
+- xmltok.c
+ easyxml.cxx
+ )
+
+diff --git a/simgear/xml/easyxml.cxx b/simgear/xml/easyxml.cxx
+index 65a3551..0a5b617 100644
+--- a/simgear/xml/easyxml.cxx
++++ b/simgear/xml/easyxml.cxx
+@@ -9,7 +9,7 @@
+ #include <string.h> // strcmp()
+
+ #include "easyxml.hxx"
+-#include "xmlparse.h"
++#include <expat.h>
+
+ #include <fstream>
+ #include <iostream>
+--
+1.7.7.6
+
diff --git a/0003-remove-unneeded-header.patch b/0003-remove-unneeded-header.patch
new file mode 100644
index 0000000..5fdd920
--- /dev/null
+++ b/0003-remove-unneeded-header.patch
@@ -0,0 +1,27 @@
+From bb277bb11e69ab6cc4cd219c6603ddba1a65400d Mon Sep 17 00:00:00 2001
+From: Fabrice Bellet <fabrice at bellet.info>
+Date: Mon, 30 Jan 2012 22:01:55 +0100
+Subject: [PATCH 3/3] remove unneeded header
+
+---
+ simgear/misc/stopwatch.hxx | 4 ----
+ 1 files changed, 0 insertions(+), 4 deletions(-)
+
+diff --git a/simgear/misc/stopwatch.hxx b/simgear/misc/stopwatch.hxx
+index 3436438..70df459 100644
+--- a/simgear/misc/stopwatch.hxx
++++ b/simgear/misc/stopwatch.hxx
+@@ -42,10 +42,6 @@
+ # error This library requires C++
+ #endif
+
+-#ifdef HAVE_CONFIG_H
+-# include <simgear_config.h>
+-#endif
+-
+ #if defined(__linux__) && ! defined(HAVE_GETRUSAGE)
+ # define HAVE_GETRUSAGE
+ #endif
+--
+1.7.7.6
+
diff --git a/SimGear.spec b/SimGear.spec
index 06d0c40..d4177e2 100644
--- a/SimGear.spec
+++ b/SimGear.spec
@@ -1,32 +1,21 @@
Name: SimGear
-Version: 2.4.0
-Release: 3%{?dist}
+Version: 2.6.0
+Release: 1%{?dist}
License: GPLv2+
Group: System Environment/Libraries
Summary: Simulation library components
URL: http://simgear.sourceforge.net
Source0: http://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/simgear-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch0: SimGear-2.4.0-shared.patch
-Patch1: SimGear-2.4.0-dont-build-noinst-programs.patch
-Patch2: SimGear-2.4.0-dependencies.patch
-Patch4: SimGear-2.0.0-more-archs.patch
-Patch5: SimGear-2.4.0-expat.patch
-Patch100: SimGear-1.9.0-headers.patch
-# http://code.google.com/p/flightgear-bugs/issues/detail?id=512
-# https://www.gitorious.org/fg/simgear/commit/b261836f7182b5442b464907c8b084bde0bfded3
-# Should be safe to drop when 2.6.0 lands.
-Patch101: b261836f7182b5442b464907c8b084bde0bfded3.patch
-# https://www.gitorious.org/fg/simgear/commit/bcf7ed501d02d57cc8038c270db380a01a23da72
-# Should be safe to drop when 2.6.0 lands.
-Patch102: SimGear-2.4.0-gcc47.patch
+Patch1: 0001-add-more-arches.patch
+Patch2: 0002-nuke-old-bundled-copy-of-expat-use-system-expat.patch
+Patch3: 0003-remove-unneeded-header.patch
BuildRequires: openal-soft-devel, plib-devel >= 1.8.5
BuildRequires: OpenSceneGraph-devel >= 2.8.0
BuildRequires: boost-devel >= 1.37.0
BuildRequires: libXt-devel, libXext-devel
BuildRequires: libXi-devel, libXmu-devel, freeglut-devel, freealut-devel
BuildRequires: zlib-devel, libjpeg-devel
-BuildRequires: automake autoconf intltool libtool
BuildRequires: expat-devel, apr-devel
%description
@@ -47,21 +36,8 @@ SimGear.
%prep
%setup -q -n simgear-%{version}
-# automake / autoconf input file changes
-%patch0 -p1
-# dont build programs that won't be installed
-# (as a side effect, this allows parallel build to work)
%patch1 -p1
-# add a minimal set of dependencies between shared libs
%patch2 -p1
-# Fix compiling on pcc and alpha
-%patch4 -p1
-# Use expat
-%patch5 -p1 -b .expat
-# Fix boost
-%patch101 -p1 -b .boostfix
-# Fix compile with gcc 4.7.0
-%patch102 -p1 -b .gcc47
# makes rpmlint happy
find -name \*.cxx -o -name \*.hxx | xargs chmod -x
@@ -70,28 +46,21 @@ find -name \*.cxx -o -name \*.hxx | xargs chmod -x
rm -rf simgear/xml/*.h simgear/xml/*.c
%build
-mkdir m4
-autoreconf -i
-%configure --with-jpeg-factory --disable-static
-# Don't use rpath!
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-# We do not want -lm by default!
-sed -i 's/ -lm / /g' libtool
-# The libs override are to avoid unnecessary linking with -lm
-make %{?_smp_mflags} base_LIBS= openal_LIBS="-lalut -lopenal" \
- opengl_LIBS="-lglut -lGLU -lGL -lXmu -lXt -lSM -lICE -lXi -lXext -lX11" expat_LIBS="-lexpat"
+%{cmake} \
+ -DENABLE_TESTS=OFF \
+ -DSIMGEAR_SHARED=ON \
+ -DJPEG_FACTORY=ON \
+.
+make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
-# Don't really need the .la files.
-rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
# These two headers have a useless conditional when they're not internal.
# This cleans them up.
cd $RPM_BUILD_ROOT%{_includedir}/simgear/
-patch -p0 < %{PATCH100}
+patch -p2 < %{PATCH3}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -103,38 +72,19 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc COPYING AUTHORS NEWS
-%{_libdir}/lib*-%{version}*.so
+%{_libdir}/libSimGearCore.so.%{version}
+%{_libdir}/libSimGearScene.so.%{version}
%files devel
%defattr(-,root,root,-)
%{_includedir}/simgear/
-%{_libdir}/libsgbucket.so
-%{_libdir}/libsgbvh.so
-%{_libdir}/libsgdebug.so
-%{_libdir}/libsgenvironment.so
-%{_libdir}/libsgephem.so
-%{_libdir}/libsgio.so
-%{_libdir}/libsgmagvar.so
-%{_libdir}/libsgmaterial.so
-%{_libdir}/libsgmath.so
-%{_libdir}/libsgmisc.so
-%{_libdir}/libsgmodel.so
-%{_libdir}/libsgnasal.so
-%{_libdir}/libsgprops.so
-%{_libdir}/libsgroute.so
-%{_libdir}/libsgscreen.so
-%{_libdir}/libsgserial.so
-%{_libdir}/libsgsky.so
-%{_libdir}/libsgsound.so
-%{_libdir}/libsgstructure.so
-%{_libdir}/libsgtgdb.so
-%{_libdir}/libsgtsync.so
-%{_libdir}/libsgthreads.so
-%{_libdir}/libsgtiming.so
-%{_libdir}/libsgutil.so
-%{_libdir}/libsgxml.so
+%{_libdir}/libSimGearCore.so
+%{_libdir}/libSimGearScene.so
%changelog
+* Sun Feb 19 2012 Fabrice Bellet <fabrice at bellet.info> 2.6.0-1
+- new upstream release
+
* Mon Jan 16 2012 Tom Callaway <spot at fedoraproject.org> - 2.4.0-3
- fix boost compile issue in rawhide
- fix gcc 4.7 compile issue in rawhide
diff --git a/sources b/sources
index 6778b49..b7fdab2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-31f4ce7254a43229f050a8f86d6966ef simgear-2.4.0.tar.bz2
+24a368754d10e50d7f3ec00f93891a89 simgear-2.6.0.tar.bz2
More information about the scm-commits
mailing list