[rpms/kig] epel10: 15.12.0

[rpms/kig] epel10: 15.12.0

[Rex Dieter]

A new commit has been pushed.

Repo   : rpms/kig
Branch : epel10
Commit : 99f460b20ecf635e2932fa5bc14a137d1a59f7eb
Author : Rex Dieter <rdieter@math.unl.edu>
Date   : 2015-12-28T12:03:01-06:00
Stats  : +17/-53 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/kig/c/99f460b20ecf635e2932fa5bc14a137d1a59f7eb?branch=epel10

Log:
15.12.0

---
diff --git a/.gitignore b/.gitignore
index 57265e3..04aeb17 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /kig-15.04.3.tar.xz
 /kig-15.08.0.tar.xz
 /kig-15.08.3.tar.xz
+/kig-15.12.0.tar.xz

diff --git a/kig-15.04.3-load_libpython.patch b/kig-15.04.3-load_libpython.patch
deleted file mode 100644
index 743083a..0000000
--- a/kig-15.04.3-load_libpython.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-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 584959f..827faab 100644
--- a/kig.spec
+++ b/kig.spec
@@ -1,11 +1,11 @@
 
 Name:    kig
 Summary: Interactive Geometry 
-Version: 15.08.3
+Version: 15.12.0
 Release: 1%{?dist}
 
 License: GPLv2+
-URL:     https://projects.kde.org/projects/kde/kdeedu/%{name}
+URL:     https://projects.kde.org/%{name}
 %global revision %(echo %{version} | cut -d. -f3)
 %if %{revision} >= 50
 %global stable unstable
@@ -17,14 +17,14 @@ Source0: http://download.kde.org/%{stable}/applications/%{version}/src/%{name}-%
 ## 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
+# https://git.reviewboard.kde.org/r/126549/
+Patch1: 0001-explicitly-use-QLibrary-to-load-libpython-like-pykde.patch
 
 BuildRequires: boost-devel
 BuildRequires: cmake
 BuildRequires: desktop-file-utils
 BuildRequires: extra-cmake-modules
 BuildRequires: gettext
-BuildRequires: kf5-rpm-macros
 BuildRequires: kf5-kcompletion-devel
 BuildRequires: kf5-kconfig-devel
 BuildRequires: kf5-kconfigwidgets-devel
@@ -36,34 +36,31 @@ BuildRequires: kf5-kdnssd-devel
 BuildRequires: kf5-kguiaddons-devel
 BuildRequires: kf5-ki18n-devel
 BuildRequires: kf5-kiconthemes-devel
+BuildRequires: kf5-kio-devel
 BuildRequires: kf5-kitemmodels-devel
 BuildRequires: kf5-kitemviews-devel
-BuildRequires: kf5-kio-devel
 BuildRequires: kf5-kjobwidgets-devel
 BuildRequires: kf5-knewstuff-devel
 BuildRequires: kf5-knotifyconfig-devel
-BuildRequires: kf5-knewstuff-devel
 BuildRequires: kf5-kservice-devel
 BuildRequires: kf5-ktexteditor-devel
-BuildRequires: kf5-kwindowsystem-devel
 BuildRequires: kf5-kwidgetsaddons-devel
+BuildRequires: kf5-kwindowsystem-devel
 BuildRequires: kf5-kxmlgui-devel
+BuildRequires: kf5-rpm-macros
+BuildRequires: libappstream-glib
 BuildRequires: pkgconfig(Qt5Svg) pkgconfig(Qt5PrintSupport)
 BuildRequires: python2-devel python2
-BuildRequires: libappstream-glib
 
 # when split occurred
 Conflicts: kdeedu-math < 4.7.0-10
 
-
 %description
 %{summary}.
 
 
 %prep
-%setup -q
-
-%patch1 -p1 -b .load_libpython
+%autosetup -p1
 
 
 %build
@@ -80,7 +77,7 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 
 %check
-appstream-util validate-relax --nonet %{buildroot}%{_kf5_datadir}/appdata/%{name}.appdata.xml ||:
+appstream-util validate-relax --nonet %{buildroot}%{_kf5_datadir}/appdata/org.kde.%{name}.appdata.xml ||:
 desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.%{name}.desktop ||:
 
 
@@ -99,12 +96,12 @@ gtk-update-icon-cache %{_kf5_datadir}/icons/hicolor &> /dev/null || :
 update-desktop-database -q &> /dev/null ||:
 
 %files
-%doc COPYING*
+%license COPYING*
 %{_kf5_bindir}/%{name}*
 %{_kf5_bindir}/pykig.*
 #{_sysconfdir}/xdg/%{name}.knsrc
 %{_kf5_datadir}/applications/org.kde.%{name}.desktop
-%{_kf5_datadir}/appdata/%{name}.appdata.xml
+%{_kf5_datadir}/appdata/org.kde.%{name}.appdata.xml
 %{_kf5_datadir}/icons/hicolor/*/apps/%{name}.*
 %{_kf5_datadir}/icons/hicolor/*/mimetypes/application-x-%{name}.*
 %{_kf5_datadir}/%{name}/
@@ -120,6 +117,9 @@ update-desktop-database -q &> /dev/null ||:
 
 
 %changelog
+* Mon Dec 28 2015 Rex Dieter <rdieter@fedoraproject.org> 15.12.0-1
+- 15.12.0
+
 * Mon Nov 30 2015 Rex Dieter <rdieter@fedoraproject.org> - 15.08.3-1
 - 15.08.3
 

diff --git a/sources b/sources
index 8522f0b..fa69f30 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-da50a8e5ad922eff7f1d03892111bbab  kig-15.08.3.tar.xz
+26613e1d968b38c58390b4c5b0e89768  kig-15.12.0.tar.xz