Hello community, here is the log from the commit of package digikam for openSUSE:Factory checked in at 2013-01-07 10:59:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/digikam (Old) and /work/SRC/openSUSE:Factory/.digikam.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "digikam", Maintainer is "kde-maintain...@suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/digikam/digikam.changes 2012-12-07 14:08:03.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.digikam.new/digikam.changes 2013-01-07 10:59:17.000000000 +0100 @@ -1,0 +2,34 @@ +Sat Jan 5 18:46:30 UTC 2013 - toddrme2...@gmail.com + +- Link rawconverter icon to the hicolor theme so it can be safely + used as an application icon (needed by kphotoalbum) + +------------------------------------------------------------------- +Tue Jan 1 20:57:37 UTC 2013 - nico.kru...@gmail.com + +- Update to 3.0.0-rc: + digikam: + - General: Add new Noise Estimation feature to Wavelets Noise + Reduction tools. + - BatchQueueManager: Add Color Effect tool support. + - BatchQueueManager: Multicore CPU support to process items + in parallel. + - BatchQueueManager: Add Raw Demosaicing settings in Queue + Qettings. + - BatchQueueManager: Add new behavior options about RAW file + loading (extract preview or perform + demosaicing). + - BatchQueueManager: Add the capability to assign more than + one time a tool to a queue. + - BatchQueueManager: Add the capability to put target file + processed from queue to source album. + - BatchQueueManager: Add concept of Workflow dedicated to save + and restore between sessions Queue Settings + including Assigned Batch Tools list. + - 18 fixed bugs. + kipi-plugins: + - 2 fixed bugs. +- Added patch (digikam-3.0.0-rc.no-kdcraw.version-check.patch) to + temporarily disabled libkdcraw version check (does not work any more) + +------------------------------------------------------------------- Old: ---- digikam-3.0.0-beta3.tar.bz2 New: ---- digikam-3.0.0-rc.no-kdcraw.version-check.patch digikam-3.0.0-rc.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ digikam.spec ++++++ --- /var/tmp/diff_new_pack.frtwfP/_old 2013-01-07 10:59:19.000000000 +0100 +++ /var/tmp/diff_new_pack.frtwfP/_new 2013-01-07 10:59:19.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package digikam # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,13 +17,13 @@ Name: digikam -Version: 2.9.83 +Version: 2.9.95 Release: 0 Summary: A KDE Photo Manager License: GPL-2.0+ Group: Productivity/Graphics/Viewers Url: http://www.digikam.org/ -Source0: ftp://ftp.kde.org/pub/kde/unstable/digikam/digikam-3.0.0-beta3.tar.bz2 +Source0: ftp://ftp.kde.org/pub/kde/unstable/digikam/digikam-3.0.0-rc.tar.bz2 # PATCH-FIX-OPENSUSE digikam-buildtime.patch -- Remove build time references so build-compare can do its work Patch0: digikam-buildtime.patch # PATCH-FIX-OPENSUSE desktop-files.diff -- Remove Icon= entry (the icon is missing) @@ -36,6 +36,8 @@ Patch4: fix-broken-icon-reference.diff # PATCH-FIX-OPENSUSE digikam_no_build_vkontakte.diff tittiatc...@gmail.com -- Don't build libvkontakte (use external one) Patch5: digikam_no_build_vkontakte.diff +# PATCH-FIX-UPSTREAM digikam-3.0.0-rc.no-kdcraw.version-check.patch -- version check for libkdcraw currently broken +Patch6: digikam-3.0.0-rc.no-kdcraw.version-check.patch BuildRequires: ImageMagick BuildRequires: boost-devel BuildRequires: doxygen @@ -236,7 +238,7 @@ %lang_package -n libkgeomap %prep -%setup -q -n digikam-3.0.0-beta3 +%setup -q -n digikam-3.0.0-rc %patch0 pushd extra/kipi-plugins %patch1 @@ -245,6 +247,7 @@ %patch3 %patch4 %patch5 +%patch6 -p1 # Remove build time references so build-compare can do its work FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y') @@ -259,13 +262,9 @@ %build %if !0%{?kde_updatedapps} -%cmake_kde4 -d build -- -DENABLE_INTERNALMYSQL=FALSE +%cmake_kde4 -d build -- -DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS=FALSE -DENABLE_INTERNALMYSQL=FALSE %else -%if 0%{?suse_version} < 1210 -%cmake_kde4 -d build -- -DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS:BOOL=1 -DENABLE_INTERNALMYSQL=FALSE -%else -%cmake_kde4 -d build -- -DENABLE_INTERNALMYSQL=FALSE -%endif +%cmake_kde4 -d build -- -DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS=TRUE -DENABLE_INTERNALMYSQL=FALSE %endif # there are files in there that are so heavy to the compiler, that one is enough %{__make} -j1 VERBOSE=1 @@ -301,7 +300,7 @@ %find_lang libkgeomap libkgeomap.lang -%if 0%{?kde_updatedapps} && 0%{?suse_version} < 1210 +%if 0%{?kde_updatedapps} %find_lang libkipi libkipi.lang %else rm -f %{buildroot}/usr/share/locale/*/LC_MESSAGES/libkipi.mo @@ -314,6 +313,14 @@ %find_lang kipiplugin_$l kipiplugin.lang done +# this allows the icon to be used as an application icon safely +for res in 16x16 22x22 32x32 48x48 64x64 128x128 scalable +do +pushd %{buildroot}%{_kde4_iconsdir}/hicolor/$res/apps/ +ln -s %{_kde4_iconsdir}/oxygen/$res/apps/rawconverter.* +popd +done + %fdupes -s %{buildroot} %kde_post_install @@ -351,6 +358,8 @@ %{_kde4_bindir}/digikam %{_kde4_bindir}/digitaglinktree %{_kde4_bindir}/showfoto +%dir %{_kde4_iconsdir}/hicolor/* +%dir %{_kde4_iconsdir}/hicolor/*/apps %{_kde4_iconsdir}/hicolor/*/apps/digikam.* %{_kde4_iconsdir}/hicolor/*/apps/showfoto.* %{_kde4_libdir}/libdigikamcore.so.* @@ -404,6 +413,7 @@ %exclude %{_kde4_iconsdir}/hicolor/*/actions/gpsimagetag.png %{_kde4_iconsdir}/hicolor/*/apps/dngconverter.* %{_kde4_iconsdir}/hicolor/*/apps/photolayoutseditor.* +%{_kde4_iconsdir}/hicolor/*/apps/rawconverter.* %{_kde4_iconsdir}/oxygen/*/apps/rawconverter.* %{_kde4_libdir}/libkipiplugins.so.* %{_kde4_modulesdir}/kipiplugin_*.so @@ -477,7 +487,6 @@ %{_kde4_appsdir}/cmake/modules/FindMediawiki.cmake %if 0%{?kde_updatedapps} -%if 0%{?suse_version} < 1210 %package -n libkdcraw20 Version: 4.7.50 @@ -659,6 +668,5 @@ %{_kde4_libdir}/cmake/KSane/ %endif -%endif %changelog ++++++ digikam-3.0.0-rc.no-kdcraw.version-check.patch ++++++ diff -U3 -dHrN digikam-3.0.0-rc/core/CMakeLists.txt digikam-3.0.0-rc.no-kdcraw.version-check//core/CMakeLists.txt --- digikam-3.0.0-rc/core/CMakeLists.txt 2012-12-24 00:33:16.000000000 +0100 +++ digikam-3.0.0-rc.no-kdcraw.version-check//core/CMakeLists.txt 2013-01-02 00:56:04.959176355 +0100 @@ -199,21 +199,23 @@ # check the libkdcraw version +# Check is done by FindKdcraw.cmake in another way - this way does not seem valid any more +# TODO: find a proper fix SET(KDCRAW_MIN_VERSION "2.2.0") -IF (KDCRAW_VERSION) - - MESSAGE(STATUS "libkdcraw: Found version ${KDCRAW_VERSION} (required: ${KDCRAW_MIN_VERSION})") - IF (${KDCRAW_VERSION} VERSION_LESS ${KDCRAW_MIN_VERSION}) - SET(KDCRAW_FOUND FALSE) - ENDIF (${KDCRAW_VERSION} VERSION_LESS ${KDCRAW_MIN_VERSION}) - -ELSE (KDCRAW_VERSION) - - MESSAGE(WARNING "libkdcraw: Version information not found, your version is probably too old.") - SET(KDCRAW_FOUND FALSE) - -ENDIF (KDCRAW_VERSION) +# IF (KDCRAW_VERSION) +# +# MESSAGE(STATUS "libkdcraw: Found version ${KDCRAW_VERSION} (required: ${KDCRAW_MIN_VERSION})") +# IF (${KDCRAW_VERSION} VERSION_LESS ${KDCRAW_MIN_VERSION}) +# SET(KDCRAW_FOUND FALSE) +# ENDIF (${KDCRAW_VERSION} VERSION_LESS ${KDCRAW_MIN_VERSION}) +# +# ELSE (KDCRAW_VERSION) +# +# MESSAGE(WARNING "libkdcraw: Version information not found, your version is probably too old.") +# SET(KDCRAW_FOUND FALSE) +# +# ENDIF (KDCRAW_VERSION) # LCMS version 1 and 2 library handling # See B.K.O #294105 diff -U3 -dHrN digikam-3.0.0-rc/extra/kipi-plugins/CMakeLists.txt digikam-3.0.0-rc.no-kdcraw.version-check//extra/kipi-plugins/CMakeLists.txt --- digikam-3.0.0-rc/extra/kipi-plugins/CMakeLists.txt 2012-12-24 00:32:43.000000000 +0100 +++ digikam-3.0.0-rc.no-kdcraw.version-check//extra/kipi-plugins/CMakeLists.txt 2013-01-02 00:46:24.088220092 +0100 @@ -131,21 +131,23 @@ # Check the libkdcraw version +# Check is done by FindKdcraw.cmake in another way - this way does not seem valid any more +# TODO: find a proper fix SET(KDCRAW_MIN_VERSION "2.2.0") -IF (KDCRAW_VERSION) - - MESSAGE(STATUS "libkdcraw: Found version ${KDCRAW_VERSION} (required: ${KDCRAW_MIN_VERSION})") - IF (${KDCRAW_VERSION} VERSION_LESS ${KDCRAW_MIN_VERSION}) - SET(KDCRAW_FOUND FALSE) - ENDIF (${KDCRAW_VERSION} VERSION_LESS ${KDCRAW_MIN_VERSION}) - -ELSE (KDCRAW_VERSION) - - MESSAGE(WARNING "libkdcraw: Version information not found, your version is probably too old.") - SET(KDCRAW_FOUND FALSE) - -ENDIF (KDCRAW_VERSION) +# IF (KDCRAW_VERSION) +# +# MESSAGE(STATUS "libkdcraw: Found version ${KDCRAW_VERSION} (required: ${KDCRAW_MIN_VERSION})") +# IF (${KDCRAW_VERSION} VERSION_LESS ${KDCRAW_MIN_VERSION}) +# SET(KDCRAW_FOUND FALSE) +# ENDIF (${KDCRAW_VERSION} VERSION_LESS ${KDCRAW_MIN_VERSION}) +# +# ELSE (KDCRAW_VERSION) +# +# MESSAGE(WARNING "libkdcraw: Version information not found, your version is probably too old.") +# SET(KDCRAW_FOUND FALSE) +# +# ENDIF (KDCRAW_VERSION) # Optional depencies detection required by some plugins -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
