spec: fix OpenScanHub builds
Related: RHEL-40924
This commit is contained in:
parent
9c62b00c87
commit
dede8c40d4
10
systemd.spec
10
systemd.spec
@ -48,7 +48,7 @@ Url: https://systemd.io
|
||||
# Allow users to specify the version and release when building the rpm by
|
||||
# setting the %%version_override and %%release_override macros.
|
||||
Version: %{?version_override}%{!?version_override:256}
|
||||
Release: 10%{?dist}
|
||||
Release: 11%{?dist}
|
||||
|
||||
%global stable %(c="%version"; [ "$c" = "${c#*.*}" ]; echo $?)
|
||||
|
||||
@ -896,11 +896,12 @@ rm %{buildroot}/usr/lib/sysusers.d/basic.conf
|
||||
%endif
|
||||
|
||||
# We don't want to ship systemd-ssh-generator and it is not possible to disable it via meson_options.txt
|
||||
# OpenScanHub doesn't build man pages, so let's not fail when they are not present
|
||||
rm %{buildroot}%{_prefix}/lib/systemd/system-generators/systemd-ssh-generator
|
||||
rm %{buildroot}%{_prefix}/lib/systemd/system/ssh-access.target
|
||||
rm %{buildroot}%{_prefix}/lib/systemd/systemd-ssh-proxy
|
||||
rm %{buildroot}%{_mandir}/man1/systemd-ssh-proxy.1
|
||||
rm %{buildroot}%{_mandir}/man8/systemd-ssh-generator.8
|
||||
rm %{buildroot}%{_mandir}/man1/systemd-ssh-proxy.1 || :
|
||||
rm %{buildroot}%{_mandir}/man8/systemd-ssh-generator.8 || :
|
||||
|
||||
%find_lang %{name}
|
||||
|
||||
@ -1106,6 +1107,9 @@ rm -f .file-list-*
|
||||
rm -f %{name}.lang
|
||||
|
||||
%changelog
|
||||
* Tue Jul 30 2024 systemd maintenance team <systemd-maint@redhat.com> - 256-11
|
||||
- fix OpenScanHub builds (RHEL-40924)
|
||||
|
||||
* Mon Jul 29 2024 systemd maintenance team <systemd-maint@redhat.com> - 256-10
|
||||
- fix updgrade from versions before removal of systemd-ssh-generator - follow-up (RHEL-50131)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user