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}