From 0b9dfd31cfc15709b2c19593a7d843c90cb86cee Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mar 14 2017 22:18:47 +0000 Subject: digikam-5.5.0 (#1432042) --- diff --git a/.gitignore b/.gitignore index 209bccc..c52a88d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1 @@ -/digikam-5.4.0.tar.xz -/0042-Fix-compilation-with-clang.patch -/0044-Fix-compilation-with-new-KDECompilerSettings.cmake.patch +/digikam-5.5.0.tar.xz diff --git a/digikam-5.5.0-doc_translated.patch b/digikam-5.5.0-doc_translated.patch new file mode 100644 index 0000000..f91a3ea --- /dev/null +++ b/digikam-5.5.0-doc_translated.patch @@ -0,0 +1,24 @@ +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.spec b/digikam.spec index 8224722..20d22f7 100644 --- a/digikam.spec +++ b/digikam.spec @@ -1,8 +1,8 @@ Name: digikam Summary: A digital camera accessing & photo management application -Version: 5.4.0 -Release: 6%{?dist} +Version: 5.5.0 +Release: 1%{?dist} License: GPLv2+ URL: http://www.digikam.org/ @@ -13,10 +13,10 @@ Source0: http://download.kde.org/%{?beta:un}stable/digikam/digikam-%{version}%{? Source10: digikam-import.desktop ## upstream patches (lookaside cache) -Patch42: 0042-Fix-compilation-with-clang.patch -Patch44: 0044-Fix-compilation-with-new-KDECompilerSettings.cmake.patch ## upstreamable patches +# doc-translated FTBFS, https://bugs.kde.org/show_bug.cgi?id=377597 +Patch100: digikam-5.5.0-doc_translated.patch BuildRequires: boost-devel BuildRequires: eigen3-devel @@ -170,10 +170,7 @@ BuildArch: noarch %prep %setup -q -n %{name}-%{version}%{?beta:-%{beta}} -pushd core -%patch42 -p1 -b .0042 -%patch44 -p1 -b .0044 -popd +%patch100 -p1 -b .doc_translated %build @@ -260,18 +257,18 @@ update-desktop-database -q &> /dev/null %files doc %lang(en) %{_kf5_docdir}/HTML/en/digikam/ #lang(it) %{_kf5_docdir}/HTML/it/digikam/ -#lang(nl) %{_kf5_docdir}/HTML/nl/digikam/ +%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(uk) %{_kf5_docdir}/HTML/uk/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(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(uk) %{_kf5_docdir}/HTML/uk/showfoto/ +%lang(uk) %{_kf5_docdir}/HTML/uk/showfoto/ %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig @@ -318,6 +315,9 @@ gtk-update-icon-cache %{_kf5_datadir}/icons/hicolor >& /dev/null ||: %changelog +* Tue Mar 14 2017 Rex Dieter - 5.5.0-1 +- digikam-5.5.0 (#1432042) + * Tue Mar 14 2017 Rex Dieter - 5.4.0-6 - drop %%build debugging diff --git a/sources b/sources index 7c326e8..7f870b5 100644 --- a/sources +++ b/sources @@ -1,3 +1 @@ -SHA512 (digikam-5.4.0.tar.xz) = fbcdd160e614630c6518bf748c93b589ad529bf61da469826edf542478cb3589f4f6c6091c34f53214f038080c72b07e4d639fb5f355b382d7ee9d66129f0d50 -SHA512 (0042-Fix-compilation-with-clang.patch) = 8d7fc52aed53f2721d473da33ae5c1c66e777feaa30b808303e20506a6a4252afc29f61df9238b7416ed2756a696fe6c694b58407c7af09b5913c56f265ab07b -SHA512 (0044-Fix-compilation-with-new-KDECompilerSettings.cmake.patch) = 9afd1a8d6fdaeabd1879a7bf6ddd0df74e9b058db28aea952adeb6d198d929347428e2a9fd485eed5d1f63bba46d0a3f32d5f496e2cbd841c7d77e679f98750c +SHA512 (digikam-5.5.0.tar.xz) = 3c64774916d4804d932009ba3753d387ecf31e9e3d435c580497d3badb6cc3e57ab5ef1a2334a23379d0987d96dd107be4f01adbb63039f4510aa94ac6d71344