- Don't build systemd-doc with the mini flavor

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1428
This commit is contained in:
Franck Bui 2023-08-18 13:20:40 +00:00 committed by Git OBS Bridge
parent dcfd884160
commit 666f072db7
2 changed files with 19 additions and 18 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Aug 18 13:19:39 UTC 2023 - Franck Bui <fbui@suse.com>
- Don't build systemd-doc with the mini flavor
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Aug 18 06:24:11 UTC 2023 - Franck Bui <fbui@suse.com> Fri Aug 18 06:24:11 UTC 2023 - Franck Bui <fbui@suse.com>

View File

@ -226,19 +226,6 @@ maintains mount and automount points and implements an elaborate
transactional dependency-based service control logic. It can work as a transactional dependency-based service control logic. It can work as a
drop-in replacement for sysvinit. drop-in replacement for sysvinit.
%package doc
Summary: HTML documentation for systemd
License: LGPL-2.1-or-later
%if %{with bootstrap}
Conflicts: systemd-doc
Requires: this-is-only-for-build-envs
%else
Supplements: (systemd and patterns-base-documentation)
%endif
%description doc
The HTML documentation for systemd.
%package devel %package devel
Summary: Development files for libsystemd and libudev Summary: Development files for libsystemd and libudev
License: LGPL-2.1-or-later License: LGPL-2.1-or-later
@ -693,6 +680,14 @@ Have fun (at your own risk).
%if %{without bootstrap} %if %{without bootstrap}
%lang_package %lang_package
%package doc
Summary: HTML documentation for systemd
License: LGPL-2.1-or-later
Supplements: (systemd and patterns-base-documentation)
%description doc
The HTML documentation for systemd.
%endif %endif
%prep %prep
@ -1009,7 +1004,8 @@ tar -cO \
%if %{without bootstrap} %if %{without bootstrap}
%find_lang systemd %find_lang systemd
%else %else
rm -f %{buildroot}%{_journalcatalogdir}/* rm -f %{buildroot}%{_journalcatalogdir}/*
rm -fr %{buildroot}%{_docdir}/systemd
%endif %endif
# Don't drop %%pre section even if it becomes empty: the build process of # Don't drop %%pre section even if it becomes empty: the build process of
@ -1320,10 +1316,6 @@ fi
%include %{SOURCE203} %include %{SOURCE203}
%endif %endif
%files doc
%defattr(-,root,root,-)
%{_docdir}/systemd/
%files devel %files devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
%license LICENSE.LGPL2.1 %license LICENSE.LGPL2.1
@ -1356,6 +1348,10 @@ fi
%if %{without bootstrap} %if %{without bootstrap}
%files lang -f systemd.lang %files lang -f systemd.lang
%include %{SOURCE210} %include %{SOURCE210}
%files doc
%defattr(-,root,root,-)
%{_docdir}/systemd/
%endif %endif
%if %{with journal_remote} %if %{with journal_remote}