Hello community, here is the log from the commit of package cantor for openSUSE:Factory checked in at 2013-02-04 21:07:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-01-24 09:51:25.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cantor.new/cantor.changes 2013-02-04 21:07:43.000000000 +0100 @@ -1,0 +2,19 @@ +Fri Feb 1 12:55:53 UTC 2013 - alinm.el...@gmail.com + +- add recommends for maxima and octave + +------------------------------------------------------------------- +Fri Feb 1 10:17:53 UTC 2013 - tittiatc...@gmail.com + +- Added patch detect_gfortran_library_correctly.diff. Due to the + location of the libgfortran.so file, cmake does not find it. + This patch searches differently for the library by querying the + gfortran binary. + +------------------------------------------------------------------- +Thu Jan 31 17:49:14 UTC 2013 - tittiatc...@gmail.com + +- Update to 4.10.0 + * This is the final release for 4.10. Contains bugfixes + +------------------------------------------------------------------- Old: ---- cantor-4.9.98.tar.xz New: ---- cantor-4.10.0.tar.xz detect_gfortran_library_correctly.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cantor.spec ++++++ --- /var/tmp/diff_new_pack.PGFiBc/_old 2013-02-04 21:07:47.000000000 +0100 +++ /var/tmp/diff_new_pack.PGFiBc/_new 2013-02-04 21:07:47.000000000 +0100 @@ -19,14 +19,16 @@ %global libMAJOR 1 Name: cantor -Version: 4.9.98 +Version: 4.10.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 -Patch: %{name}-bko296546.patch +Patch0: %{name}-bko296546.patch +# PATCH-FIX-OPENSUSE assume_gfortran_is_installed.diff -- tittiatc...@gmail.com Search for the gfortran library a little different +Patch1: detect_gfortran_library_correctly.diff BuildRequires: R-base-devel BuildRequires: analitza-devel BuildRequires: fdupes @@ -37,6 +39,8 @@ BuildRequires: libspectre-devel BuildRequires: perl BuildRequires: xz +Recommends: maxima +Recommends: octave Provides: kde4-cantor = 4.3.0 Obsoletes: kde4-cantor < 4.3.0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -66,7 +70,8 @@ %prep %setup -q -%patch -p1 +%patch0 -p1 +%patch1 -p1 mkdir .doc cd src/backends for d in * ++++++ detect_gfortran_library_correctly.diff ++++++ diff --git a/cmake/FindR.cmake b/cmake/FindR.cmake index 11f4aff..2681b16 100644 --- a/cmake/FindR.cmake +++ b/cmake/FindR.cmake @@ -70,13 +70,25 @@ IF(R_EXECUTABLE) #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() + # The installation is probably broken, but let's try to find libgfortran + 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) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
