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
This commit is contained in:
Atri Bhattacharya 2024-02-18 20:55:44 +00:00 committed by Git OBS Bridge
parent 2a388912b2
commit f7cc026a8e
2 changed files with 11 additions and 7 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sun Feb 18 17:41:51 UTC 2024 - Atri Bhattacharya <badshah400@gmail.com>
- Set doc dir consistently after recent cmake macro changes in
Factory.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Feb 14 08:50:47 UTC 2024 - Atri Bhattacharya <badshah400@gmail.com> Wed Feb 14 08:50:47 UTC 2024 - Atri Bhattacharya <badshah400@gmail.com>

View File

@ -206,18 +206,16 @@ cp -a %{SOURCE1} sysctl-sync-inotify.conf
export SOURCE_DATE_EPOCH=`date -r VERSION.cmake +"%s"` export SOURCE_DATE_EPOCH=`date -r VERSION.cmake +"%s"`
%cmake \ %cmake \
%if 0%{?is_opensuse} %if 0%{?is_opensuse}
-DWITH_DOC=ON -DWITH_DOC=ON \
-DCMAKE_INSTALL_DOCDIR=%{_docdir}/%{name} \
%endif %endif
%{nil}
%cmake_build %cmake_build
%install %install
%cmake_install %cmake_install
%if 0%{?is_opensuse} %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
# There's no Caja and Nemo in SLE. # There's no Caja and Nemo in SLE.
rm -r %{buildroot}%{_datadir}/caja-python/ rm -r %{buildroot}%{_datadir}/caja-python/
rm -r %{buildroot}%{_datadir}/nemo-python/ rm -r %{buildroot}%{_datadir}/nemo-python/
@ -259,7 +257,7 @@ done
%if 0%{?is_opensuse} %if 0%{?is_opensuse}
%files doc %files doc
%doc %{_docdir}/%{name}-doc/ %doc %{_docdir}/%{name}/
%endif %endif
%files -n %{soname}%{sover} %files -n %{soname}%{sover}