From e82b1cde1a2e19b797d92d953119a72841f36f21e12fe8b615fc2861f59bd8f0 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Wed, 4 Nov 2015 14:32:28 +0000 Subject: [PATCH] Updating link to change in openSUSE:Factory/digikam revision 142.0 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/digikam?expand=0&rev=9dbcf47c83d71ca9a80a7dd7b11c851c --- digikam-4.13.0.tar.bz2 | 3 - digikam-4.14.0.tar.bz2 | 3 + digikam-4.6.0.install-libs-dev.patch | 87 --------- digikam-4.8.0-libkgeomap-translations.tar.bz2 | 3 - digikam.changes | 51 +++++ digikam.spec | 178 +----------------- 6 files changed, 59 insertions(+), 266 deletions(-) delete mode 100644 digikam-4.13.0.tar.bz2 create mode 100644 digikam-4.14.0.tar.bz2 delete mode 100644 digikam-4.6.0.install-libs-dev.patch delete mode 100644 digikam-4.8.0-libkgeomap-translations.tar.bz2 diff --git a/digikam-4.13.0.tar.bz2 b/digikam-4.13.0.tar.bz2 deleted file mode 100644 index 08daa3e..0000000 --- a/digikam-4.13.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a37554cabe75b0dbdde79f12ea37f93ea4ec9b6d624a4bb15ffabaf81cd801e8 -size 69554099 diff --git a/digikam-4.14.0.tar.bz2 b/digikam-4.14.0.tar.bz2 new file mode 100644 index 0000000..38d5659 --- /dev/null +++ b/digikam-4.14.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9d7bcb689d8c29be2e81976f0a043220f442a24f2071284044e7f1a799a7fdad +size 59805228 diff --git a/digikam-4.6.0.install-libs-dev.patch b/digikam-4.6.0.install-libs-dev.patch deleted file mode 100644 index 3c6dca8..0000000 --- a/digikam-4.6.0.install-libs-dev.patch +++ /dev/null @@ -1,87 +0,0 @@ -diff -U 3 -H -d -r -N -- digikam-4.6.0/extra/libkface/libkface/CMakeLists.txt digikam-4.6.0.install-libs-dev/extra/libkface/libkface/CMakeLists.txt ---- digikam-4.6.0/extra/libkface/libkface/CMakeLists.txt 2014-12-16 08:54:40.000000000 +0100 -+++ digikam-4.6.0.install-libs-dev/extra/libkface/libkface/CMakeLists.txt 2015-01-03 21:03:21.172580963 +0100 -@@ -63,9 +63,6 @@ - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/database/dbconfig.xml - DESTINATION ${DATA_INSTALL_DIR}/libkface/database ) - --# Check if compilation is done through digiKam SC or not. If yes, do not install header files. --if(NOT DIGIKAMSC_COMPILE_LIBKFACE) -- - install(FILES facedetector.h - recognitiondatabase.h - identity.h -@@ -76,9 +73,7 @@ - ) - - if(NOT WIN32) -- configure_file(${CMAKE_SOURCE_DIR}/cmake/templates/libkface.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/libkface.pc) -- configure_file(${CMAKE_SOURCE_DIR}/cmake/templates/libkface.lsm.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/libkface.lsm) -+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/templates/libkface.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/libkface.pc) -+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/templates/libkface.lsm.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/libkface.lsm) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libkface.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig ) - endif() -- --endif() -diff -U 3 -H -d -r -N -- digikam-4.6.0/extra/libkgeomap/libkgeomap/CMakeLists.txt digikam-4.6.0.install-libs-dev/extra/libkgeomap/libkgeomap/CMakeLists.txt ---- digikam-4.6.0/extra/libkgeomap/libkgeomap/CMakeLists.txt 2014-12-16 08:54:40.000000000 +0100 -+++ digikam-4.6.0.install-libs-dev/extra/libkgeomap/libkgeomap/CMakeLists.txt 2015-01-03 21:03:38.204621741 +0100 -@@ -73,9 +73,6 @@ - - install(TARGETS kgeomap ${INSTALL_TARGETS_DEFAULT_ARGS}) - --# Check if compilation is done through digiKam SC or not. If yes, do not install header files. --if(NOT DIGIKAMSC_COMPILE_LIBKGEOMAP) -- - install(FILES libkgeomap_export.h - abstractmarkertiler.h - dragdrophandler.h -@@ -94,14 +91,12 @@ - ) - - if(NOT WIN32) -- configure_file(${CMAKE_SOURCE_DIR}/cmake/templates/libkgeomap.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/libkgeomap.pc) -- configure_file(${CMAKE_SOURCE_DIR}/cmake/templates/libkgeomap.lsm.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/libkgeomap.lsm) -+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/templates/libkgeomap.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/libkgeomap.pc) -+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/templates/libkgeomap.lsm.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/libkgeomap.lsm) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libkgeomap.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig ) - endif() - - # Install find cmake script to the system for client applications. - -- install(FILES ${CMAKE_SOURCE_DIR}/cmake/modules/FindKGeoMap.cmake -+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../cmake/modules/FindKGeoMap.cmake - DESTINATION ${DATA_INSTALL_DIR}/cmake/modules) -- --endif() -diff -U 3 -H -d -r -N -- digikam-4.6.0/extra/libmediawiki/libmediawiki/CMakeLists.txt digikam-4.6.0.install-libs-dev/extra/libmediawiki/libmediawiki/CMakeLists.txt ---- digikam-4.6.0/extra/libmediawiki/libmediawiki/CMakeLists.txt 2014-12-16 08:54:40.000000000 +0100 -+++ digikam-4.6.0.install-libs-dev/extra/libmediawiki/libmediawiki/CMakeLists.txt 2015-01-03 21:03:05.940544498 +0100 -@@ -40,9 +40,6 @@ - - install(TARGETS mediawiki ${INSTALL_TARGETS_DEFAULT_ARGS}) - --# Check if compilation is done through digiKam SC or not. If yes, do not install header files. --if(NOT DIGIKAMSC_COMPILE_LIBMEDIAWIKI) -- - install(FILES image.h - imageinfo.h - mediawiki.h -@@ -68,14 +65,12 @@ - DESTINATION ${INCLUDE_INSTALL_DIR}/libmediawiki COMPONENT Devel) - - if(NOT WIN32) -- configure_file(${CMAKE_SOURCE_DIR}/cmake/templates/libmediawiki.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/libmediawiki.pc) -- configure_file(${CMAKE_SOURCE_DIR}/cmake/templates/libmediawiki.lsm.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/libmediawiki.lsm) -+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/templates/libmediawiki.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/libmediawiki.pc) -+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/templates/libmediawiki.lsm.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/libmediawiki.lsm) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libmediawiki.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig ) - endif() - - # Install find cmake script to the system for client applications. - -- install(FILES ${CMAKE_SOURCE_DIR}/cmake/modules/FindMediawiki.cmake -+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../cmake/modules/FindMediawiki.cmake - DESTINATION ${DATA_INSTALL_DIR}/cmake/modules) -- --endif() diff --git a/digikam-4.8.0-libkgeomap-translations.tar.bz2 b/digikam-4.8.0-libkgeomap-translations.tar.bz2 deleted file mode 100644 index ec5fca6..0000000 --- a/digikam-4.8.0-libkgeomap-translations.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b145925331401b99bf8f65b0f3b3817fb572c0c192cfad2af4e59e73d5397dd1 -size 23171 diff --git a/digikam.changes b/digikam.changes index cb358e9..1f13d05 100644 --- a/digikam.changes +++ b/digikam.changes @@ -1,3 +1,54 @@ +------------------------------------------------------------------- +Wed Oct 28 17:23:00 UTC 2015 - nico.kruber@gmail.com + +- update to 4.14.0 + digikam: + - General: Add support of OpenCV 3.x. + - General: Overlay icons are resized accordingly with thumbnails sizes. + - General: New Overlay icon to quickly show an image in full-screen. + - General: Exiv2 mininum version bumped to 0.25 to prevent crash with + video files. + - kde#349601 - digikam compile fine with OpenCV 2.X but not with 3.x. + - kde#261568 - ICONVIEW: scale overlay action icons accordingly with + thumb size. + - kde#336331 - Thumbnails size can not be changed in MapView mode. + - kde#339082 - Allow a simpler way to place a photo in full-screen using + overlay. + - kde#352338 - Digikam doesn't match Nikon lenses 35mm f/1.8G and + 50mm f/1.8G. + - kde#126149 - Album icon view stores both jpeg and raw (nef), handle + both as one. + - kde#352919 - Crash on delete into image editor. + - kde#341819 - Auto-creation of date-based sub-albums ignored. + - kde#353155 - Apply face tags to multiple images. + - kde#237719 - Color effects: Neon / Find edges don't take parameters + correctly. + - kde#340373 - Crash on scanning video directory. + - kde#285052 - SCAN: moving an album from one collection to another one + do not update information. + - kde#353600 - Wrong date (1970-01-01) on rename during raw import from + Nikon D750. + - kde#353614 - Crash shortly after opening application. + - kde#141592 - Position of inserted text is not exact. + - kde#353608 - The preview has blocky artifacts reminiscent of chroma + subsampling. + - kde#286373 - DNG don't get filtered as raw (group of items relevant). + - kde#181813 - digiKam text decoration font size problem. + - kde#353815 - Using Batch Queue Manager to extract preview images loses + metadata. + kipi-plugins: + - General: Add support of OpenCV 3.x + - kde#306442 - digiKam 2.8 crash when opening geolocation plugin. + - kde#352596 - Unable to upload large image to flickr even though I'm + resizing it. + - kde#352621 - Export to facebook crashes. + - kde#352862 - Photos are compressed when exported to picasa. + - kde#352750 - Facebook export: Filename is used as Description. +- remove digikam-4.6.0.install-libs-dev.patch (libs not packaged anymore) +- remove digikam-4.8.0-libkgeomap-translations.tar.bz2 (libs not packaged + anymore) +- remove support for MediaWiki export (libmediawiki not packaged anymore) + ------------------------------------------------------------------- Sun Oct 11 12:55:49 UTC 2015 - hrvoje.senjan@gmail.com diff --git a/digikam.spec b/digikam.spec index 8a198c0..bf51216 100644 --- a/digikam.spec +++ b/digikam.spec @@ -17,24 +17,20 @@ Name: digikam -Version: 4.13.0 +Version: 4.14.0 Release: 0 -%define rversion 4.13.0 +%define rversion 4.14.0 Summary: A KDE Photo Manager License: GPL-2.0+ Group: Productivity/Graphics/Viewers Url: http://www.digikam.org/ Source0: http://download.kde.org/stable/%{name}/%{name}-%{rversion}.tar.bz2 -# libkgeomap translations from the 4.8.0 tarball (Missing in 4.9.0) -Source2: digikam-4.8.0-libkgeomap-translations.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 remove-gplv2-only.patch idoenmez@suse.de bnc#711963 -- Remove GPLv2 only files from the build system Patch3: remove-gplv2-only.patch # PATCH-FIX-UPSTREAM digikam-4.4.0.no-kdcraw.version-check.patch -- version check for libkdcraw currently broken Patch6: digikam-4.4.0.no-kdcraw.version-check.patch -# PATCH-FIX-OPENSUSE digikam-4.6.0.install-libs-dev.patch nkruber@gmail.com -- install cmake module files and pkgconfig files of internally-built libraries, too -Patch7: digikam-4.6.0.install-libs-dev.patch BuildRequires: ImageMagick-devel BuildRequires: bison BuildRequires: boost-devel @@ -42,18 +38,13 @@ BuildRequires: doxygen BuildRequires: fdupes BuildRequires: flex BuildRequires: gdk-pixbuf-devel +BuildRequires: libkgeomap-devel BuildRequires: libxml2-devel BuildRequires: libxslt-devel -%if 0%{?suse_version} >= 1320 || 0%{?is_opensuse} -# We want libkgeomap on openSUSE 13.2+ and Leap, which is 1315 && is_opensuse -BuildRequires: libkgeomap-devel -%endif %if 0%{?suse_version} > 1310 BuildRequires: baloo-devel %endif -%if 0%{?suse_version} > 1310 BuildRequires: libkface-devel -%endif %if 0%{?suse_version} > 1310 BuildRequires: gstreamer-plugins-qt-devel %else @@ -170,104 +161,15 @@ Supplements: packageand(kipi-plugins:marble) A set of plug-ins for the KDE KIPI interface, used by some KDE imaging applications. -%if 0%{?suse_version} <= 1320 && !0%{?is_opensuse} -# This is only being built up to 13.2 & SLE12, but NOT for Leap 42.1 -%package -n libkgeomap-devel -Summary: Development files for libkgeomap -License: GPL-2.0+ -Group: Development/Libraries/KDE -Requires: libkgeomap2 = %{version} - -%description -n libkgeomap-devel -This package contains development files for libkgeomap. - -%package -n libkgeomap2 -Summary: World-Map Library interface for KDE -License: GPL-2.0+ -Group: System/Libraries -Recommends: libkgeomap-lang = %{version} -Recommends: marble -# libkgeomap was last used at openSUSE 12.1 (version 2.2.0) -Provides: libkgeomap = %{version} -Obsoletes: libkgeomap < %{version} -# libkgeomap1 was last used at openSUSE 13.2 (version 4.4.0) -Obsoletes: libkgeomap1 - -%description -n libkgeomap2 -Libkgeomap is a wrapper around different world-map components, to browse and -arrange photos over a map. -Currently supported map engine are: -- Marble -- OpenstreetMap (via Marble) -- GoogleMap -This library is used by kipi-plugins, digiKam and other kipi host programs. -%endif - -%if 0%{?suse_version} < 1320 && !0%{?is_opensuse} -# This is built up to openSUSE 13.1 plus also SLE12 -%package -n libkface-devel -Summary: Development files for libkface -License: BSD-3-Clause and GPL-2.0+ and LGPL-2.1+ and MIT -Group: Development/Libraries/KDE -Requires: libkface3 = %{version} - -%description -n libkface-devel -This package contains development files for libkface. - -%package -n libkface3 -Summary: Wrapper around LibFace to perform face recognition and detection over pictures -License: BSD-3-Clause and GPL-2.0+ and LGPL-2.1+ and MIT -Group: System/Libraries -# libkface2 was last used at openSUSE 13.2 (version 4.4.0) -Obsoletes: libkface2 - -%description -n libkface3 -Libkface is a Qt/C++ wrapper around LibFace to perform face recognition and -detection over pictures. -%endif - -%package -n libmediawiki1 -Summary: Interface for MediaWiki based web services -License: GPL-2.0+ -Group: System/Libraries -Provides: libmediawiki = %{version} - -%description -n libmediawiki1 -libmediawiki is a KDE C++ interface for MediaWiki based web service as -wikipedia.org. - -This package contains the shared library. - -%package -n libmediawiki-devel -Summary: Development files for libmediawiki -License: GPL-2.0+ -Group: Development/Libraries/C and C++ -Requires: libmediawiki1 = %{version} - -%description -n libmediawiki-devel -libmediawiki is a KDE C++ interface for MediaWiki based web service as -wikipedia.org. - -This package contains the development files for libmediawiki. - %lang_package %lang_package -n kipi-plugins -%if 0%{?suse_version} <= 1320 && !0%{?is_opensuse} -%lang_package -n libkgeomap -%endif - %prep %setup -q -n %{name}-%{rversion} -%if 0%{?suse_version} <= 1320 && !0%{?is_opensuse} -# Don't unpack the libkgeomap translations for Tumbleweed/Leap 42.1 as that they are being delivered through kde-l10n -tar -xjf %{SOURCE2} -%endif %patch0 %patch3 %patch6 -p1 -%patch7 -p1 # 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') @@ -282,15 +184,11 @@ popd %build %if 0%{?suse_version} < 1320 && !0%{?is_opensuse} -EXTRA_FLAGS="-DENABLE_LCMS2=OFF -DDIGIKAMSC_COMPILE_LIBKFACE=TRUE" +EXTRA_FLAGS="-DENABLE_LCMS2=OFF" %else EXTRA_FLAGS="-DENABLE_LCMS2=ON" %endif -%if 0%{?suse_version} <= 1320 && !0%{?is_opensuse} -%cmake_kde4 -d build -- -DENABLE_MYSQLSUPPORT=TRUE -DENABLE_INTERNALMYSQL=FALSE -DENABLE_KDEPIMLIBSSUPPORT=TRUE -DDIGIKAMSC_COMPILE_LIBKGEOMAP=TRUE -DDIGIKAMSC_COMPILE_LIBMEDIAWIKI=TRUE $EXTRA_FLAGS -%else -%cmake_kde4 -d build -- -DENABLE_MYSQLSUPPORT=TRUE -DENABLE_INTERNALMYSQL=FALSE -DENABLE_KDEPIMLIBSSUPPORT=TRUE -DDIGIKAMSC_COMPILE_LIBMEDIAWIKI=TRUE $EXTRA_FLAGS -%endif +%cmake_kde4 -d build -- -DENABLE_MYSQLSUPPORT=TRUE -DENABLE_INTERNALMYSQL=FALSE -DENABLE_KDEPIMLIBSSUPPORT=TRUE $EXTRA_FLAGS # there are files in there that are so heavy to the compiler, that one is enough %make_jobs VERBOSE=1 @@ -317,10 +215,6 @@ rm -fv %{buildroot}%{_kde4_libdir}/*.a %find_lang %{name} -%if 0%{?suse_version} <= 1320 && !0%{?is_opensuse} -%find_lang libkgeomap libkgeomap.lang -%endif - %if 0%{?kde_updatedapps} %find_lang libkipi libkipi.lang %else @@ -357,22 +251,6 @@ popd %postun -n kipi-plugins -p /sbin/ldconfig -%if 0%{?suse_version} <= 1320 && !0%{?is_opensuse} -%post -n libkgeomap2 -p /sbin/ldconfig - -%postun -n libkgeomap2 -p /sbin/ldconfig -%endif - -%if 0%{?suse_version} < 1320 && !0%{?is_opensuse} -%post -n libkface3 -p /sbin/ldconfig - -%postun -n libkface3 -p /sbin/ldconfig -%endif - -%post -n libmediawiki1 -p /sbin/ldconfig - -%postun -n libmediawiki1 -p /sbin/ldconfig - %files %defattr(-,root,root,-) %doc core/{AUTHORS,COPYING,COPYING-CMAKE-SCRIPTS,COPYING.LIB,ChangeLog,NEWS,README} @@ -469,50 +347,4 @@ popd %{_kde4_modulesdir}/kipiplugin_gpssync.so %{_kde4_servicesdir}/kipiplugin_gpssync.desktop -%if 0%{?suse_version} <= 1320 && !0%{?is_opensuse} -%files -n libkgeomap-devel -%defattr(-,root,root,-) -%doc extra/libkgeomap/{AUTHORS,COPYING,COPYING-CMAKE-SCRIPTS,COPYING.LIB,README,TODO} -%{_kde4_appsdir}/cmake/modules/FindKGeoMap.cmake -%{_kde4_includedir}/libkgeomap/ -%{_kde4_libdir}/pkgconfig/libkgeomap.pc -%{_kde4_libdir}/libkgeomap.so - -%files -n libkgeomap-lang -f libkgeomap.lang -%defattr(-,root,root,-) - -%files -n libkgeomap2 -%defattr(-,root,root,-) -%{_kde4_appsdir}/libkgeomap/ -%{_kde4_libdir}/libkgeomap.so.2* -%endif - -%if 0%{?suse_version} < 1320 && !0%{?is_opensuse} -%files -n libkface3 -%defattr(-,root,root,-) -%{_kde4_appsdir}/libkface -%{_kde4_libdir}/libkface.so.3* - -%files -n libkface-devel -%defattr(-,root,root,-) -%doc extra/libkface/{AUTHORS,COPYING,COPYING-CMAKE-SCRIPTS,COPYING.LIB,README,TODO} -%{_kde4_libdir}/libkface.so -%{_kde4_includedir}/libkface/ -%{_kde4_libdir}/pkgconfig/libkface.pc -%dir %{_kde4_libdir}/cmake/Kface-3.5.0/ -%{_kde4_libdir}/cmake/Kface-3.5.0/*.cmake -%endif - -%files -n libmediawiki1 -%defattr(-,root,root,-) -%{_kde4_libdir}/libmediawiki.so.1* - -%files -n libmediawiki-devel -%defattr(-,root,root,-) -%doc extra/libmediawiki/{AUTHORS,COPYING,COPYING-CMAKE-SCRIPTS,COPYING.LIB,README,TODO} -%{_kde4_includedir}/libmediawiki/ -%{_kde4_libdir}/libmediawiki.so -%{_kde4_libdir}/pkgconfig/libmediawiki.pc -%{_kde4_appsdir}/cmake/modules/FindMediawiki.cmake - %changelog