Hello community, here is the log from the commit of package digikam for openSUSE:Factory checked in at 2011-11-08 17:25:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2011-10-16 12:43:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.digikam.new/digikam.changes 2011-11-08 17:27:19.000000000 +0100 @@ -1,0 +2,11 @@ +Tue Nov 8 11:03:03 UTC 2011 - idon...@suse.com + +- Workaround kde#286034 + +------------------------------------------------------------------- +Mon Nov 7 10:46:01 UTC 2011 - adr...@suse.de + +- update to version 2.3.0 + * Bugfix release, please see included NEWS file for fixed bugs. + +------------------------------------------------------------------- Old: ---- add_mimetype_bnc629393.diff digikam-2.2.0.tar.bz2 New: ---- digikam-2.3.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ digikam.spec ++++++ --- /var/tmp/diff_new_pack.PSozJl/_old 2011-11-08 17:27:25.000000000 +0100 +++ /var/tmp/diff_new_pack.PSozJl/_new 2011-11-08 17:27:25.000000000 +0100 @@ -15,8 +15,10 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + + Name: digikam -Version: 2.2.0 +Version: 2.3.0 Release: 1 License: GPL-2.0+ Summary: A KDE Photo Manager @@ -25,10 +27,8 @@ Source0: http://sourceforge.net/projects/digikam/files/%{name}/%{version}/%{name}-%{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-UPSTREAM add_mimetype_bnc629393.diff bnc#629393 kde#261627 ctri...@gmx.net -- Add MimeTypes to desktop file for better integration in GNOME -Patch1: add_mimetype_bnc629393.diff # PATCH-FIX-OPENSUSE digikam-external-libs.patch -- Compile with external libs -Patch2: digikam-external-libs.patch +Patch1: digikam-external-libs.patch BuildRequires: boost-devel BuildRequires: doxygen BuildRequires: fdupes @@ -79,7 +79,6 @@ rm po/*/kipi* %patch0 %patch1 -%patch2 # 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') @@ -100,6 +99,9 @@ rm -f %{buildroot}%{_kde4_libdir}/libdigikamcore.so rm -f %{buildroot}%{_kde4_libdir}/libdigikamdatabase.so +# Workaround kde#286034 +mv %{buildroot}/usr/share/icons/oxygen %{buildroot}/usr/share/icons/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 @@ -110,6 +112,7 @@ %kde_post_install %post -p /sbin/ldconfig + %postun -p /sbin/ldconfig %files ++++++ digikam-2.2.0.tar.bz2 -> digikam-2.3.0.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/digikam/digikam-2.2.0.tar.bz2 /work/SRC/openSUSE:Factory/.digikam.new/digikam-2.3.0.tar.bz2 differ: char 11, line 1 ++++++ digikam-external-libs.patch ++++++ --- /var/tmp/diff_new_pack.PSozJl/_old 2011-11-08 17:27:26.000000000 +0100 +++ /var/tmp/diff_new_pack.PSozJl/_new 2011-11-08 17:27:26.000000000 +0100 @@ -1,14 +1,16 @@ ---- CMakeLists.txt.orig 2011-09-07 14:10:20.000000000 +0200 -+++ CMakeLists.txt 2011-09-09 15:30:52.649954215 +0200 -@@ -79,12 +79,7 @@ +Index: CMakeLists.txt +=================================================================== +--- CMakeLists.txt.orig ++++ CMakeLists.txt +@@ -74,12 +74,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(LIBKVKONTAKTE_LOCAL_DIR extra/libkvkontakte) - +-SET(KVKONTAKTE_LOCAL_DIR extra/libkvkontakte) +- -ADD_SUBDIRECTORY(extra) ADD_SUBDIRECTORY(core) ADD_SUBDIRECTORY(doc) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
