smani pushed to osgearth (f22). "Add patch to fix FTBFS"

[notifications at fedoraproject.org]

>From 4f6c7be9a5a2450eeb671c42d5da0d42d4f8e887 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro at gmail.com>
Date: Sat, 18 Apr 2015 21:14:44 +0200
Subject: Add patch to fix FTBFS


diff --git a/osgearth.spec b/osgearth.spec
index d7cdef7..f52d98e 100644
--- a/osgearth.spec
+++ b/osgearth.spec
@@ -2,12 +2,14 @@
 
 Name:           osgearth
 Version:        2.6
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Dynamic map generation toolkit for OpenSceneGraph
 
 License:        LGPLv3 with exceptions
 URL:            http://osgearth.org/
 Source0:        https://github.com/gwaldron/osgearth/archive/%{name}-%{version}.tar.gz
+# Fix build failure
+Patch0:         osgearth_build.patch
 
 BuildRequires:  cmake
 BuildRequires:  gdal-devel
@@ -77,6 +79,7 @@ applications that use %{name}.
 
 %prep
 %setup -q -n %{name}-%{name}-%{version}
+%patch0 -p1
 
 # Fix spurious-executable-perm and script-without-shebang
 chmod -x data/boxman.osg
@@ -97,7 +100,7 @@ rm -rf data/loopix
 mkdir build
 (
 cd build
-LDFLAGS="-Wl,--as-needed" %cmake -DWITH_EXTERNAL_TINYXML=True ..
+LDFLAGS="%{__global_ldflags} -Wl,--as-needed" %cmake -DWITH_EXTERNAL_TINYXML=True ..
 make %{?_smp_mflags}
 )
 make -C docs html %{?_smp_mflags}
@@ -189,6 +192,9 @@ rm -f docs/build/html/.buildinfo
 
 
 %changelog
+* Sat Apr 18 2015 Sandro Mani <manisandro at gmail.com> - 2.6-4
+- Add patch to fix FTBFS (#1213049)
+
 * Fri Dec 12 2014 Sandro Mani <manisandro at gmail.com> - 2.6-3
 - Parallel build for docs
 - Noarch data subpackage
@@ -196,7 +202,7 @@ rm -f docs/build/html/.buildinfo
 * Fri Dec 12 2014 Sandro Mani <manisandro at gmail.com> - 2.6-2
 - Add explicit Requires: OpenSceneGraph = %%{osg_ver}
 - Add Provides: bundled(jquery) to -doc
-- USe %%license for license
+- Use %%license for license
 - Use system tinyxml, remove bundled sources
 - Remove non-free loopix data
 - Remove html/.buildinfo
diff --git a/osgearth_build.patch b/osgearth_build.patch
new file mode 100644
index 0000000..0ce6eb3
--- /dev/null
+++ b/osgearth_build.patch
@@ -0,0 +1,55 @@
+diff -rupN osgearth-osgearth-2.6/src/applications/osgearth_demo/CMakeLists.txt osgearth-osgearth-2.6-new/src/applications/osgearth_demo/CMakeLists.txt
+--- osgearth-osgearth-2.6/src/applications/osgearth_demo/CMakeLists.txt	2014-10-02 14:06:05.000000000 +0200
++++ osgearth-osgearth-2.6-new/src/applications/osgearth_demo/CMakeLists.txt	2015-04-18 20:32:52.589764031 +0200
+@@ -16,6 +16,7 @@ ELSE()
+         ${QT_QTCORE_LIBRARY}
+         ${QT_QTGUI_LIBRARY}
+         ${QT_QTOPENGL_LIBRARY}
++        X11
+     )
+ ENDIF()
+ 
+diff -rupN osgearth-osgearth-2.6/src/applications/osgearth_package_qt/CMakeLists.txt osgearth-osgearth-2.6-new/src/applications/osgearth_package_qt/CMakeLists.txt
+--- osgearth-osgearth-2.6/src/applications/osgearth_package_qt/CMakeLists.txt	2014-10-02 14:06:05.000000000 +0200
++++ osgearth-osgearth-2.6-new/src/applications/osgearth_package_qt/CMakeLists.txt	2015-04-18 20:52:37.829440350 +0200
+@@ -59,6 +59,7 @@ SET(TARGET_ADDED_LIBRARIES
+     ${QT_QTCORE_LIBRARY}
+     ${QT_QTGUI_LIBRARY}
+     ${QT_QTOPENGL_LIBRARY}
++    X11
+ )
+ 
+ #### end var setup  ###
+diff -rupN osgearth-osgearth-2.6/src/applications/osgearth_qt/CMakeLists.txt osgearth-osgearth-2.6-new/src/applications/osgearth_qt/CMakeLists.txt
+--- osgearth-osgearth-2.6/src/applications/osgearth_qt/CMakeLists.txt	2014-10-02 14:06:05.000000000 +0200
++++ osgearth-osgearth-2.6-new/src/applications/osgearth_qt/CMakeLists.txt	2015-04-18 19:43:57.806753503 +0200
+@@ -38,6 +38,7 @@ SET(TARGET_ADDED_LIBRARIES
+     ${QT_QTCORE_LIBRARY}
+     ${QT_QTGUI_LIBRARY}
+     ${QT_QTOPENGL_LIBRARY}
++    X11
+ )
+ 
+ #### end var setup  ###
+diff -rupN osgearth-osgearth-2.6/src/applications/osgearth_qt_simple/CMakeLists.txt osgearth-osgearth-2.6-new/src/applications/osgearth_qt_simple/CMakeLists.txt
+--- osgearth-osgearth-2.6/src/applications/osgearth_qt_simple/CMakeLists.txt	2014-10-02 14:06:05.000000000 +0200
++++ osgearth-osgearth-2.6-new/src/applications/osgearth_qt_simple/CMakeLists.txt	2015-04-18 21:10:50.088595417 +0200
+@@ -34,6 +34,7 @@ SET(TARGET_ADDED_LIBRARIES
+     ${QT_QTCORE_LIBRARY}
+     ${QT_QTGUI_LIBRARY}
+     ${QT_QTOPENGL_LIBRARY}
++    X11
+ )
+ 
+ #### end var setup  ###
+diff -rupN osgearth-osgearth-2.6/src/applications/osgearth_qt_windows/CMakeLists.txt osgearth-osgearth-2.6-new/src/applications/osgearth_qt_windows/CMakeLists.txt
+--- osgearth-osgearth-2.6/src/applications/osgearth_qt_windows/CMakeLists.txt	2014-10-02 14:06:05.000000000 +0200
++++ osgearth-osgearth-2.6-new/src/applications/osgearth_qt_windows/CMakeLists.txt	2015-04-18 21:07:57.371454637 +0200
+@@ -29,6 +29,7 @@ SET(TARGET_ADDED_LIBRARIES
+     ${QT_QTCORE_LIBRARY}
+     ${QT_QTGUI_LIBRARY}
+     ${QT_QTOPENGL_LIBRARY}
++    X11
+ )
+ 
+ #### end var setup  ###
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/osgearth.git/commit/?h=f22&id=4f6c7be9a5a2450eeb671c42d5da0d42d4f8e887