diff --git a/.gitignore b/.gitignore index ad96860..f2c33df 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/cantor-*.tar.xz +/cantor-15.08.3.tar.xz diff --git a/cantor-15.08.3-py35.patch b/cantor-15.08.3-py35.patch new file mode 100644 index 0000000..537f1ae --- /dev/null +++ b/cantor-15.08.3-py35.patch @@ -0,0 +1,12 @@ +diff -up cantor-15.08.3/cmake/FindPythonLibs3.cmake.py35 cantor-15.08.3/cmake/FindPythonLibs3.cmake +--- cantor-15.08.3/cmake/FindPythonLibs3.cmake.py35 2015-11-04 13:55:11.000000000 -0600 ++++ cantor-15.08.3/cmake/FindPythonLibs3.cmake 2015-11-13 08:21:31.830425658 -0600 +@@ -5,7 +5,7 @@ set(PYTHONLIBS3_DEFINITIONS ${PYTHONLIBS + find_path(PYTHONLIBS3_INCLUDE_DIR Python.h + HINTS ${PYTHONLIBS3_INCLUDEDIR} ${PYTHONLIBS3_INCLUDE_DIRS}) + +-find_library(PYTHONLIBS3_LIBRARY NAMES python3.2m python3.3m python3.4m ++find_library(PYTHONLIBS3_LIBRARY NAMES python3.2m python3.3m python3.4m python3.5m + HINTS ${PYTHONLIBS3_LIBDIR} ${PYTHONLIBS3_LIBRARY_DIRS} ) + + set(PYTHONLIBS3_LIBRARIES ${PYTHONLIBS3_LIBRARY} ) diff --git a/cantor.spec b/cantor.spec index 6a206b0..e4d2316 100644 --- a/cantor.spec +++ b/cantor.spec @@ -1,11 +1,8 @@ -%ifarch %{arm} %{ix86} x86_64 -%global has_luajit 1 -%endif Name: cantor Summary: KDE Frontend to Mathematical Software -Version: 15.08.1 -Release: 2%{?dist} +Version: 15.08.3 +Release: 1%{?dist} License: GPLv2+ URL: https://projects.kde.org/projects/kde/kdeedu/cantor @@ -17,24 +14,33 @@ URL: https://projects.kde.org/projects/kde/kdeedu/cantor %endif Source0: http://download.kde.org/%{stable}/applications/%{version}/src/%{name}-%{version}.tar.xz -## upstream patches +## upstreamable patches +Patch1: cantor-15.08.3-py35.patch BuildRequires: analitza-devel >= 14.12 +BuildRequires: cmake BuildRequires: desktop-file-utils BuildRequires: extra-cmake-modules >= 1.3 +BuildRequires: kf5-karchive-devel +BuildRequires: kf5-kconfig-devel +BuildRequires: kf5-kcoreaddons-devel +BuildRequires: kf5-kdelibs4support-devel +BuildRequires: kf5-knewstuff-devel +BuildRequires: kf5-kparts-devel +BuildRequires: kf5-kpty-devel +BuildRequires: kf5-ktexteditor-devel BuildRequires: kf5-rpm-macros -BuildRequires: pkgconfig(Qt5Widgets) pkgconfig(Qt5Svg) pkgconfig(Qt5Xml) pkgconfig(Qt5XmlPatterns) pkgconfig(Qt5Test) +BuildRequires: libappstream-glib BuildRequires: pkgconfig(libqalculate) BuildRequires: pkgconfig(libR) BuildRequires: pkgconfig(libspectre) -%if 0%{?has_luajit} +%ifarch %{arm} %{ix86} x86_64 BuildRequires: pkgconfig(luajit) +%global has_luajit 1 %endif +BuildRequires: pkgconfig(Qt5Widgets) pkgconfig(Qt5Svg) pkgconfig(Qt5Xml) pkgconfig(Qt5XmlPatterns) pkgconfig(Qt5Test) BuildRequires: python2-devel BuildRequires: python3-devel -BuildRequires: kf5-kconfig-devel kf5-knewstuff-devel kf5-ktexteditor-devel kf5-kcoreaddons-devel -BuildRequires: kf5-karchive-devel kf5-kparts-devel kf5-kpty-devel kf5-kdelibs4support-devel -BuildRequires: libappstream-glib Requires: %{name}-libs%{?_isa} = %{version}-%{release} @@ -68,7 +74,7 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release} %prep -%setup -q +%autosetup -p1 %build @@ -217,6 +223,9 @@ fi %changelog +* Fri Nov 13 2015 Rex Dieter 15.08.3-1 +- 15.08.3, python-3.5 fix, .spec cosmetics + * Tue Nov 10 2015 Fedora Release Engineering - 15.08.1-2 - Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 diff --git a/sources b/sources index 5b05ac6..b89d1be 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6c5bad1f1ac8b9a4a078edfe99efa1cb cantor-15.08.1.tar.xz +70c2da597eadaf1e9d11cdbf279396e2 cantor-15.08.3.tar.xz