Hello community, here is the log from the commit of package digikam for openSUSE:Factory checked in at Tue Jun 21 09:57:45 CEST 2011.
-------- --- KDE/digikam/digikam.changes 2011-03-09 12:30:34.000000000 +0100 +++ /mounts/work_src_done/STABLE/digikam/digikam.changes 2011-06-20 14:01:49.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Jun 20 11:58:14 UTC 2011 - [email protected] + +- Add digikam-marblewidget.patch: provide a FindMarbleWidget.cmake + for compatibility + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- digikam-marblewidget.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ digikam.spec ++++++ --- /var/tmp/diff_new_pack.LLFZRD/_old 2011-06-21 09:56:31.000000000 +0200 +++ /var/tmp/diff_new_pack.LLFZRD/_new 2011-06-21 09:56:32.000000000 +0200 @@ -19,7 +19,7 @@ Name: digikam Version: 1.9.0 -Release: 1 +Release: 2 Summary: A KDE Photo Manager License: GPLv2+ and LGPLv2.1+ and GFDL and X11 (BSD like) and BSD3c (or similar) @@ -31,9 +31,11 @@ Patch0: digikam-buildtime.patch # PATCH-FIX-UPSTREAM add_mimetype_bnc629393.diff bnc#629393 kde#261627 [email protected] -- Add MimeTypes to desktop file for better integration in GNOME Patch1: add_mimetype_bnc629393.diff +# PATCH-FIX-OPENSUSE digikam-marblewidget.patch [email protected] -- Provide a FindMarbleWidget.cmake for compatibility +Patch2: digikam-marblewidget.patch # With the latest version of libjpeg62 in Factory, the version is mentioned in a different file %if %suse_version > 1140 -Patch2: correct_jpeg_lib_version.patch +Patch3: correct_jpeg_lib_version.patch %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -112,8 +114,9 @@ %setup -q -a 1 %patch0 %patch1 +%patch2 %if %suse_version > 1140 -%patch2 -p0 +%patch3 -p0 %endif # Remove build time references so build-compare can do its work FAKE_BUILDDATE=$(LC_ALL=C date -r %{_sourcedir}/%{name}.changes '+%b %e %Y') ++++++ digikam-marblewidget.patch ++++++ --- /dev/null 2011-06-17 14:42:34.820939556 +0200 +++ cmake/modules/FindMarbleWidget.cmake 2011-06-20 13:50:03.012616343 +0200 @@ -0,0 +1,42 @@ +# - Try to find marblewidget library +# Once done this will define +# +# MARBLEWIDGET_FOUND - system has MARBLEWIDGET library +# LIBMARBLEWIDGET_INCLUDE_DIR - the LIBMARBLEWIDGET include directory +# LIBMARBLEWIDGET_LIBRARY - the marblewidget library +# +# copyright 2008 by Patrick Spendrin <[email protected]> +# use this file as you like +# + +if(LIBMARBLEWIDGET_INCLUDE_DIR AND LIBMARBLEWIDGET_LIBRARY) + +# Already in cache +set(MARBLEWIDGET_FOUND TRUE) + +else(LIBMARBLEWIDGET_INCLUDE_DIR AND LIBMARBLEWIDGET_LIBRARY) +find_path(LIBMARBLEWIDGET_INCLUDE_DIR Quaternion.h PATH_SUFFIXES marble) + +if (WIN32 AND CMAKE_BUILD_TYPE_TOLOWER MATCHES debug) +set (LIBRARY_NAME marblewidgetd) +else(WIN32 AND CMAKE_BUILD_TYPE_TOLOWER MATCHES debug) +set (LIBRARY_NAME marblewidget) +endif (WIN32 AND CMAKE_BUILD_TYPE_TOLOWER MATCHES debug) +find_library(LIBMARBLEWIDGET_LIBRARY ${LIBRARY_NAME}) + +if(LIBMARBLEWIDGET_INCLUDE_DIR AND LIBMARBLEWIDGET_LIBRARY) +set(MARBLEWIDGET_FOUND TRUE) +endif(LIBMARBLEWIDGET_INCLUDE_DIR AND LIBMARBLEWIDGET_LIBRARY) + +if(MARBLEWIDGET_FOUND) +if (NOT MARBLEWIDGET_FIND_QUIETLY) +message(STATUS "Found Marble: ${LIBMARBLEWIDGET_LIBRARY}") +endif (NOT MARBLEWIDGET_FIND_QUIETLY) +else(MARBLEWIDGET_FOUND) +if(MARBLEWIDGET_FIND_REQUIRED) +message(FATAL_ERROR "Could NOT find any Marble library") +endif(MARBLEWIDGET_FIND_REQUIRED) +endif(MARBLEWIDGET_FOUND) + +mark_as_advanced(LIBMARBLEWIDGET_INCLUDE_DIR LIBMARBLEWIDGET_LIBRARY) +endif(LIBMARBLEWIDGET_INCLUDE_DIR AND LIBMARBLEWIDGET_LIBRARY) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
