From 01c35f3423f668704f73e87fde18425d707367bd3dab0fadf41078421eec526d Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 14 Dec 2011 13:33:09 +0000 Subject: [PATCH] Accepting request 96415 from KDE:Distro:Factory - 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. - require libkipi8 version build against, it changes ABI too often OBS-URL: https://build.opensuse.org/request/show/96415 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/digikam?expand=0&rev=88 --- digikam-2.3.0.tar.bz2 | 3 --- digikam-2.4.1.tar.bz2 | 3 +++ digikam-buildtime.patch | 10 ++++++---- digikam-external-libs.patch | 10 +++++----- digikam.changes | 13 +++++++++++++ digikam.spec | 15 ++++++--------- 6 files changed, 33 insertions(+), 21 deletions(-) delete mode 100644 digikam-2.3.0.tar.bz2 create mode 100644 digikam-2.4.1.tar.bz2 diff --git a/digikam-2.3.0.tar.bz2 b/digikam-2.3.0.tar.bz2 deleted file mode 100644 index 528ee4b..0000000 --- a/digikam-2.3.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:29ddf83a160817314e9274a35d678678da58006e41d961dcebc6afb0ab200a33 -size 54522109 diff --git a/digikam-2.4.1.tar.bz2 b/digikam-2.4.1.tar.bz2 new file mode 100644 index 0000000..dcf1662 --- /dev/null +++ b/digikam-2.4.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aca967a4cc5312923cb2340502eb10a571684c14cf63896a68a1796d0483de3b +size 54531119 diff --git a/digikam-buildtime.patch b/digikam-buildtime.patch index 4e4ac48..ac1b833 100644 --- a/digikam-buildtime.patch +++ b/digikam-buildtime.patch @@ -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 }; diff --git a/digikam-external-libs.patch b/digikam-external-libs.patch index 424035c..99abf37 100644 --- a/digikam-external-libs.patch +++ b/digikam-external-libs.patch @@ -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) diff --git a/digikam.changes b/digikam.changes index dd592c3..78770c5 100644 --- a/digikam.changes +++ b/digikam.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +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 + ------------------------------------------------------------------- Tue Nov 15 18:36:36 UTC 2011 - ctrippe@opensuse.org diff --git a/digikam.spec b/digikam.spec index c79d47b..5647220 100644 --- a/digikam.spec +++ b/digikam.spec @@ -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: shared-desktop-ontologies-devel 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 -rf %{buildroot}%{_kde4_htmldir}/en/kipi-plugins 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