[rpms/kig] epel10: 15.04.3-1

[rpms/kig] epel10: 15.04.3-1

[Rex Dieter]

            A new commit has been pushed.

            Repo   : rpms/kig
            Branch : epel10
            Commit : cb02c445b2bc9dde1bab25e06dbc29bfcc67f2b3
            Author : Rex Dieter <rdieter@math.unl.edu>
            Date   : 2015-07-01T10:40:18-05:00
            Stats  : +53/-8 in 4 file(s)
            URL    : https://src.fedoraproject.org/rpms/kig/c/cb02c445b2bc9dde1bab25e06dbc29bfcc67f2b3?branch=epel10

            Log:
            15.04.3-1

- 15.04.3
- fix kig/python integration (#1238113,kde#335965)

---
diff --git a/.gitignore b/.gitignore
index 87af93f..3a256f2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1 @@
-/kig-4.14.3.tar.xz
-/kig-15.04.0.tar.xz
-/kig-15.04.1.tar.xz
-/kig-15.04.2.tar.xz
+/kig-15.04.3.tar.xz

diff --git a/kig-15.04.3-load_libpython.patch b/kig-15.04.3-load_libpython.patch
new file mode 100644
index 0000000..743083a
--- /dev/null
+++ b/kig-15.04.3-load_libpython.patch
@@ -0,0 +1,37 @@
+diff -up kig-15.04.3/CMakeLists.txt.load_libpython kig-15.04.3/CMakeLists.txt
+--- kig-15.04.3/CMakeLists.txt.load_libpython	2015-06-06 03:10:38.000000000 -0500
++++ kig-15.04.3/CMakeLists.txt	2015-07-01 09:15:21.021476334 -0500
+@@ -55,6 +55,9 @@ add_subdirectory( pykig )
+ if(BoostPython_FOUND)
+   add_subdirectory( scripting )
+   add_definitions(-DKIG_ENABLE_PYTHON_SCRIPTING)
++  get_filename_component(PYTHON_LIBRARY_REALPATH "${PYTHON_LIBRARY}" REALPATH)
++  get_filename_component(LIB_PYTHON ${PYTHON_LIBRARY_REALPATH} NAME)
++  add_definitions(-DLIB_PYTHON="${LIB_PYTHON}")
+ endif(BoostPython_FOUND)
+ 
+ set_package_properties(
+diff -up kig-15.04.3/scripting/python_scripter.cc.load_libpython kig-15.04.3/scripting/python_scripter.cc
+--- kig-15.04.3/scripting/python_scripter.cc.load_libpython	2015-06-06 03:10:38.000000000 -0500
++++ kig-15.04.3/scripting/python_scripter.cc	2015-07-01 09:20:42.508512760 -0500
+@@ -23,6 +23,8 @@
+ #include <Python.h>
+ #include "python_scripter.h"
+ 
++#include <QLibrary>
++
+ #include <iostream>
+ #include <string>
+ 
+@@ -398,6 +400,11 @@ PythonScripter::PythonScripter()
+   // don't do it..
+   //delete [] s;
+ 
++  QLibrary *pythonLib = new QLibrary();
++  pythonLib->setLoadHints(QLibrary::ExportExternalSymbolsHint);
++  pythonLib->setFileName(LIB_PYTHON);
++  pythonLib->load();
++
+   Py_Initialize();
+ 
+   s = newstring( "import math; from math import *;" );

diff --git a/kig.spec b/kig.spec
index f5e7c04..4afb34c 100644
--- a/kig.spec
+++ b/kig.spec
@@ -1,7 +1,8 @@
+
 Name:    kig
 Summary: Interactive Geometry 
-Version: 15.04.2
-Release: 2%{?dist}
+Version: 15.04.3
+Release: 1%{?dist}
 
 License: GPLv2+
 URL:     https://projects.kde.org/projects/kde/kdeedu/%{name}
@@ -13,6 +14,11 @@ URL:     https://projects.kde.org/projects/kde/kdeedu/%{name}
 %endif
 Source0: http://download.kde.org/%{stable}/applications/%{version}/src/%{name}-%{version}.tar.xz
 
+## upstreamable patches
+# https://bugzilla.redhat.com/show_bug.cgi?id=1238113
+# https://bugs.kde.org/show_bug.cgi?id=335965#c23
+Patch1: kig-15.04.3-load_libpython.patch
+
 BuildRequires: boost-devel
 BuildRequires: cmake
 BuildRequires: desktop-file-utils
@@ -46,7 +52,6 @@ BuildRequires: pkgconfig(Qt5Svg) pkgconfig(Qt5PrintSupport)
 BuildRequires: python2-devel python2
 BuildRequires: libappstream-glib
 
-
 # when split occurred
 Conflicts: kdeedu-math < 4.7.0-10
 
@@ -58,6 +63,8 @@ Conflicts: kdeedu-math < 4.7.0-10
 %prep
 %setup -q
 
+%patch1 -p1 -b .load_libpython
+
 
 %build
 mkdir %{_target_platform}
@@ -113,6 +120,10 @@ update-desktop-database -q &> /dev/null ||:
 
 
 %changelog
+* Wed Jul 01 2015 Rex Dieter <rdieter@fedoraproject.org> - 15.04.3-1
+- 15.04.3
+- fix kig/python integration (#1238113,kde#335965)
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 15.04.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 

diff --git a/sources b/sources
index fb549d8..fa67160 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5cfce4473e69ce1506ab0aabedf00dc5  kig-15.04.2.tar.xz
+a66de19539dbdcd4dd60e691eebff3c7  kig-15.04.3.tar.xz