rpm/systemd
SHA256
1
0
Fork 0
forked from pool/systemd
Code Pull Requests Activity

Accepting request 956704 from home:favogt:branches:Base:System

Browse Source 
- Fix build if %_distconfdir is not defined (see bsc#1195679)

OBS-URL: https://build.opensuse.org/request/show/956704
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1253
This commit is contained in:
Franck Bui 2022-02-22 14:05:17 +00:00 committed by Git OBS Bridge
parent 351e69e6e3
commit bdc0d5a926
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
files.systemd
View File

@ -24,8 +24,8 @@
%dir %{_datadir}/zsh %dir %{_datadir}/zsh
%dir %{_datadir}/zsh/site-functions %dir %{_datadir}/zsh/site-functions
%endif %endif
%dir %{_distconfdir}/X11/xinit %dir %{xinitconfdir}
%dir %{_distconfdir}/X11/xinit/xinitrc.d %dir %{xinitconfdir}/xinitrc.d
%dir %{_environmentdir} %dir %{_environmentdir}
%dir %{_journalcatalogdir} %dir %{_journalcatalogdir}
%dir %{_localstatedir}/lib/systemd %dir %{_localstatedir}/lib/systemd
@ -205,7 +205,7 @@
%{_datadir}/zsh/site-functions/_systemd-tmpfiles %{_datadir}/zsh/site-functions/_systemd-tmpfiles
%{_datadir}/zsh/site-functions/_timedatectl %{_datadir}/zsh/site-functions/_timedatectl
%endif %endif
%{_distconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh %{xinitconfdir}/xinitrc.d/50-systemd-user.sh
%{_environmentdir}/99-environment.conf %{_environmentdir}/99-environment.conf
%{_journalcatalogdir}/systemd.be.catalog %{_journalcatalogdir}/systemd.be.catalog
%{_journalcatalogdir}/systemd.be@latin.catalog %{_journalcatalogdir}/systemd.be@latin.catalog

5
systemd.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Feb 21 09:56:26 UTC 2022 - Fabian Vogt <fvogt@suse.com>
- Fix build if %_distconfdir is not defined (see bsc#1195679)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Feb 17 18:30:12 UTC 2022 - Franck Bui <fbui@suse.com> Thu Feb 17 18:30:12 UTC 2022 - Franck Bui <fbui@suse.com>

3
systemd.spec
View File

@ -29,6 +29,7 @@
%define min_kernel_version 4.5 %define min_kernel_version 4.5
%define suse_version +suse.82.g117bd7f14a %define suse_version +suse.82.g117bd7f14a
%define _testsuitedir /usr/lib/systemd/tests %define _testsuitedir /usr/lib/systemd/tests
%define xinitconfdir %{?_distconfdir}%{!?_distconfdir:%{_sysconfdir}}/X11/xinit
# Similar to %%with but returns true/false. The 'true' value can be redefined # Similar to %%with but returns true/false. The 'true' value can be redefined
# when a second parameter is passed. # when a second parameter is passed.
@ -653,7 +654,7 @@ Have fun with these services at your own risk.
-Dldconfig=false \ -Dldconfig=false \
-Dpamconfdir=no \ -Dpamconfdir=no \
-Dpamlibdir=%{_pam_moduledir} \ -Dpamlibdir=%{_pam_moduledir} \
-Dxinitrcdir=%{_distconfdir}/X11/xinit/xinitrc.d \ -Dxinitrcdir=%{xinitconfdir}/xinitrc.d \
-Drpmmacrosdir=no \ -Drpmmacrosdir=no \
-Dcertificate-root=%{_sysconfdir}/pki/systemd \ -Dcertificate-root=%{_sysconfdir}/pki/systemd \
%if %{without sysvcompat} %if %{without sysvcompat}