Hello community, here is the log from the commit of package okular for openSUSE:Factory checked in at 2014-08-25 10:59:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/okular (Old) and /work/SRC/openSUSE:Factory/.okular.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "okular" Changes: -------- --- /work/SRC/openSUSE:Factory/okular/okular.changes 2014-07-16 16:19:10.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.okular.new/okular.changes 2014-08-25 10:59:54.000000000 +0200 @@ -1,0 +2,20 @@ +Fri Aug 15 08:35:41 UTC 2014 - [email protected] + +- Update to 4.14.0 + * KDE 4.14.0 SC Final Release + * See http://www.kde.org/announcements/4.13/ + +------------------------------------------------------------------- +Thu Aug 14 08:38:45 UTC 2014 - [email protected] + +- Added kde4_includes.patch: search for includes in standard kde4 + include directory (don't assume it's hardcoded to include/ ) + +------------------------------------------------------------------- +Thu Jul 17 16:47:52 UTC 2014 - [email protected] + +- Update to 4.13.90 + * KDE 4.14 Beta 2 release + * See http://www.kde.org/announcements/announce-4.14-beta2.php + +------------------------------------------------------------------- Old: ---- okular-4.13.80.tar.xz New: ---- kde4_includes.patch okular-4.14.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ okular.spec ++++++ --- /var/tmp/diff_new_pack.X7SOW4/_old 2014-08-25 10:59:55.000000000 +0200 +++ /var/tmp/diff_new_pack.X7SOW4/_new 2014-08-25 10:59:55.000000000 +0200 @@ -17,7 +17,7 @@ Name: okular -Version: 4.13.80 +Version: 4.14.0 Release: 0 Summary: Document Viewer License: GPL-2.0+ @@ -25,6 +25,8 @@ Url: http://www.kde.org Source0: %{name}-%{version}.tar.xz Patch0: fix-priority-okular.diff +# PATCH-FIX-UPSTREAM kde4_includes.patch -- search for includes in standard kde4 include directory (don't assume it's hardcoded to include/ ) +Patch1: kde4_includes.patch BuildRequires: OpenEXR-devel BuildRequires: chmlib-devel BuildRequires: fdupes @@ -74,6 +76,7 @@ %prep %setup -q %patch0 -p0 +%patch1 -p1 %build %cmake_kde4 -d build ++++++ kde4_includes.patch ++++++ --- okular-4.13.90.orig/OkularConfig.cmake 2014-07-17 01:54:54.000000000 +0200 +++ okular-4.13.90/OkularConfig.cmake 2014-08-14 10:13:40.873895296 +0200 @@ -1,18 +1,13 @@ -# get from the full path to OkularConfig.cmake up to the base dir dir: -get_filename_component( _okularBaseDir ${CMAKE_CURRENT_LIST_FILE} PATH) -get_filename_component( _okularBaseDir ${_okularBaseDir} PATH) -get_filename_component( _okularBaseDir ${_okularBaseDir} PATH) -get_filename_component( _okularBaseDir ${_okularBaseDir} PATH) - - # find the full paths to the library and the includes: find_path(OKULAR_INCLUDE_DIR okular/core/document.h - HINTS ${_okularBaseDir}/include - NO_DEFAULT_PATH) + PATHS + ${INCLUDE_INSTALL_DIR} + ${KDE4_INCLUDE_DIR}) -find_library(OKULAR_CORE_LIBRARY okularcore - HINTS ${_okularBaseDir}/lib - NO_DEFAULT_PATH) +find_library(OKULAR_CORE_LIBRARY okularcore + PATHS + ${LIB_INSTALL_DIR} + ${KDE4_LIB_DIR}) set(OKULAR_LIBRARIES ${OKULAR_CORE_LIBRARY}) ++++++ okular-4.13.80.tar.xz -> okular-4.14.0.tar.xz ++++++ ++++ 1673 lines of diff (skipped) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
