[rpms/kig] epel10: 20.08.0

[rpms/kig] epel10: 20.08.0

[Rex Dieter]

A new commit has been pushed.

Repo   : rpms/kig
Branch : epel10
Commit : f43c099647f0f186cd12ed58dd920c508aafd626
Author : Rex Dieter <rdieter@gmail.com>
Date   : 2020-08-22T22:05:24-05:00
Stats  : +22/-32 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/kig/c/f43c099647f0f186cd12ed58dd920c508aafd626?branch=epel10

Log:
20.08.0

---
diff --git a/.gitignore b/.gitignore
index b72fd3f..677c76b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@
 /kig-20.04.1.tar.xz
 /kig-20.04.2.tar.xz
 /kig-20.04.3.tar.xz
+/kig-20.08.0.tar.xz

diff --git a/0001-explicitly-use-QLibrary-to-load-libpython-like-pykde.patch b/0001-explicitly-use-QLibrary-to-load-libpython-like-pykde.patch
index 50c11b5..815a251 100644
--- a/0001-explicitly-use-QLibrary-to-load-libpython-like-pykde.patch
+++ b/0001-explicitly-use-QLibrary-to-load-libpython-like-pykde.patch
@@ -1,19 +1,7 @@
-From 068bf7f9bf8f34a9f14ed026e6c5c993b7cc80c7 Mon Sep 17 00:00:00 2001
-From: Rex Dieter <rdieter@math.unl.edu>
-Date: Mon, 28 Dec 2015 11:29:59 -0600
-Subject: [PATCH] explicitly use QLibrary to load libpython (like pykde)
-
-BUG: 335965
----
- CMakeLists.txt               | 3 +++
- scripting/python_scripter.cc | 7 +++++++
- 2 files changed, 10 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d7fffcd..7b93833 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -57,6 +57,9 @@ add_subdirectory( pykig )
+diff -up kig-20.08.0/CMakeLists.txt.0001 kig-20.08.0/CMakeLists.txt
+--- kig-20.08.0/CMakeLists.txt.0001	2020-08-07 01:54:58.000000000 -0500
++++ kig-20.08.0/CMakeLists.txt	2020-08-22 22:04:06.018822109 -0500
+@@ -64,6 +64,9 @@ add_subdirectory( pykig )
  if(BoostPython_FOUND)
    add_subdirectory( scripting )
    add_definitions(-DKIG_ENABLE_PYTHON_SCRIPTING)
@@ -23,10 +11,9 @@ index d7fffcd..7b93833 100644
  endif(BoostPython_FOUND)
  
  set_package_properties(
-diff --git a/scripting/python_scripter.cc b/scripting/python_scripter.cc
-index e60a90c..99c1f1c 100644
---- a/scripting/python_scripter.cc
-+++ b/scripting/python_scripter.cc
+diff -up kig-20.08.0/scripting/python_scripter.cc.0001 kig-20.08.0/scripting/python_scripter.cc
+--- kig-20.08.0/scripting/python_scripter.cc.0001	2020-08-07 00:49:45.000000000 -0500
++++ kig-20.08.0/scripting/python_scripter.cc	2020-08-22 22:04:56.620279004 -0500
 @@ -23,6 +23,8 @@
  #include <Python.h>
  #include "python_scripter.h"
@@ -36,18 +23,15 @@ index e60a90c..99c1f1c 100644
  #include <iostream>
  #include <string>
  
-@@ -398,6 +400,11 @@ PythonScripter::PythonScripter()
-   // don't do it..
-   //delete [] s;
+@@ -377,6 +379,11 @@ PythonScripter::PythonScripter()
+ {
+   d = new Private;
  
 +  QLibrary *pythonLib = new QLibrary();
 +  pythonLib->setLoadHints(QLibrary::ExportExternalSymbolsHint);
 +  pythonLib->setFileName(LIB_PYTHON);
 +  pythonLib->load();
 +
-   Py_Initialize();
+   // tell the python interpreter about our API..
  
-   s = newstring( "import math; from math import *;" );
--- 
-2.5.0
-
+   PyImport_AppendInittab( "kig", PyInit_kig );

diff --git a/kig.spec b/kig.spec
index c0649b8..7a7173c 100644
--- a/kig.spec
+++ b/kig.spec
@@ -3,8 +3,8 @@
 
 Name:    kig
 Summary: Interactive Geometry 
-Version: 20.04.3
-Release: 4%{?dist}
+Version: 20.08.0
+Release: 1%{?dist}
 
 License: GPLv2+
 URL:     https://cgit.kde.org/%{name}.git
@@ -59,7 +59,9 @@ Conflicts: kdeedu-math < 4.7.0-10
 
 
 %prep
-%autosetup -p1
+%setup  -q
+
+%patch1 -p1 -b .0001
 
 sed -ie "s|^#!/usr/bin/env python3$|#!%{__python3}|" pykig/pykig.py
 
@@ -111,6 +113,9 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.%{name}.d
 
 
 %changelog
+* Tue Aug 18 2020 Rex Dieter <rdieter@fedoraproject.org> - 20.08.0-1
+- 20.08.0
+
 * Mon Aug 10 2020 Rex Dieter <rdieter@fedoraproject.org> - 20.04.3-4
 - use new cmake macros
 

diff --git a/sources b/sources
index 5bcded9..07089bd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (kig-20.04.3.tar.xz) = 64d806c901387dfeaf799ededa22ffd6a2471025d6e3f91940e1f70c3619b86b8427aa1dd97bd59780083173d6e8951205cd8385714682131d45724d72efd963
+SHA512 (kig-20.08.0.tar.xz) = bc0e21bb575043c960f6c7ccc1fd138a56c68a578482afa9583be1b3a2c01b9dffd7297d4bc3ee39cd659f8cdc6eed3b00dc83e2fc1f7c6c495bcf720ce9fe77