From 354892a4422810f8d32280b8f05fb92f39b1537a959ee1093816a9bc02cf59d2 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Tue, 23 May 2017 18:24:26 +0000 Subject: [PATCH] Accepting request 497778 from home:wolfi323:branches:KDE:Applications - Only use the %kf5_find_htmldocs macro on Leap 42.3 and higher, this should fix the build for 42.2 on Packman OBS-URL: https://build.opensuse.org/request/show/497778 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/k3b?expand=0&rev=20 --- k3b.changes | 6 ++++++ k3b.spec | 15 +++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/k3b.changes b/k3b.changes index d39a852..dd13106 100644 --- a/k3b.changes +++ b/k3b.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue May 23 13:18:27 UTC 2017 - wbauer@tmo.at + +- Only use the %kf5_find_htmldocs macro on Leap 42.3 and higher, + this should fix the build for 42.2 on Packman + ------------------------------------------------------------------- Wed May 17 20:35:45 CEST 2017 - lbeltrame@kde.org diff --git a/k3b.spec b/k3b.spec index dea4b49..a358ef0 100644 --- a/k3b.spec +++ b/k3b.spec @@ -126,7 +126,22 @@ CXXFLAGS="%{optflags} -fno-strict-aliasing" %kf5_makeinstall -C build %if %{with lang} %find_lang %{name} --with-man --all-name + %if 0%{?suse_version} > 1320 || 0%{?sle_version} >= 120300 %kf5_find_htmldocs + %else + # %%kf5_find_htmldocs is only defined since Leap 42.3 + CURDIR=`pwd` + pushd %{buildroot}%{_kf5_htmldir} + for i in *; do + if ! [ -d "/usr/share/locale/${i}" ]; then + echo "Removing unsupported translation %{_kf5_htmldir}/${i}" + rm -rf "$i" + elif [ "$i" != "en" ]; then + echo "%doc %lang($i) %{_kf5_htmldir}/${i}" >> $CURDIR/%{name}.lang + fi + done + popd + %endif %endif %suse_update_desktop_file -r org.kde.k3b Qt KDE AudioVideo DiscBurning