diff --git a/.gitignore b/.gitignore index a2e3deb..967c8e1 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ SimGear-2.0.0.tar.gz /simgear-3.4.0.tar.bz2 /simgear-3.6.0.tar.bz2 /simgear-3.7.0.tar.bz2 +/simgear-2016.1.1.tar.bz2 diff --git a/0001-remove-unneeded-header.patch b/0001-remove-unneeded-header.patch index dfd01a2..4a7d634 100644 --- a/0001-remove-unneeded-header.patch +++ b/0001-remove-unneeded-header.patch @@ -1,4 +1,4 @@ -From 7582f901238bd6e953568ec6d9de9cc373b01220 Mon Sep 17 00:00:00 2001 +From 39dd6ae35c18295db54dd5fe4720e10c6e2aeb9f Mon Sep 17 00:00:00 2001 From: Fabrice Bellet Date: Sun, 22 Sep 2013 11:54:54 +0200 Subject: [PATCH] remove unneeded header @@ -23,5 +23,5 @@ index 3436438..70df459 100644 # define HAVE_GETRUSAGE #endif -- -1.9.3 +2.5.0 diff --git a/0002-check-to-be-sure-that-n-is-not-being-set-as-format-t.patch b/0002-check-to-be-sure-that-n-is-not-being-set-as-format-t.patch index f4debb0..832cdba 100644 --- a/0002-check-to-be-sure-that-n-is-not-being-set-as-format-t.patch +++ b/0002-check-to-be-sure-that-n-is-not-being-set-as-format-t.patch @@ -1,4 +1,4 @@ -From 15ed31a1ed2f3ef45a620917dd97f828e4fd33be Mon Sep 17 00:00:00 2001 +From 1d867ab2d0c5803290c6ba8b9c96753341901681 Mon Sep 17 00:00:00 2001 From: Fabrice Bellet Date: Sun, 22 Sep 2013 11:56:12 +0200 Subject: [PATCH] check to be sure that %n is not being set as format type @@ -30,5 +30,5 @@ index 1da6c57..3093d82 100644 if( numeric ) { double d = property->getDoubleValue() * scale + offset; -- -1.9.3 +2.5.0 diff --git a/0003-fix-support-for-aarch64.patch b/0003-fix-support-for-aarch64.patch new file mode 100644 index 0000000..c691134 --- /dev/null +++ b/0003-fix-support-for-aarch64.patch @@ -0,0 +1,25 @@ +From 263f6b03d573a051ef9fb5124a188123eb818633 Mon Sep 17 00:00:00 2001 +From: Fabrice Bellet +Date: Fri, 19 Feb 2016 15:57:19 +0100 +Subject: [PATCH] fix support for aarch64 + +--- + simgear/nasal/naref.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/simgear/nasal/naref.h b/simgear/nasal/naref.h +index a8a7167..5d3d306 100644 +--- a/simgear/nasal/naref.h ++++ b/simgear/nasal/naref.h +@@ -19,7 +19,7 @@ + # endif + #elif defined(_M_IX86) || defined(__i386) || defined(__x86_64) || \ + defined(__ia64__) || defined(_M_IA64) || defined(__ARMEL__) || \ +- defined(_M_X64) || defined(_M_ARM) ++ defined(_M_X64) || defined(_M_ARM) || defined(__aarch64__) + # define NASAL_LE + #elif defined(__sparc) || defined(__ARMEB__) || \ + defined(__hppa__) || defined(__s390__) || defined(__s390x__) +-- +2.5.0 + diff --git a/0003-math-void-getMaxSubdiv-does-not-make-any-sense.patch b/0003-math-void-getMaxSubdiv-does-not-make-any-sense.patch deleted file mode 100644 index 7b50b30..0000000 --- a/0003-math-void-getMaxSubdiv-does-not-make-any-sense.patch +++ /dev/null @@ -1,27 +0,0 @@ -From a6290e367a461b9b083fd2331ccf8f9edf624e69 Mon Sep 17 00:00:00 2001 -From: "Rebecca N. Palmer" -Date: Sat, 6 Feb 2016 21:16:27 +0000 -Subject: [PATCH] math: 'void getMaxSubdiv' does not make any sense - -Fixes build failure with GCC 6: https://bugs.debian.org/812014 -(getMaxSubdiv is currently unused) ---- - simgear/math/beziercurve.hxx | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/simgear/math/beziercurve.hxx b/simgear/math/beziercurve.hxx -index b565832..5654534 100644 ---- a/simgear/math/beziercurve.hxx -+++ b/simgear/math/beziercurve.hxx -@@ -59,7 +59,7 @@ namespace simgear - } - - void setMaxSubdiv( size_t aMaxSubdiv ) { mMaxSubdiv = aMaxSubdiv; } -- void getMaxSubdiv() const { return mMaxSubdiv; } -+ size_t getMaxSubdiv() const { return mMaxSubdiv; } - PointList &pointList() { return mPointList; } - const PointList &pointList() const { return mPointList; } - --- -2.5.0 - diff --git a/0004-Fix-cmake-config-package-location.patch b/0004-Fix-cmake-config-package-location.patch new file mode 100644 index 0000000..bceee29 --- /dev/null +++ b/0004-Fix-cmake-config-package-location.patch @@ -0,0 +1,25 @@ +From 8755f6126a42ec401ce6a0d4c5dc679d1994bdc2 Mon Sep 17 00:00:00 2001 +From: Fabrice Bellet +Date: Fri, 19 Feb 2016 19:14:54 +0100 +Subject: [PATCH] Fix cmake config package location + +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index dffb095..aee8747 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -446,7 +446,7 @@ configure_file(SimGearConfig.cmake.in + @ONLY + ) + +-set(ConfigPackageLocation lib/cmake/SimGear) ++set(ConfigPackageLocation "${CMAKE_INSTALL_LIBDIR}/cmake/SimGear") + install(EXPORT SimGearTargets + DESTINATION ${ConfigPackageLocation} + ) +-- +2.5.0 + diff --git a/SimGear.spec b/SimGear.spec index 20077d5..be621e5 100644 --- a/SimGear.spec +++ b/SimGear.spec @@ -1,20 +1,14 @@ Name: SimGear -Version: 3.7.0 -Release: 5%{?dist} +Version: 2016.1.1 +Release: 1%{?dist} License: GPLv2+ Summary: Simulation library components URL: http://simgear.sourceforge.net -# git clone http://git.code.sf.net/p/flightgear/simgear simgear-3.7.0 -# cd simgear-3.7.0/ -# # This is the commit for 3.6.0 -# git checkout c7a60d4dc488eed4032197d0bad845be45440508 -# cd .. -# tar --exclude-vcs -cjf simgear-3.7.0.tar.bz2 simgear-3.7.0 -Source0: simgear-%{version}.tar.bz2 +Source0: https://sourceforge.net/projects/flightgear/files/release-2016.1/simgear-%{version}.tar.bz2 Patch1: 0001-remove-unneeded-header.patch Patch2: 0002-check-to-be-sure-that-n-is-not-being-set-as-format-t.patch -Patch3: 0003-math-void-getMaxSubdiv-does-not-make-any-sense.patch -Patch4: simgear-3.6.0-aarch64.patch +Patch3: 0003-fix-support-for-aarch64.patch +Patch4: 0004-Fix-cmake-config-package-location.patch BuildRequires: openal-soft-devel BuildRequires: OpenSceneGraph-devel >= 3.0.0 BuildRequires: boost-devel >= 1.44.0 @@ -42,8 +36,8 @@ SimGear. %prep %setup -q -n simgear-%{version} %patch2 -p1 -b .checkforn -%patch3 -p1 -b .gcc6 -%patch4 -p1 -b .aarch64 +%patch3 -p1 -b .aarch64 +%patch4 -p1 -b .cmake # makes rpmlint happy find -name \*.cxx -o -name \*.hxx | xargs chmod -x @@ -67,11 +61,6 @@ make DESTDIR=$RPM_BUILD_ROOT install cd $RPM_BUILD_ROOT%{_includedir}/simgear/ patch -p2 < %{PATCH1} -# Move cmake files in another location -install -d $RPM_BUILD_ROOT%{_libdir}/cmake/SimGearCore -mv -f $RPM_BUILD_ROOT%{_datadir}/SimGearCore/*.cmake \ - $RPM_BUILD_ROOT%{_libdir}/cmake/SimGearCore - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -86,9 +75,12 @@ mv -f $RPM_BUILD_ROOT%{_datadir}/SimGearCore/*.cmake \ %{_includedir}/simgear/ %{_libdir}/libSimGearCore.so %{_libdir}/libSimGearScene.so -%{_libdir}/cmake/SimGearCore +%{_libdir}/cmake/SimGear %changelog +* Fri Feb 19 2016 Fabrice Bellet - 2016.1.1-1 +- new upstream release + * Sun Feb 14 2016 Fabrice Bellet - 3.7.0-5 - math: 'void getMaxSubdiv' does not make any sense diff --git a/simgear-3.6.0-aarch64.patch b/simgear-3.6.0-aarch64.patch deleted file mode 100644 index 3cad196..0000000 --- a/simgear-3.6.0-aarch64.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up simgear-3.6.0/simgear/nasal/naref.h.aarch64 simgear-3.6.0/simgear/nasal/naref.h ---- simgear-3.6.0/simgear/nasal/naref.h.aarch64 2015-09-10 16:33:06.288596457 -0400 -+++ simgear-3.6.0/simgear/nasal/naref.h 2015-09-10 16:36:41.912146487 -0400 -@@ -19,7 +19,7 @@ - # endif - #elif defined(_M_IX86) || defined(__i386) || defined(__x86_64) || \ - defined(__ia64__) || defined(_M_IA64) || defined(__ARMEL__) || \ -- defined(_M_X64) || defined(_M_ARM) -+ defined(_M_X64) || defined(_M_ARM) || defined(__aarch64__) - # define NASAL_LE - #elif defined(__sparc) || defined(__ARMEB__) || \ - defined(__hppa__) || defined(__s390__) || defined(__s390x__) diff --git a/sources b/sources index ea8bba7..81d34fc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a364d0d0b10a139681435fedd597fd86 simgear-3.7.0.tar.bz2 +6651802124e1d371df994461ef38224f simgear-2016.1.1.tar.bz2