diff --git a/.gitignore b/.gitignore index f40fc96..834204b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ /digikam-4.14.0.tar.bz2 /libkvkontakte-4.12.0.tar.xz /libmediawiki-digikam-4.13.0.tar.xz -/digikam-5.0.0-beta5.tar.bz2 +/digikam-5.0.0-beta7.tar.xz diff --git a/digikam-5.0.0-beta7-doc.patch b/digikam-5.0.0-beta7-doc.patch new file mode 100644 index 0000000..d63d364 --- /dev/null +++ b/digikam-5.0.0-beta7-doc.patch @@ -0,0 +1,12 @@ +diff -up digikam-5.0.0-beta7/CMakeLists.txt.doc digikam-5.0.0-beta7/CMakeLists.txt +--- digikam-5.0.0-beta7/CMakeLists.txt.doc 2016-06-02 15:57:08.000000000 -0500 ++++ digikam-5.0.0-beta7/CMakeLists.txt 2016-06-26 06:39:47.788245752 -0500 +@@ -109,7 +109,7 @@ if(DIGIKAMSC_COMPILE_DOC AND NOT EXISTS + message(STATUS "You can use DIGIKAMSC_CHECKOUT_DOC option to extract doc i18n files from KDE repositories.") + endif() + +- set(DIGIKAMSC_COMPILE_DOC OFF) ++# set(DIGIKAMSC_COMPILE_DOC OFF) + + endif() + diff --git a/digikam.spec b/digikam.spec index 8531f6a..0920679 100644 --- a/digikam.spec +++ b/digikam.spec @@ -1,20 +1,22 @@ -%global beta beta5 +%global beta beta7 Name: digikam Summary: A digital camera accessing & photo management application Version: 5.0.0 -Release: 0.11.%{beta}%{?dist} +Release: 0.12.%{beta}%{?dist} License: GPLv2+ URL: http://www.digikam.org/ -Source0: http://download.kde.org/%{?beta:un}stable/digikam/digikam-%{version}%{?beta:-%{beta}}.tar.bz2 +Source0: http://download.kde.org/%{?beta:un}stable/digikam/digikam-%{version}%{?beta:-%{beta}}.tar.xz # digiKam not listed as a media handler for pictures in Nautilus (#516447) # TODO: upstream me Source10: digikam-import.desktop ## upstreamable patches +# fix non-translated doc generation +Patch100: digikam-5.0.0-beta7-doc.patch ## upstream patches @@ -167,6 +169,8 @@ BuildArch: noarch %prep %setup -q -n %{name}-%{version}%{?beta:-%{beta}} +%patch100 -p1 -b .doc + %build mkdir %{_target_platform} @@ -231,6 +235,7 @@ update-desktop-database -q &> /dev/null %{_kf5_datadir}/applications/showfoto.desktop %{_mandir}/man1/digitaglinktree.1* %{_mandir}/man1/cleanup_digikamdb.1* +%{_kf5_datadir}/icons/hicolor/*/actions/* %{_kf5_datadir}/icons/hicolor/*/apps/digikam* %{_kf5_datadir}/icons/hicolor/*/apps/showfoto* @@ -283,6 +288,9 @@ gtk-update-icon-cache %{_kf5_datadir}/icons/hicolor >& /dev/null ||: %changelog +* Sat Jun 25 2016 Rex Dieter - 5.0.0-0.12.beta7 +- digikam-5.0.0-beta7 + * Tue Apr 26 2016 Orion Poplawski - 5.0.0-0.11.beta5 - Rebuild for OpenCV 3.1 diff --git a/sources b/sources index d068944..67bf35a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7ecb33929acc31a2e7d9f52c09c2c2e4 digikam-5.0.0-beta5.tar.bz2 +707b98bcec72b2fa9ae49ec7f8b90134 digikam-5.0.0-beta7.tar.xz