Hello community, here is the log from the commit of package cantor for openSUSE:Factory checked in at 2013-03-15 10:34:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cantor (Old) and /work/SRC/openSUSE:Factory/.cantor.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cantor", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/cantor/cantor.changes 2013-02-04 21:07:43.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cantor.new/cantor.changes 2013-03-15 10:35:23.000000000 +0100 @@ -1,0 +2,13 @@ +Mon Mar 4 09:11:10 UTC 2013 - [email protected] + +- Remove patch detect_gfortran_library_correctly.diff. Now included + upstream + +------------------------------------------------------------------- +Sat Mar 2 15:38:11 UTC 2013 - [email protected] + +- Update to 4.10.1 + * Contains bug fixes. See http://www.kde.org/announcements/ + for more information + +------------------------------------------------------------------- Old: ---- cantor-4.10.0.tar.xz detect_gfortran_library_correctly.diff New: ---- cantor-4.10.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cantor.spec ++++++ --- /var/tmp/diff_new_pack.Z6OUf2/_old 2013-03-15 10:35:24.000000000 +0100 +++ /var/tmp/diff_new_pack.Z6OUf2/_new 2013-03-15 10:35:24.000000000 +0100 @@ -19,7 +19,7 @@ %global libMAJOR 1 Name: cantor -Version: 4.10.0 +Version: 4.10.1 Release: 0 Summary: Worksheet GUI for mathematical software License: GPL-2.0+ @@ -27,8 +27,6 @@ Url: http://edu.kde.org Source0: %{name}-%{version}.tar.xz Patch0: %{name}-bko296546.patch -# PATCH-FIX-OPENSUSE assume_gfortran_is_installed.diff -- [email protected] Search for the gfortran library a little different -Patch1: detect_gfortran_library_correctly.diff BuildRequires: R-base-devel BuildRequires: analitza-devel BuildRequires: fdupes @@ -71,7 +69,6 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 mkdir .doc cd src/backends for d in * ++++++ cantor-4.10.0.tar.xz -> cantor-4.10.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cantor-4.10.0/cmake/FindR.cmake new/cantor-4.10.1/cmake/FindR.cmake --- old/cantor-4.10.0/cmake/FindR.cmake 2013-01-23 22:51:11.000000000 +0100 +++ new/cantor-4.10.1/cmake/FindR.cmake 2013-03-01 07:39:50.000000000 +0100 @@ -70,13 +70,26 @@ #MESSAGE(STATUS "Yes, ${R_LAPACK_LIBRARY} exists") SET(R_LIBRARIES ${R_LIBRARIES} ${R_LAPACK_LIBRARY}) IF(NOT WIN32) - FIND_LIBRARY(GFORTRAN_LIBRARY - gfortran) + # Query gfortran to get the libgfortran.so path + FIND_PROGRAM(_GFORTRAN_EXECUTABLE NAMES gfortran) + IF(_GFORTRAN_EXECUTABLE) + EXECUTE_PROCESS(COMMAND ${_GFORTRAN_EXECUTABLE} -print-file-name=libgfortran.so + OUTPUT_VARIABLE _libgfortran_path + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + ENDIF() + IF(EXISTS ${_libgfortran_path}) + SET(GFORTRAN_LIBRARY ${_libgfortran_path}) + ELSE() + # if libgfortran wasn't found at this point, the installation is probably broken + # Let's try to find the library nonetheless. + FIND_LIBRARY(GFORTRAN_LIBRARY gfortran) + ENDIF() IF (GFORTRAN_LIBRARY) # needed when linking to Rlapack on linux for some unknown reason. # apparently not needed on windows (let's see, when it comes back to bite us, though) # and compiling on windows is hard enough even without requiring libgfortran, too. - SET(R_LIBRARIES ${R_LIBRARIES} gfortran) + SET(R_LIBRARIES ${R_LIBRARIES} ${GFORTRAN_LIBRARY}) ELSE (GFORTRAN_LIBRARY) MESSAGE(STATUS "gfortran is needed for Rlapack but it could not be found") SET(ABORT_CONFIG TRUE) Files old/cantor-4.10.0/doc/index.cache.bz2 and new/cantor-4.10.1/doc/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cantor-4.10.0/src/backends/qalculate/plotassistant/qalculateplotassistant.desktop new/cantor-4.10.1/src/backends/qalculate/plotassistant/qalculateplotassistant.desktop --- old/cantor-4.10.0/src/backends/qalculate/plotassistant/qalculateplotassistant.desktop 2013-01-23 22:51:12.000000000 +0100 +++ new/cantor-4.10.1/src/backends/qalculate/plotassistant/qalculateplotassistant.desktop 2013-03-01 07:39:50.000000000 +0100 @@ -4,6 +4,7 @@ Name[bs]=QalculatePlot Name[ca]=Gràfic de Qalculate Name[ca@valencia]=Gràfic de Qalculate +Name[cs]=QalculatePlot Name[da]=QalculatePlot Name[de]=QalculatePlot Name[el]=QalculatePlot diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cantor-4.10.0/src/backends/sage/sageexpression.cpp new/cantor-4.10.1/src/backends/sage/sageexpression.cpp --- old/cantor-4.10.0/src/backends/sage/sageexpression.cpp 2013-01-23 22:51:12.000000000 +0100 +++ new/cantor-4.10.1/src/backends/sage/sageexpression.cpp 2013-03-01 07:39:50.000000000 +0100 @@ -179,7 +179,7 @@ QString stripped=m_outputCache; const bool isHtml=stripped.contains(QLatin1String("<html>")); - const bool isLatex=m_outputCache.contains("class=\"math\"")||m_outputCache.contains("type=\"math/tex\""); //Check if it's latex stuff + const bool isLatex=m_outputCache.contains("class=\"math\"")||m_outputCache.contains(QRegExp("type=\"math/tex[^\"]*\"")); //Check if it's latex stuff if(isLatex) //It's latex stuff so encapsulate it into an eqnarray environment { stripped.replace("<html>", "\\begin{eqnarray*}"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cantor-4.10.0/src/backends/scilab/scilabbackend.desktop new/cantor-4.10.1/src/backends/scilab/scilabbackend.desktop --- old/cantor-4.10.0/src/backends/scilab/scilabbackend.desktop 2013-01-23 22:51:12.000000000 +0100 +++ new/cantor-4.10.1/src/backends/scilab/scilabbackend.desktop 2013-03-01 07:39:50.000000000 +0100 @@ -5,6 +5,7 @@ Name[bs]=Scilab Name[ca]=Scilab Name[ca@valencia]=Scilab +Name[cs]=Scilab Name[da]=Scilab Name[de]=Scilab Name[el]=Scilab -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
