From f7cc026a8ea6b3874b57b7a88fddf9e02311f9d75a810e99d13f63a1d374fe0c Mon Sep 17 00:00:00 2001 From: Atri Bhattacharya Date: Sun, 18 Feb 2024 20:55:44 +0000 Subject: [PATCH] Accepting request 1147458 from home:badshah400:branches:network Set doc dir consistently after recent cmake macro changes in Factory. OBS-URL: https://build.opensuse.org/request/show/1147458 OBS-URL: https://build.opensuse.org/package/show/network/nextcloud-desktop?expand=0&rev=126 --- nextcloud-desktop.changes | 6 ++++++ nextcloud-desktop.spec | 12 +++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/nextcloud-desktop.changes b/nextcloud-desktop.changes index fcaf04e..c7a001d 100644 --- a/nextcloud-desktop.changes +++ b/nextcloud-desktop.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Feb 18 17:41:51 UTC 2024 - Atri Bhattacharya + +- Set doc dir consistently after recent cmake macro changes in + Factory. + ------------------------------------------------------------------- Wed Feb 14 08:50:47 UTC 2024 - Atri Bhattacharya diff --git a/nextcloud-desktop.spec b/nextcloud-desktop.spec index abab621..db4da1d 100644 --- a/nextcloud-desktop.spec +++ b/nextcloud-desktop.spec @@ -206,18 +206,16 @@ cp -a %{SOURCE1} sysctl-sync-inotify.conf export SOURCE_DATE_EPOCH=`date -r VERSION.cmake +"%s"` %cmake \ %if 0%{?is_opensuse} - -DWITH_DOC=ON + -DWITH_DOC=ON \ + -DCMAKE_INSTALL_DOCDIR=%{_docdir}/%{name} \ %endif +%{nil} %cmake_build %install %cmake_install -%if 0%{?is_opensuse} -mkdir -p %{buildroot}%{_docdir}/%{name}-doc/ -mv -f %{buildroot}%{_datadir}/doc/client/nextcloud-client/html/ \ - %{buildroot}%{_docdir}/%{name}-doc/html/ -%else +%if 0%{!?is_opensuse} # There's no Caja and Nemo in SLE. rm -r %{buildroot}%{_datadir}/caja-python/ rm -r %{buildroot}%{_datadir}/nemo-python/ @@ -259,7 +257,7 @@ done %if 0%{?is_opensuse} %files doc -%doc %{_docdir}/%{name}-doc/ +%doc %{_docdir}/%{name}/ %endif %files -n %{soname}%{sover}