Dominique Leuenberger 2025-01-24 12:39:40 +00:00 committed by Git OBS Bridge
commit d2055a82f3
2 changed files with 11 additions and 3 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Jan 20 18:12:46 UTC 2025 - Stanislav Brabec <sbrabec@suse.com>
- Move blkid.conf to /usr/etc (boo#1235887).
-------------------------------------------------------------------
Tue Jan 14 22:29:47 UTC 2025 - Stanislav Brabec <sbrabec@suse.com>

View File

@ -614,7 +614,8 @@ fi
%if "%ulbuild" == "base"
%make_install
mkdir -p %{buildroot}{%{_distconfdir}/default,%{_pam_vendordir},%{_sysconfdir}/issue.d}
install -m 644 %{SOURCE51} %{buildroot}%{_sysconfdir}/blkid.conf
install -m 644 %{SOURCE51} %{buildroot}%{_distconfdir}/blkid.conf
touch %{buildroot}%{_sysconfdir}/blkid.conf
install -m 644 %{SOURCE8} %{buildroot}%{_pam_vendordir}/login
install -m 644 %{SOURCE9} %{buildroot}%{_pam_vendordir}/remote
%if 0%{?suse_version} <= 1500
@ -1366,7 +1367,8 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
%license README.licensing
%license COPYING
%license Documentation/licenses/*
%config(noreplace) %{_sysconfdir}/blkid.conf
%ghost %config %{_sysconfdir}/blkid.conf
%{_distconfdir}/blkid.conf
%{_datadir}/bash-completion/completions/*
%exclude %{_datadir}/bash-completion/completions/findmnt
@ -1392,7 +1394,8 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
# Systemd files #
#################
%if "%ulsubset" == "systemd"
%exclude %config(noreplace) %{_sysconfdir}/blkid.conf
%exclude %{_distconfdir}/blkid.conf
%exclude %{_sysconfdir}/blkid.conf
%exclude %config %dir %{_sysconfdir}/issue.d