Hello community, here is the log from the commit of package cantor for openSUSE:Factory checked in at 2015-04-27 22:08:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cantor (Old) and /work/SRC/openSUSE:Factory/.cantor.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cantor" Changes: -------- --- /work/SRC/openSUSE:Factory/cantor/cantor.changes 2015-03-11 09:44:00.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cantor.new/cantor.changes 2015-04-27 22:09:19.000000000 +0200 @@ -1,0 +2,29 @@ +Mon Apr 27 13:57:22 UTC 2015 - tittiatc...@gmail.com + +- Add patch fix-build-with-latest-R.diff to resolve the buildissue + with R-base >= 3.2 + +------------------------------------------------------------------- +Sat Apr 11 12:40:29 UTC 2015 - tittiatc...@gmail.com + +- Update to KDE Applications 15.04.0 + * KDE Applications 15.04.0 + * https://www.kde.org/announcements/announce-applications-15.04.0.php + + +------------------------------------------------------------------- +Sat Mar 21 17:16:42 UTC 2015 - tittiatc...@gmail.com + +- Update to KDE Applications 15.03.95 + * KDE Applications 15.04 RC + +- Drop patch cantor-bko296546.patch + +------------------------------------------------------------------- +Sun Mar 8 12:34:40 UTC 2015 - tittiatc...@gmail.com + +- Update to KDE Applications 15.03.80 + * KDE Applications 15.04 Beta + + +------------------------------------------------------------------- Old: ---- cantor-14.12.3.tar.xz cantor-bko296546.patch New: ---- cantor-15.04.0.tar.xz fix-build-with-latest-R.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cantor.spec ++++++ --- /var/tmp/diff_new_pack.Jhd0fz/_old 2015-04-27 22:09:20.000000000 +0200 +++ /var/tmp/diff_new_pack.Jhd0fz/_new 2015-04-27 22:09:20.000000000 +0200 @@ -16,40 +16,48 @@ # -%global libMAJOR 1 +%global libMAJOR 6 Name: cantor -Version: 14.12.3 +Version: 15.04.0 Release: 0 Summary: Worksheet GUI for mathematical software License: GPL-2.0+ Group: Amusements/Teaching/Mathematics Url: http://edu.kde.org Source0: %{name}-%{version}.tar.xz -Patch0: %{name}-bko296546.patch -BuildRequires: R-base-devel -%if 0%{?suse_version} > 1230 +Patch1: fix-build-with-latest-R.diff BuildRequires: R-base -%endif +BuildRequires: R-base-devel BuildRequires: analitza-devel BuildRequires: fdupes BuildRequires: gcc-fortran BuildRequires: help2man -BuildRequires: libkde4-devel -BuildRequires: libqalculate-devel +BuildRequires: extra-cmake-modules +BuildRequires: karchive-devel +BuildRequires: kconfig-devel +BuildRequires: kcoreaddons-devel +BuildRequires: kdelibs4support-devel +BuildRequires: kpty-devel +BuildRequires: kf5-filesystem +BuildRequires: knewstuff-devel +BuildRequires: kparts-devel +BuildRequires: ktexteditor-devel BuildRequires: libspectre-devel -%if 0%{?suse_version} > 1310 -BuildRequires: luajit-devel -%endif BuildRequires: perl BuildRequires: python-devel BuildRequires: xz +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5Svg) +BuildRequires: pkgconfig(Qt5Test) +BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(Qt5Xml) +BuildRequires: pkgconfig(Qt5XmlPatterns) Recommends: maxima Recommends: octave -Provides: kde4-cantor = 4.3.0 -Obsoletes: kde4-cantor < 4.3.0 +Obsoletes: %{name}5 < %{version} +Provides: %{name}5 = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build -%kde4_runtime_requires %description A frontend to several existing mathematical software such as R, Sage @@ -75,7 +83,8 @@ %prep %setup -q -%patch0 -p1 +%patch1 -p1 + mkdir .doc cd src/backends for d in * @@ -86,33 +95,12 @@ %ifarch ppc ppc64 export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %endif -# bnc#753292 - %{lua: z = rpm .expand ("%cmake_kde4 -d build") - f, t = string .find (z, "-DCMAKE_SKIP_RPATH=ON", 0, true) - print (string .sub (z, 0, f - 01), "-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON", string .sub (z, t + 01)) } + %cmake_kf5 -d build %make_jobs - # generate manual pages for cantor - ! mkdir man1 - for a in cantor - do m="man1/${a}.1" - help2man>"${m}" "src/${a}.shell" - gzip "${m}" - done - for a in cantor_rserver - do m="man1/${a}.1" - R>"${m}" CMD help2man "src/backends/R/rserver/${a}.shell" - gzip "${m}" - done %install - cd build - %kde4_makeinstall - for m in '%{buildroot}%{_mandir}/man1' - do install -d "${m}" - install "-t${m}" -ma=r man1/* - done - cd .. - %kde_post_install + %kf5_makeinstall -C build + %post -n libcantorlibs%{libMAJOR} -p /sbin/ldconfig @@ -121,32 +109,31 @@ %files devel %defattr(-,root,root) %doc COPYING -%{_kde4_libdir}/libcantorlibs.so -%{_kde4_includedir}/cantor/ +%{_kf5_libdir}/libcantorlibs.so +%{_kf5_prefix}/include/cantor/ %files %defattr(-,root,root) %doc COPYING COPYING.DOC README TODO DESIGN .doc/* -%doc %{_kde4_htmldir}/en/cantor/ -%doc %{_mandir}/man1/* -%dir %{_kde4_datadir}/appdata -%{_kde4_applicationsdir}/cantor.desktop -%{_kde4_appsdir}/cantor/ -%{_kde4_bindir}/cantor -%{_kde4_bindir}/cantor_rserver -%{_kde4_configdir}/cantor*.knsrc -%{_kde4_configkcfgdir}/*.kcfg -%{_kde4_datadir}/appdata/cantor.appdata.xml -%{_kde4_iconsdir}/hicolor/*/apps/* -%{_kde4_libdir}/libcantor_config.so -%{_kde4_servicesdir}/cantor/ -%{_kde4_servicetypesdir}/cantor* +%{_kf5_sharedir}/cantor/ +%{_kf5_applicationsdir}/org.kde.cantor.desktop +%{_kf5_bindir}/cantor +%{_kf5_bindir}/cantor_rserver +%{_kf5_configkcfgdir}/ +%doc %lang(en) %{_kf5_htmldir}/en/*/ +%{_kf5_iconsdir}/hicolor/*/apps/* +%{_kf5_libdir}/libcantor_config.so +%{_kf5_libdir}/libcantor_pythonbackend.so +%{_kf5_servicesdir}/ +%{_kf5_servicetypesdir}/ +%{_kf5_sharedir}/appdata/ +%{_kf5_plugindir}/ +%{_kf5_kxmlguidir}/cantor/ +%(config) %{_kf5_configdir}/*.knsrc %files -n libcantorlibs%{libMAJOR} %defattr(-,root,root) %doc COPYING -%{_kde4_libdir}/libcantorlibs.so.* -%{_kde4_modulesdir}/cantor*so -%{_kde4_modulesdir}/libcantor*so +%{_kf5_libdir}/libcantorlibs.so.* %changelog ++++++ cantor-14.12.3.tar.xz -> cantor-15.04.0.tar.xz ++++++ ++++ 22041 lines of diff (skipped) ++++++ fix-build-with-latest-R.diff ++++++ diff -urB cantor-15.04.0/src/backends/R/rserver/rcallbacks.cpp new/src/backends/R/rserver/rcallbacks.cpp --- cantor-15.04.0/src/backends/R/rserver/rcallbacks.cpp 2015-04-06 13:34:01.000000000 +0200 +++ new/src/backends/R/rserver/rcallbacks.cpp 2015-04-27 15:53:51.583984954 +0200 @@ -26,6 +26,7 @@ #include <QStringList> #include <stdio.h> +#include <Rinterface.h> RServer* server; Expression* currentExpression; diff -urB cantor-15.04.0/src/backends/R/rserver/rcallbacks.h new/src/backends/R/rserver/rcallbacks.h --- cantor-15.04.0/src/backends/R/rserver/rcallbacks.h 2015-04-06 13:34:01.000000000 +0200 +++ new/src/backends/R/rserver/rcallbacks.h 2015-04-27 15:52:55.503987836 +0200 @@ -30,7 +30,6 @@ #include <Rversion.h> #include <Rdefines.h> #define R_INTERFACE_PTRS -#include <Rinterface.h> #include <R_ext/Parse.h> //This File implements the necessary callbacks for R diff -urB cantor-15.04.0/src/backends/R/rserver/rserver.cpp new/src/backends/R/rserver/rserver.cpp --- cantor-15.04.0/src/backends/R/rserver/rserver.cpp 2015-04-06 13:34:01.000000000 +0200 +++ new/src/backends/R/rserver/rserver.cpp 2015-04-27 15:55:16.895980571 +0200 @@ -42,7 +42,6 @@ #include <Rversion.h> #include <Rdefines.h> #define R_INTERFACE_PTRS -#include <Rinterface.h> #include <R_ext/Parse.h> // Not making a member to prevent pulling R headers into rserver.h
