Hello community, here is the log from the commit of package digikam for openSUSE:Factory checked in at 2011-12-14 14:33:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/digikam (Old) and /work/SRC/openSUSE:Factory/.digikam.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "digikam", Maintainer is "kde-maintainers@suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/digikam/digikam.changes 2011-11-16 17:17:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.digikam.new/digikam.changes 2011-12-14 14:33:13.000000000 +0100 @@ -1,0 +2,13 @@ +Mon Dec 12 09:32:52 UTC 2011 - coolo@suse.com + +- update to 2.4.1 + * a bug-fixes release, including a total of 25 fixed bugs. + * histogram view from right sidebar have been improved for better + image analyse. + +------------------------------------------------------------------- +Mon Dec 12 08:59:11 UTC 2011 - coolo@suse.com + +- require libkipi8 version build against, it changes ABI too often + +------------------------------------------------------------------- Old: ---- digikam-2.3.0.tar.bz2 New: ---- digikam-2.4.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ digikam.spec ++++++ --- /var/tmp/diff_new_pack.BJCebQ/_old 2011-12-14 14:33:17.000000000 +0100 +++ /var/tmp/diff_new_pack.BJCebQ/_new 2011-12-14 14:33:17.000000000 +0100 @@ -16,15 +16,14 @@ # - Name: digikam -Version: 2.3.0 -Release: 1 -License: GPL-2.0+ +Version: 2.4.1 +Release: 0 Summary: A KDE Photo Manager -Url: http://www.digikam.org/ +License: GPL-2.0+ Group: Productivity/Graphics/Viewers -Source0: http://sourceforge.net/projects/digikam/files/%{name}/%{version}/%{name}-%{version}.tar.bz2 +Url: http://www.digikam.org/ +Source0: http://sourceforge.net/projects/digikam/files/digikam/%{version}/digikam-%{version}.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 digikam-external-libs.patch -- Compile with external libs @@ -51,6 +50,7 @@ BuildRequires: update-desktop-files %endif Requires: kipi-plugins >= 2.1.0 +%requires_ge libkipi8 Requires: libqt4-sql-sqlite Requires: libqt4-sql-mysql Recommends: %{name}-doc @@ -104,9 +104,6 @@ rm -f %{buildroot}%{_kde4_libdir}/libdigikamcore.so rm -f %{buildroot}%{_kde4_libdir}/libdigikamdatabase.so -# Workaround kde#286034 -mv %{buildroot}%{_kde4_iconsdir}/oxygen %{buildroot}%{_kde4_iconsdir}/hicolor - %if 0%{?suse_version} %suse_update_desktop_file -r %{name} Qt KDE Graphics Photography %suse_update_desktop_file -G "Photo Editor" -r showfoto Qt KDE Graphics Photography ++++++ digikam-2.3.0.tar.bz2 -> digikam-2.4.1.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/digikam/digikam-2.3.0.tar.bz2 /work/SRC/openSUSE:Factory/.digikam.new/digikam-2.4.1.tar.bz2 differ: char 11, line 1 ++++++ digikam-buildtime.patch ++++++ --- /var/tmp/diff_new_pack.BJCebQ/_old 2011-12-14 14:33:17.000000000 +0100 +++ /var/tmp/diff_new_pack.BJCebQ/_new 2011-12-14 14:33:17.000000000 +0100 @@ -1,6 +1,8 @@ ---- core/libs/3rdparty/cimg/CImg.h.orig -+++ core/libs/3rdparty/cimg/CImg.h -@@ -5669,7 +5669,7 @@ namespace cimg_library { +Index: core/libs/3rdparty/cimg/CImg.h +=================================================================== +--- core/libs/3rdparty/cimg/CImg.h.orig 2011-12-04 22:40:13.000000000 +0100 ++++ core/libs/3rdparty/cimg/CImg.h 2011-12-12 10:45:04.129281874 +0100 +@@ -5673,7 +5673,7 @@ namespace cimg_library { if (usage) { cimg_std::fprintf(cimg_stdout,"\n %s%s%s",cimg::t_red,cimg::basename(argv[0]),cimg::t_normal); cimg_std::fprintf(cimg_stdout," : %s",usage); @@ -9,7 +11,7 @@ } if (defaut) cimg_std::fprintf(cimg_stdout,"%s\n",defaut); } -@@ -5755,9 +5755,9 @@ namespace cimg_library { +@@ -5759,9 +5759,9 @@ namespace cimg_library { **/ inline void info() { char tmp[1024] = { 0 }; ++++++ digikam-external-libs.patch ++++++ --- /var/tmp/diff_new_pack.BJCebQ/_old 2011-12-14 14:33:17.000000000 +0100 +++ /var/tmp/diff_new_pack.BJCebQ/_new 2011-12-14 14:33:17.000000000 +0100 @@ -1,17 +1,17 @@ Index: CMakeLists.txt =================================================================== ---- CMakeLists.txt.orig -+++ CMakeLists.txt -@@ -74,12 +74,6 @@ IF(${DIGIKAMSC_USE_PRIVATE_KDEGRAPHICS}) +--- CMakeLists.txt.orig 2011-12-04 22:41:31.000000000 +0100 ++++ CMakeLists.txt 2011-12-12 10:45:50.716070335 +0100 +@@ -82,12 +82,6 @@ IF(${DIGIKAMSC_USE_PRIVATE_KDEGRAPHICS}) SET(KSANE_LOCAL_DIR extra/libksane) ENDIF() -SET(KFACE_LOCAL_DIR extra/libkface) -SET(KGEOMAP_LOCAL_DIR extra/libkgeomap) -SET(MEDIAWIKI_LOCAL_DIR extra/libmediawiki) --SET(KVKONTAKTE_LOCAL_DIR extra/libkvkontakte) +-SET(LIBKVKONTAKTE_LOCAL_DIR extra/libkvkontakte) - -ADD_SUBDIRECTORY(extra) ADD_SUBDIRECTORY(core) - ADD_SUBDIRECTORY(doc) + MACRO_OPTIONAL_ADD_SUBDIRECTORY(doc) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org