From ae328a930ca9e9c118163043aabdd09fe9edbf83a523bc267550b3d4424b47b8 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 30 Aug 2013 09:36:12 +0000 Subject: [PATCH] Accepting request 196718 from KDE:Distro:Factory Dropped desktop-files.diff, it's no longer needed and AcquireImages is missing it's icon due to it (bnc#835989) (forwarded request 196709 from sumski) OBS-URL: https://build.opensuse.org/request/show/196718 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/digikam?expand=0&rev=115 --- desktop-files.diff | 10 ---------- digikam.changes | 6 ++++++ digikam.spec | 5 ----- 3 files changed, 6 insertions(+), 15 deletions(-) delete mode 100644 desktop-files.diff diff --git a/desktop-files.diff b/desktop-files.diff deleted file mode 100644 index f0ea435..0000000 --- a/desktop-files.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- acquireimages/scangui.desktop.sav -+++ acquireimages/scangui.desktop -@@ -54,7 +54,6 @@ GenericName[uk]=Отримання зо - GenericName[x-test]=xxAcquire Imagesxx - GenericName[zh_CN]=图像捕获 - GenericName[zh_TW]=擷取影像 --Icon=scanner - Name=AcquireImages - Name[ast]=AcquireImages - Name[bg]=Сканиране на снимки diff --git a/digikam.changes b/digikam.changes index 8a65e88..c4a3478 100644 --- a/digikam.changes +++ b/digikam.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Aug 28 16:47:36 UTC 2013 - hrvoje.senjan@gmail.com + +- Dropped desktop-files.diff, it's no longer needed and AcquireImages + is missing it's icon due to it (bnc#835989) + ------------------------------------------------------------------- Thu Aug 15 12:12:30 UTC 2013 - jslaby@suse.com diff --git a/digikam.spec b/digikam.spec index 9427844..b0fc5c5 100644 --- a/digikam.spec +++ b/digikam.spec @@ -26,8 +26,6 @@ Url: http://www.digikam.org/ Source0: ftp://ftp.kde.org/pub/kde/stable/digikam/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 desktop-files.diff -- Remove Icon= entry (the icon is missing) -Patch1: desktop-files.diff # PATCH-FIX-OPENSUSE remove-gplv2-only.patch idoenmez@suse.de bnc#711963 -- Remove GPLv2 only files from the build system Patch3: remove-gplv2-only.patch # PATCH-FIX-OPENSUSE digikam_no_build_vkontakte.diff tittiatcoke@gmail.com -- Don't build libvkontakte (use external one) @@ -229,9 +227,6 @@ This package contains the development files for libmediawiki. %prep %setup -q %patch0 -pushd extra/kipi-plugins -%patch1 -popd %patch3 %patch5 %patch6 -p1