From c0e0978b822d69443c12c9c5dd76667f5ec520b1 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Jun 21 2017 13:39:34 +0000 Subject: 5.6.0 --- diff --git a/.gitignore b/.gitignore index c52a88d..e24dacb 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/digikam-5.5.0.tar.xz +/digikam-5.6.0.tar.xz diff --git a/digikam-5.5.0-doc_translated.patch b/digikam-5.5.0-doc_translated.patch deleted file mode 100644 index f91a3ea..0000000 --- a/digikam-5.5.0-doc_translated.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up digikam-5.5.0/doc-translated/CMakeLists.txt.doc-translated digikam-5.5.0/doc-translated/CMakeLists.txt ---- digikam-5.5.0/doc-translated/CMakeLists.txt.doc-translated 2017-03-12 17:40:45.000000000 -0500 -+++ digikam-5.5.0/doc-translated/CMakeLists.txt 2017-03-14 08:17:03.122207449 -0500 -@@ -1,3 +1,3 @@ - add_subdirectory( nl ) --add_subdirectory( sv ) -+#add_subdirectory( sv ) - add_subdirectory( uk ) -diff -up digikam-5.5.0/doc-translated/nl/CMakeLists.txt.doc-translated digikam-5.5.0/doc-translated/nl/CMakeLists.txt ---- digikam-5.5.0/doc-translated/nl/CMakeLists.txt.doc-translated 2017-03-12 17:40:45.000000000 -0500 -+++ digikam-5.5.0/doc-translated/nl/CMakeLists.txt 2017-03-14 08:52:20.703307391 -0500 -@@ -1,2 +1,2 @@ - KDOCTOOLS_CREATE_HANDBOOK( digikam/index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/nl/ SUBDIR digikam ) --KDOCTOOLS_CREATE_HANDBOOK( showfoto/index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/nl/ SUBDIR digikam ) -\ No newline at end of file -+KDOCTOOLS_CREATE_HANDBOOK( showfoto/index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/nl/ SUBDIR showfoto ) -diff -up digikam-5.5.0/doc-translated/uk/CMakeLists.txt.doc-translated digikam-5.5.0/doc-translated/uk/CMakeLists.txt ---- digikam-5.5.0/doc-translated/uk/CMakeLists.txt.doc-translated 2017-03-12 17:40:45.000000000 -0500 -+++ digikam-5.5.0/doc-translated/uk/CMakeLists.txt 2017-03-14 08:52:39.118438900 -0500 -@@ -1,2 +1,2 @@ - KDOCTOOLS_CREATE_HANDBOOK( digikam/index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/uk/ SUBDIR digikam ) --KDOCTOOLS_CREATE_HANDBOOK( showfoto/index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/uk/ SUBDIR digikam ) -\ No newline at end of file -+KDOCTOOLS_CREATE_HANDBOOK( showfoto/index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/uk/ SUBDIR showfoto ) diff --git a/digikam-5.6.0-doc_translated.patch b/digikam-5.6.0-doc_translated.patch new file mode 100644 index 0000000..d0eafd5 --- /dev/null +++ b/digikam-5.6.0-doc_translated.patch @@ -0,0 +1,25 @@ +diff -up digikam-5.6.0/doc-translated/CMakeLists.txt.doc_translated digikam-5.6.0/doc-translated/CMakeLists.txt +--- digikam-5.6.0/doc-translated/CMakeLists.txt.doc_translated 2017-06-13 02:48:31.000000000 -0500 ++++ digikam-5.6.0/doc-translated/CMakeLists.txt 2017-06-21 07:41:59.432508228 -0500 +@@ -1,3 +1,3 @@ + add_subdirectory( nl ) +-add_subdirectory( sv ) ++#add_subdirectory( sv ) + add_subdirectory( uk ) +diff -up digikam-5.6.0/doc-translated/nl/CMakeLists.txt.doc_translated digikam-5.6.0/doc-translated/nl/CMakeLists.txt +--- digikam-5.6.0/doc-translated/nl/CMakeLists.txt.doc_translated 2017-06-13 02:48:31.000000000 -0500 ++++ digikam-5.6.0/doc-translated/nl/CMakeLists.txt 2017-06-21 07:41:59.432508228 -0500 +@@ -1,2 +1,2 @@ + KDOCTOOLS_CREATE_HANDBOOK( digikam/index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/nl/ SUBDIR digikam ) +-KDOCTOOLS_CREATE_HANDBOOK( showfoto/index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/nl/ SUBDIR digikam ) +\ No newline at end of file ++KDOCTOOLS_CREATE_HANDBOOK( showfoto/index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/nl/ SUBDIR showfoto ) +diff -up digikam-5.6.0/doc-translated/sv/CMakeLists.txt.doc_translated digikam-5.6.0/doc-translated/sv/CMakeLists.txt +diff -up digikam-5.6.0/doc-translated/uk/CMakeLists.txt.doc_translated digikam-5.6.0/doc-translated/uk/CMakeLists.txt +--- digikam-5.6.0/doc-translated/uk/CMakeLists.txt.doc_translated 2017-06-13 02:48:31.000000000 -0500 ++++ digikam-5.6.0/doc-translated/uk/CMakeLists.txt 2017-06-21 07:41:59.432508228 -0500 +@@ -1,2 +1,2 @@ + KDOCTOOLS_CREATE_HANDBOOK( digikam/index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/uk/ SUBDIR digikam ) +-KDOCTOOLS_CREATE_HANDBOOK( showfoto/index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/uk/ SUBDIR digikam ) +\ No newline at end of file ++KDOCTOOLS_CREATE_HANDBOOK( showfoto/index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/uk/ SUBDIR showfoto ) diff --git a/digikam.spec b/digikam.spec index 7c54172..5e66593 100644 --- a/digikam.spec +++ b/digikam.spec @@ -1,8 +1,8 @@ Name: digikam Summary: A digital camera accessing & photo management application -Version: 5.5.0 -Release: 4%{?dist} +Version: 5.6.0 +Release: 1%{?dist} License: GPLv2+ URL: http://www.digikam.org/ @@ -16,7 +16,7 @@ Source10: digikam-import.desktop ## upstreamable patches # doc-translated FTBFS, https://bugs.kde.org/show_bug.cgi?id=377597 -Patch100: digikam-5.5.0-doc_translated.patch +Patch100: digikam-5.6.0-doc_translated.patch BuildRequires: boost-devel BuildRequires: eigen3-devel @@ -36,7 +36,8 @@ BuildRequires: pkgconfig(lcms2) BuildRequires: pkgconfig(libgphoto2_port) pkgconfig(libusb-1.0) pkgconfig(libusb) BuildRequires: pkgconfig(libpng) >= 1.2.7 BuildRequires: pkgconfig(phonon4qt5) -BuildRequires: pkgconfig(Qt5Multimedia) >= 5.6 +## uses QtAv now (not available in fedora) +#BuildRequires: pkgconfig(Qt5Multimedia) >= 5.6 BuildRequires: pkgconfig(Qt5OpenGL) BuildRequires: pkgconfig(Qt5Svg) BuildRequires: pkgconfig(Qt5WebKit) @@ -119,7 +120,11 @@ to use them. %package libs Summary: Runtime libraries for %{name} +%if 0%{?fedora} > 21 +Recommends: %{name} = %{version}-%{release} +%else Requires: %{name} = %{version}-%{release} +%endif %description libs %{summary}. @@ -260,14 +265,14 @@ update-desktop-database -q &> /dev/null %lang(nl) %{_kf5_docdir}/HTML/nl/digikam/ #lang(pt) %{_kf5_docdir}/HTML/pt/digikam/ #lang(pt_BR) %{_kf5_docdir}/HTML/pt_BR/digikam/ -#lang(sv) %{_kf5_docdir}/HTML/sv/digikam/ +%lang(sv) %{_kf5_docdir}/HTML/sv/digikam/ %lang(uk) %{_kf5_docdir}/HTML/uk/digikam/ %lang(en) %{_kf5_docdir}/HTML/en/showfoto/ #lang(it) %{_kf5_docdir}/HTML/it/showfoto/ %lang(nl) %{_kf5_docdir}/HTML/nl/showfoto/ #lang(pt) %{_kf5_docdir}/HTML/pt/showfoto/ #lang(pt_BR) %{_kf5_docdir}/HTML/pt_BR/showfoto/ -#lang(sv) %{_kf5_docdir}/HTML/sv/showfoto/ +%lang(sv) %{_kf5_docdir}/HTML/sv/showfoto/ %lang(uk) %{_kf5_docdir}/HTML/uk/showfoto/ %post libs -p /sbin/ldconfig @@ -277,7 +282,6 @@ update-desktop-database -q &> /dev/null %{_kf5_libdir}/libdigikamcore.so* %{_kf5_libdir}/libdigikamdatabase.so* %{_kf5_libdir}/libdigikamgui.so* -#{_kf5_qtplugindir}/digikamimageplugin_*.so %post -n kf5-kipi-plugins touch --no-create %{_kf5_datadir}/icons/hicolor &> /dev/null ||: @@ -315,6 +319,9 @@ gtk-update-icon-cache %{_kf5_datadir}/icons/hicolor >& /dev/null ||: %changelog +* Wed Jun 21 2017 Rex Dieter - 5.6.0-1 +- 5.6.0 + * Mon May 15 2017 Fedora Release Engineering - 5.5.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild diff --git a/sources b/sources index 7f870b5..52d1664 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (digikam-5.5.0.tar.xz) = 3c64774916d4804d932009ba3753d387ecf31e9e3d435c580497d3badb6cc3e57ab5ef1a2334a23379d0987d96dd107be4f01adbb63039f4510aa94ac6d71344 +SHA512 (digikam-5.6.0.tar.xz) = 015024aaff6193ca29072f7340d62982b50467d84b69bac38f60319eaf771ce2a570a514e62fefc54f194b0c27df0c36980b1eed3433023a2d8290f24cc8905d