From bdde8489c935e15d76c2578b4c1684716825ce3ada2e92e1f36eafbdcfeddfaf Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Wed, 16 Dec 2009 16:30:18 +0000 Subject: [PATCH] Accepting request 26777 from KDE:KDE4:Factory:Desktop Copy from KDE:KDE4:Factory:Desktop/digikam based on submit request 26777 from user dirkmueller OBS-URL: https://build.opensuse.org/request/show/26777 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/digikam?expand=0&rev=38 --- CMakeLists.txt.diff | 19 ----------- digikam-0.10.0.tar.bz2 | 3 -- digikam-1.0.0-rc.tar.bz2 | 3 ++ digikam.changes | 5 +++ digikam.spec | 68 +++++++++++++++++----------------------- 5 files changed, 36 insertions(+), 62 deletions(-) delete mode 100644 CMakeLists.txt.diff delete mode 100644 digikam-0.10.0.tar.bz2 create mode 100644 digikam-1.0.0-rc.tar.bz2 diff --git a/CMakeLists.txt.diff b/CMakeLists.txt.diff deleted file mode 100644 index 4cc245a..0000000 --- a/CMakeLists.txt.diff +++ /dev/null @@ -1,19 +0,0 @@ -Index: CMakeLists.txt -=================================================================== ---- CMakeLists.txt.orig -+++ CMakeLists.txt -@@ -2,6 +2,14 @@ PROJECT(digikam) - - OPTION(ENABLE_GPHOTO2 "Build digiKam with libgphoto2 support (default=ON)" ON) - -+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake/modules ) -+ -+# search packages used by KDE -+find_package(KDE4 REQUIRED) -+include (KDE4Defaults) -+include (MacroLibrary) -+include(MacroOptionalAddSubdirectory) -+ - # ================================================================================================== - # Information to update before to release this package. - diff --git a/digikam-0.10.0.tar.bz2 b/digikam-0.10.0.tar.bz2 deleted file mode 100644 index a91ef5e..0000000 --- a/digikam-0.10.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:69dbeeba8fca87087cf845ca4581dd9197426bb1d5140d967c7b29c449523cbc -size 11194398 diff --git a/digikam-1.0.0-rc.tar.bz2 b/digikam-1.0.0-rc.tar.bz2 new file mode 100644 index 0000000..4381805 --- /dev/null +++ b/digikam-1.0.0-rc.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ab69600b3f624bd09ef50c6f5df636a19f209b21f2722672a8f256ced462f0f5 +size 14654893 diff --git a/digikam.changes b/digikam.changes index 59ded03..10cb062 100644 --- a/digikam.changes +++ b/digikam.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Dec 3 09:49:33 UTC 2009 - tittiatcoke@gmail.com + +- update to 1.0 RC version: + ------------------------------------------------------------------- Thu Aug 20 09:41:31 CEST 2009 - beineri@opensuse.org diff --git a/digikam.spec b/digikam.spec index d94783a..cdb3e16 100644 --- a/digikam.spec +++ b/digikam.spec @@ -1,5 +1,5 @@ # -# spec file for package digikam (Version 0.10.0) +# spec file for package digikam (Version 1.0rc) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -21,27 +21,21 @@ Name: digikam BuildRequires: graphviz-devel libgphoto2-devel libkdepimlibs4-devel libqimageblitz-devel sqlite-devel BuildRequires: libkdcraw-devel libkexiv2-devel libkipi-devel marble-devel -%if %suse_version > 1020 -BuildRequires: imlib-devel libjasper-devel -%else -BuildRequires: libjasper -%endif +BuildRequires: imlib-devel libjasper-devel soprano-backend-redland Url: http://www.digikam.org/ -License: GPL v2 or later +License: GPLv2+ Group: Productivity/Graphics/Viewers Summary: A KDE Photo Manager -Version: 0.10.0 -Release: 6 -%define tar_version 0.10.0 +Version: 1.0rc +Release: 1 +%define tar_version 1.0.0-rc Source0: %name-%{tar_version}.tar.bz2 -Patch: CMakeLists.txt.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build -%kde4_runtime_requires -Recommends: kipi-plugins +%kde4_runtime_requires +Recommends: libqt4-sql-sqlite kipi-plugins Requires: oxygen-icon-theme Requires: %{name}-lang = %{version} Provides: kde4-digikam = 0.10.0 -Requires: libqt4-sql-sqlite Obsoletes: kde4-digikam <= 0.10.0 %description @@ -59,7 +53,7 @@ Authors: Renchi Raju %package devel -License: GPL v2 or later +License: GPLv2+ Group: Productivity/Graphics/Viewers Summary: A KDE Photo Manager Build Environment Requires: %name = %{version} @@ -77,7 +71,6 @@ Authors: %lang_package %prep %setup -q -n %name-%{tar_version} -%patch %build %cmake_kde4 -d build @@ -86,11 +79,6 @@ Authors: %install cd build %makeinstall - # Move the icons back to /usr/share/icons/hicolor because digikam started installing only to datadir/icons, relying on the theme. - # This is wrong - only oxygen provides a digikam icon - mkdir -p $RPM_BUILD_ROOT/usr/share/icons/hicolor/{16x16,22x22,32x32,48x48,64x64,128x128}/apps/ - for i in {16,22,32,48,64,128}; do mv $RPM_BUILD_ROOT/usr/share/kde4/apps/digikam/icons/oxygen/"$i"x"$i"/apps/digikam.png $RPM_BUILD_ROOT/usr/share/icons/hicolor/"$i"x"$i"/apps/;done - for i in {16,22,32,48,64,128}; do mv $RPM_BUILD_ROOT/usr/share/kde4/apps/digikam/icons/oxygen/"$i"x"$i"/apps/showfoto.png $RPM_BUILD_ROOT/usr/share/icons/hicolor/"$i"x"$i"/apps/;done cd .. %suse_update_desktop_file digikam Graphics Photography %suse_update_desktop_file -G "Photo Editor" showfoto Graphics Photography @@ -118,9 +106,9 @@ rm -rf filelists %files %defattr(-,root,root) /usr/bin/digikam -/usr/bin/digikamthemedesigner /usr/bin/digitaglinktree /usr/bin/showfoto +/usr/bin/cleanup_digikamdb %_kde4_modules/digikamimageplugin_adjustcurves.so %_kde4_modules/digikamimageplugin_adjustlevels.so %_kde4_modules/digikamimageplugin_blurfx.so @@ -138,7 +126,6 @@ rm -rf filelists %_kde4_modules/digikamimageplugin_inpainting.so %_kde4_modules/digikamimageplugin_inserttext.so %_kde4_modules/digikamimageplugin_lenscorrection.so -%_kde4_modules/digikamimageplugin_noisereduction.so %_kde4_modules/digikamimageplugin_oilpaint.so %_kde4_modules/digikamimageplugin_perspective.so %_kde4_modules/digikamimageplugin_raindrop.so @@ -147,26 +134,18 @@ rm -rf filelists %_kde4_modules/digikamimageplugin_superimpose.so %_kde4_modules/digikamimageplugin_texture.so %_kde4_modules/digikamimageplugin_whitebalance.so +%_kde4_modules/digikamimageplugin_contentawareresizing.so %_kde4_modules/kio_digikamalbums.so %_kde4_modules/kio_digikamdates.so %_kde4_modules/kio_digikamsearch.so %_kde4_modules/kio_digikamtags.so +%_kde4_modules/plugins/marble/ExternalDraw.so %_libdir/libdigikamcore.so.* %_libdir/libdigikamdatabase.so.* /usr/share/applications/kde4/digikam.desktop /usr/share/applications/kde4/showfoto.desktop -/usr/share/icons/hicolor/128x128/apps/digikam.png -/usr/share/icons/hicolor/128x128/apps/showfoto.png -/usr/share/icons/hicolor/16x16/apps/digikam.png -/usr/share/icons/hicolor/16x16/apps/showfoto.png -/usr/share/icons/hicolor/22x22/apps/digikam.png -/usr/share/icons/hicolor/22x22/apps/showfoto.png -/usr/share/icons/hicolor/32x32/apps/digikam.png -/usr/share/icons/hicolor/32x32/apps/showfoto.png -/usr/share/icons/hicolor/48x48/apps/digikam.png -/usr/share/icons/hicolor/48x48/apps/showfoto.png -/usr/share/icons/hicolor/64x64/apps/digikam.png -/usr/share/icons/hicolor/64x64/apps/showfoto.png +/usr/share/icons/hicolor/*/apps/digikam.* +/usr/share/icons/hicolor/*/apps/showfoto.* %_kde_share_dir/apps/digikam %_kde_share_dir/apps/showfoto %_kde_share_dir/services/digikamalbums.protocol @@ -188,7 +167,6 @@ rm -rf filelists %_kde_share_dir/services/digikamimageplugin_inpainting.desktop %_kde_share_dir/services/digikamimageplugin_inserttext.desktop %_kde_share_dir/services/digikamimageplugin_lenscorrection.desktop -%_kde_share_dir/services/digikamimageplugin_noisereduction.desktop %_kde_share_dir/services/digikamimageplugin_oilpaint.desktop %_kde_share_dir/services/digikamimageplugin_perspective.desktop %_kde_share_dir/services/digikamimageplugin_raindrop.desktop @@ -197,15 +175,25 @@ rm -rf filelists %_kde_share_dir/services/digikamimageplugin_superimpose.desktop %_kde_share_dir/services/digikamimageplugin_texture.desktop %_kde_share_dir/services/digikamimageplugin_whitebalance.desktop +%_kde_share_dir/services/digikamimageplugin_contentawareresizing.desktop %_kde_share_dir/services/digikamsearch.protocol %_kde_share_dir/services/digikamtags.protocol %_kde_share_dir/servicetypes/digikamimageplugin.desktop -%_kde_share_dir/apps/showfoto/data/logo-showfoto.png -%_kde_share_dir/apps/showfoto/data/splash-showfoto.png -%_kde_share_dir/apps/showfoto/showfotoui.rc +#%_kde_share_dir/apps/showfoto/data/logo-showfoto.png +#%_kde_share_dir/apps/showfoto/data/splash-showfoto.png +#%_kde_share_dir/apps/showfoto/showfotoui.rc /usr/share/man/man1/digitaglinktree.1.gz +/usr/share/man/man1/cleanup_digikamdb.1.gz %dir /usr/share/kde4/apps/solid %dir /usr/share/kde4/apps/solid/actions -/usr/share/kde4/apps/solid/actions/digikam-opencamera.desktop +%_kde_share_dir/apps/solid/actions/digikam-opencamera.desktop +%if %suse_version < 1120 +%dir /usr/share/locale/hne +%dir /usr/share/locale/hne/LC_MESSAGES +%endif +%_kde4_modules/digikamnepomukservice.so +%_kde_share_dir/services/digikamnepomukservice.desktop +%_kde4_modules/digikamimageplugin_localcontrast.so +%_kde_share_dir/services/digikamimageplugin_localcontrast.desktop %changelog