Accepting request 866824 from home:lnussel:usrmove
- s/--enable-vendordir/--with-vendordir/ - remove pam_securetty line again. As long as there is no agreement from pam side having it would fail openQA (boo#1033626) OBS-URL: https://build.opensuse.org/request/show/866824 OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=439
This commit is contained in:
Git OBS Bridge
parent
cddb9b57ff
commit
76cdbe85e3
@ -1,6 +1,5 @@
|
||||
#%PAM-1.0
|
||||
auth requisite pam_nologin.so
|
||||
auth [user_unknown=ignore success=ok ignore=ignore auth_err=die default=bad] pam_securetty.so
|
||||
auth include common-auth
|
||||
account include common-account
|
||||
password include common-password
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 25 17:07:55 UTC 2021 - Ludwig Nussel <lnussel@suse.de>
|
||||
|
||||
- s/--enable-vendordir/--with-vendordir/
|
||||
- remove pam_securetty line again. As long as there is no agreement
|
||||
from pam side having it would fail openQA (boo#1033626)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Jan 16 02:30:02 UTC 2021 - Stanislav Brabec <sbrabec@suse.com>
|
||||
|
||||
@ -39,6 +46,11 @@ Thu Nov 26 20:15:46 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
|
||||
- Do search /usr/sbin for mount helpers. (This drops /sbin/fs,
|
||||
/sbin/fs.d, which we do not use in openSUSE.)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Nov 20 15:06:37 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
|
||||
|
||||
- prepare usrmerge (boo#1029961)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Nov 4 11:07:03 UTC 2020 - Dr. Werner Fink <werner@suse.de>
|
||||
|
||||
|
||||
@ -79,7 +79,7 @@ Name: python3-libmount
|
||||
%endif
|
||||
Summary: %main_summary
|
||||
License: GPL-2.0-or-later
|
||||
Group: %main_group
|
||||
Group: %group_pl
|
||||
BuildRequires: audit-devel
|
||||
BuildRequires: binutils-devel
|
||||
BuildRequires: fdupes
|
||||
@ -573,7 +573,7 @@ AUTOPOINT=true autoreconf -vfi
|
||||
%else
|
||||
--without-python \
|
||||
%endif
|
||||
--enable-vendordir=%{_distconfdir}
|
||||
--with-vendordir=%{_distconfdir}
|
||||
|
||||
#
|
||||
# Safety check: HAVE_UUIDD should be always 1:
|
||||
@ -636,7 +636,7 @@ install -m 644 runuser.default %{buildroot}%{_distconfdir}/default/runuser
|
||||
%make_install
|
||||
rm -f %{buildroot}%{python3_sitearch}/libmount/*.*a
|
||||
%if %build_util_linux
|
||||
#UsrMerge
|
||||
%if !0%{?usrmerged}
|
||||
ln -s %{_bindir}/kill %{buildroot}/bin
|
||||
ln -s %{_bindir}/su %{buildroot}/bin
|
||||
ln -s %{_bindir}/dmesg %{buildroot}/bin
|
||||
@ -674,7 +674,7 @@ ln -s %{_sbindir}/fsfreeze %{buildroot}/sbin
|
||||
ln -s %{_sbindir}/swaplabel %{buildroot}/sbin
|
||||
ln -s %{_sbindir}/fstrim %{buildroot}/sbin
|
||||
ln -s %{_sbindir}/chcpu %{buildroot}/sbin
|
||||
#EndUsrMerge
|
||||
%endif
|
||||
install -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/filesystems
|
||||
echo -e "#!/bin/sh\n/sbin/blockdev --flushbufs \$1" > %{buildroot}%{_sbindir}/flushb
|
||||
chmod 755 %{buildroot}%{_sbindir}/flushb
|
||||
@ -687,16 +687,18 @@ ln -sf service %{buildroot}%{_sbindir}/rcraw
|
||||
mv %{buildroot}%{_docdir}/%{_name}/getopt %{buildroot}%{_datadir}/
|
||||
# Stupid hack so we don't have a tcsh dependency
|
||||
chmod 644 %{buildroot}%{_datadir}/getopt/getopt*.tcsh
|
||||
%if !0%{?usrmerged}
|
||||
# login is always and only in /bin
|
||||
mv %{buildroot}%{_bindir}/login %{buildroot}/bin/
|
||||
%endif
|
||||
# arch dependent
|
||||
%ifarch s390 s390x
|
||||
rm -f %{buildroot}%{_sysconfdir}/fdprm
|
||||
rm -f %{buildroot}%{_sbindir}/fdformat
|
||||
rm -f %{buildroot}%{_sbindir}/hwclock
|
||||
#UsrMerge
|
||||
%if !0%{?usrmerged}
|
||||
rm -f %{buildroot}/sbin/hwclock
|
||||
#EndUsrMerge
|
||||
%endif
|
||||
rm -f %{buildroot}%{_bindir}/setterm
|
||||
rm -f %{buildroot}%{_sbindir}/tunelp
|
||||
rm -f %{buildroot}%{_mandir}/man8/fdformat.8*
|
||||
@ -707,19 +709,17 @@ rm -f %{buildroot}%{_mandir}/man8/tunelp.8*
|
||||
rm -f %{buildroot}%{_mandir}/man8/cfdisk.8*
|
||||
rm -f %{buildroot}%{_mandir}/man8/sfdisk.8*
|
||||
rm -f %{buildroot}%{_sbindir}/cfdisk
|
||||
#UsrMerge
|
||||
rm -f %{buildroot}/sbin/cfdisk
|
||||
#EndUsrMerge
|
||||
rm -f %{buildroot}%{_sbindir}/sfdisk
|
||||
#UsrMerge
|
||||
%if !0%{?usrmerged}
|
||||
rm -f %{buildroot}/sbin/cfdisk
|
||||
rm -f %{buildroot}/sbin/sfdisk
|
||||
#EndUsrMerge
|
||||
%endif
|
||||
%endif
|
||||
%ifarch ia64 m68k
|
||||
rm -f %{buildroot}%{_sbindir}/fdisk
|
||||
#UsrMerge
|
||||
%if !0%{?usrmerged}
|
||||
rm -f %{buildroot}/sbin/fdisk
|
||||
#EndUsrMerge
|
||||
%endif
|
||||
rm -f %{buildroot}%{_mandir}/man8/fdisk.8*
|
||||
%endif
|
||||
%find_lang %{name} %{name}.lang
|
||||
@ -738,7 +738,9 @@ mkdir -p %{buildroot}/bin
|
||||
mkdir -p %{buildroot}%{_sbindir}
|
||||
mkdir -p %{buildroot}%{_localstatedir}/lib/libuuid
|
||||
mkdir -p %{buildroot}/run/uuidd
|
||||
%if !0%{?usrmerged}
|
||||
ln -s %{_bindir}/logger %{buildroot}/bin
|
||||
%endif
|
||||
# clock.txt from uuidd is a ghost file
|
||||
touch %{buildroot}%{_localstatedir}/lib/libuuid/clock.txt
|
||||
ln -sf /sbin/service %{buildroot}/usr/sbin/rcuuidd
|
||||
@ -917,7 +919,7 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
|
||||
%config(noreplace) %{_sysconfdir}/default/su
|
||||
%endif
|
||||
%config %dir %{_sysconfdir}/issue.d
|
||||
#UsrMerge
|
||||
%if !0%{?usrmerged}
|
||||
/bin/kill
|
||||
/bin/su
|
||||
/bin/dmesg
|
||||
@ -952,7 +954,7 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
|
||||
/sbin/swaplabel
|
||||
/sbin/fstrim
|
||||
/sbin/chcpu
|
||||
#EndUsrMerge
|
||||
%endif
|
||||
%{_bindir}/kill
|
||||
%verify(not mode) %{_bindir}/su
|
||||
%{_bindir}/eject
|
||||
@ -984,6 +986,9 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
|
||||
%endif
|
||||
%{_bindir}/line
|
||||
%{_bindir}/look
|
||||
%if 0%{?usrmerged}
|
||||
%{_bindir}/login
|
||||
%endif
|
||||
%{_bindir}/lsblk
|
||||
%{_bindir}/lscpu
|
||||
%{_bindir}/lsipc
|
||||
@ -1191,27 +1196,27 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
|
||||
%ifnarch ia64 m68k
|
||||
#XXX: post our patches upstream
|
||||
#XXX: call fdupes on /usr/share/man
|
||||
#UsrMerge
|
||||
%if !0%{?usrmerged}
|
||||
/sbin/fdisk
|
||||
#EndUsrMerge
|
||||
%endif
|
||||
%{_sbindir}/fdisk
|
||||
%{_mandir}/man8/fdisk.8.gz
|
||||
%endif
|
||||
%ifnarch %sparc ia64 m68k
|
||||
%{_mandir}/man8/cfdisk.8.gz
|
||||
%{_mandir}/man8/sfdisk.8.gz
|
||||
#UsrMerge
|
||||
%if !0%{?usrmerged}
|
||||
/sbin/cfdisk
|
||||
/sbin/sfdisk
|
||||
#EndUsrMerge
|
||||
%endif
|
||||
%{_sbindir}/cfdisk
|
||||
%{_sbindir}/sfdisk
|
||||
%endif
|
||||
%ifnarch s390 s390x
|
||||
%{_sbindir}/fdformat
|
||||
#UsrMerge
|
||||
%if !0%{?usrmerged}
|
||||
/sbin/hwclock
|
||||
#EndUsrMerge
|
||||
%endif
|
||||
%{_sbindir}/hwclock
|
||||
%{_bindir}/setterm
|
||||
%{_sbindir}/tunelp
|
||||
@ -1310,7 +1315,9 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
|
||||
%files
|
||||
%endif
|
||||
%defattr(-, root, root)
|
||||
%if !0%{?usrmerged}
|
||||
/bin/logger
|
||||
%endif
|
||||
%{_bindir}/logger
|
||||
%{_bindir}/lslogins
|
||||
#BEGIN bootstrap_hack
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 25 17:07:55 UTC 2021 - Ludwig Nussel <lnussel@suse.de>
|
||||
|
||||
- s/--enable-vendordir/--with-vendordir/
|
||||
- remove pam_securetty line again. As long as there is no agreement
|
||||
from pam side having it would fail openQA (boo#1033626)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Jan 16 02:30:02 UTC 2021 - Stanislav Brabec <sbrabec@suse.com>
|
||||
|
||||
@ -39,6 +46,11 @@ Thu Nov 26 20:15:46 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
|
||||
- Do search /usr/sbin for mount helpers. (This drops /sbin/fs,
|
||||
/sbin/fs.d, which we do not use in openSUSE.)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Nov 20 15:06:37 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
|
||||
|
||||
- prepare usrmerge (boo#1029961)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Nov 4 11:07:03 UTC 2020 - Dr. Werner Fink <werner@suse.de>
|
||||
|
||||
|
||||
@ -573,7 +573,7 @@ AUTOPOINT=true autoreconf -vfi
|
||||
%else
|
||||
--without-python \
|
||||
%endif
|
||||
--enable-vendordir=%{_distconfdir}
|
||||
--with-vendordir=%{_distconfdir}
|
||||
|
||||
#
|
||||
# Safety check: HAVE_UUIDD should be always 1:
|
||||
@ -636,7 +636,7 @@ install -m 644 runuser.default %{buildroot}%{_distconfdir}/default/runuser
|
||||
%make_install
|
||||
rm -f %{buildroot}%{python3_sitearch}/libmount/*.*a
|
||||
%if %build_util_linux
|
||||
#UsrMerge
|
||||
%if !0%{?usrmerged}
|
||||
ln -s %{_bindir}/kill %{buildroot}/bin
|
||||
ln -s %{_bindir}/su %{buildroot}/bin
|
||||
ln -s %{_bindir}/dmesg %{buildroot}/bin
|
||||
@ -674,7 +674,7 @@ ln -s %{_sbindir}/fsfreeze %{buildroot}/sbin
|
||||
ln -s %{_sbindir}/swaplabel %{buildroot}/sbin
|
||||
ln -s %{_sbindir}/fstrim %{buildroot}/sbin
|
||||
ln -s %{_sbindir}/chcpu %{buildroot}/sbin
|
||||
#EndUsrMerge
|
||||
%endif
|
||||
install -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/filesystems
|
||||
echo -e "#!/bin/sh\n/sbin/blockdev --flushbufs \$1" > %{buildroot}%{_sbindir}/flushb
|
||||
chmod 755 %{buildroot}%{_sbindir}/flushb
|
||||
@ -687,16 +687,18 @@ ln -sf service %{buildroot}%{_sbindir}/rcraw
|
||||
mv %{buildroot}%{_docdir}/%{_name}/getopt %{buildroot}%{_datadir}/
|
||||
# Stupid hack so we don't have a tcsh dependency
|
||||
chmod 644 %{buildroot}%{_datadir}/getopt/getopt*.tcsh
|
||||
%if !0%{?usrmerged}
|
||||
# login is always and only in /bin
|
||||
mv %{buildroot}%{_bindir}/login %{buildroot}/bin/
|
||||
%endif
|
||||
# arch dependent
|
||||
%ifarch s390 s390x
|
||||
rm -f %{buildroot}%{_sysconfdir}/fdprm
|
||||
rm -f %{buildroot}%{_sbindir}/fdformat
|
||||
rm -f %{buildroot}%{_sbindir}/hwclock
|
||||
#UsrMerge
|
||||
%if !0%{?usrmerged}
|
||||
rm -f %{buildroot}/sbin/hwclock
|
||||
#EndUsrMerge
|
||||
%endif
|
||||
rm -f %{buildroot}%{_bindir}/setterm
|
||||
rm -f %{buildroot}%{_sbindir}/tunelp
|
||||
rm -f %{buildroot}%{_mandir}/man8/fdformat.8*
|
||||
@ -707,19 +709,17 @@ rm -f %{buildroot}%{_mandir}/man8/tunelp.8*
|
||||
rm -f %{buildroot}%{_mandir}/man8/cfdisk.8*
|
||||
rm -f %{buildroot}%{_mandir}/man8/sfdisk.8*
|
||||
rm -f %{buildroot}%{_sbindir}/cfdisk
|
||||
#UsrMerge
|
||||
rm -f %{buildroot}/sbin/cfdisk
|
||||
#EndUsrMerge
|
||||
rm -f %{buildroot}%{_sbindir}/sfdisk
|
||||
#UsrMerge
|
||||
%if !0%{?usrmerged}
|
||||
rm -f %{buildroot}/sbin/cfdisk
|
||||
rm -f %{buildroot}/sbin/sfdisk
|
||||
#EndUsrMerge
|
||||
%endif
|
||||
%endif
|
||||
%ifarch ia64 m68k
|
||||
rm -f %{buildroot}%{_sbindir}/fdisk
|
||||
#UsrMerge
|
||||
%if !0%{?usrmerged}
|
||||
rm -f %{buildroot}/sbin/fdisk
|
||||
#EndUsrMerge
|
||||
%endif
|
||||
rm -f %{buildroot}%{_mandir}/man8/fdisk.8*
|
||||
%endif
|
||||
%find_lang %{name} %{name}.lang
|
||||
@ -738,7 +738,9 @@ mkdir -p %{buildroot}/bin
|
||||
mkdir -p %{buildroot}%{_sbindir}
|
||||
mkdir -p %{buildroot}%{_localstatedir}/lib/libuuid
|
||||
mkdir -p %{buildroot}/run/uuidd
|
||||
%if !0%{?usrmerged}
|
||||
ln -s %{_bindir}/logger %{buildroot}/bin
|
||||
%endif
|
||||
# clock.txt from uuidd is a ghost file
|
||||
touch %{buildroot}%{_localstatedir}/lib/libuuid/clock.txt
|
||||
ln -sf /sbin/service %{buildroot}/usr/sbin/rcuuidd
|
||||
@ -917,7 +919,7 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
|
||||
%config(noreplace) %{_sysconfdir}/default/su
|
||||
%endif
|
||||
%config %dir %{_sysconfdir}/issue.d
|
||||
#UsrMerge
|
||||
%if !0%{?usrmerged}
|
||||
/bin/kill
|
||||
/bin/su
|
||||
/bin/dmesg
|
||||
@ -952,7 +954,7 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
|
||||
/sbin/swaplabel
|
||||
/sbin/fstrim
|
||||
/sbin/chcpu
|
||||
#EndUsrMerge
|
||||
%endif
|
||||
%{_bindir}/kill
|
||||
%verify(not mode) %{_bindir}/su
|
||||
%{_bindir}/eject
|
||||
@ -984,6 +986,9 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
|
||||
%endif
|
||||
%{_bindir}/line
|
||||
%{_bindir}/look
|
||||
%if 0%{?usrmerged}
|
||||
%{_bindir}/login
|
||||
%endif
|
||||
%{_bindir}/lsblk
|
||||
%{_bindir}/lscpu
|
||||
%{_bindir}/lsipc
|
||||
@ -1191,27 +1196,27 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
|
||||
%ifnarch ia64 m68k
|
||||
#XXX: post our patches upstream
|
||||
#XXX: call fdupes on /usr/share/man
|
||||
#UsrMerge
|
||||
%if !0%{?usrmerged}
|
||||
/sbin/fdisk
|
||||
#EndUsrMerge
|
||||
%endif
|
||||
%{_sbindir}/fdisk
|
||||
%{_mandir}/man8/fdisk.8.gz
|
||||
%endif
|
||||
%ifnarch %sparc ia64 m68k
|
||||
%{_mandir}/man8/cfdisk.8.gz
|
||||
%{_mandir}/man8/sfdisk.8.gz
|
||||
#UsrMerge
|
||||
%if !0%{?usrmerged}
|
||||
/sbin/cfdisk
|
||||
/sbin/sfdisk
|
||||
#EndUsrMerge
|
||||
%endif
|
||||
%{_sbindir}/cfdisk
|
||||
%{_sbindir}/sfdisk
|
||||
%endif
|
||||
%ifnarch s390 s390x
|
||||
%{_sbindir}/fdformat
|
||||
#UsrMerge
|
||||
%if !0%{?usrmerged}
|
||||
/sbin/hwclock
|
||||
#EndUsrMerge
|
||||
%endif
|
||||
%{_sbindir}/hwclock
|
||||
%{_bindir}/setterm
|
||||
%{_sbindir}/tunelp
|
||||
@ -1310,7 +1315,9 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
|
||||
%files
|
||||
%endif
|
||||
%defattr(-, root, root)
|
||||
%if !0%{?usrmerged}
|
||||
/bin/logger
|
||||
%endif
|
||||
%{_bindir}/logger
|
||||
%{_bindir}/lslogins
|
||||
#BEGIN bootstrap_hack
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 25 17:07:55 UTC 2021 - Ludwig Nussel <lnussel@suse.de>
|
||||
|
||||
- s/--enable-vendordir/--with-vendordir/
|
||||
- remove pam_securetty line again. As long as there is no agreement
|
||||
from pam side having it would fail openQA (boo#1033626)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Jan 16 02:30:02 UTC 2021 - Stanislav Brabec <sbrabec@suse.com>
|
||||
|
||||
@ -39,6 +46,11 @@ Thu Nov 26 20:15:46 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
|
||||
- Do search /usr/sbin for mount helpers. (This drops /sbin/fs,
|
||||
/sbin/fs.d, which we do not use in openSUSE.)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Nov 20 15:06:37 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
|
||||
|
||||
- prepare usrmerge (boo#1029961)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Nov 4 11:07:03 UTC 2020 - Dr. Werner Fink <werner@suse.de>
|
||||
|
||||
|
||||
@ -573,7 +573,7 @@ AUTOPOINT=true autoreconf -vfi
|
||||
%else
|
||||
--without-python \
|
||||
%endif
|
||||
--enable-vendordir=%{_distconfdir}
|
||||
--with-vendordir=%{_distconfdir}
|
||||
|
||||
#
|
||||
# Safety check: HAVE_UUIDD should be always 1:
|
||||
@ -636,7 +636,7 @@ install -m 644 runuser.default %{buildroot}%{_distconfdir}/default/runuser
|
||||
%make_install
|
||||
rm -f %{buildroot}%{python3_sitearch}/libmount/*.*a
|
||||
%if %build_util_linux
|
||||
#UsrMerge
|
||||
%if !0%{?usrmerged}
|
||||
ln -s %{_bindir}/kill %{buildroot}/bin
|
||||
ln -s %{_bindir}/su %{buildroot}/bin
|
||||
ln -s %{_bindir}/dmesg %{buildroot}/bin
|
||||
@ -674,7 +674,7 @@ ln -s %{_sbindir}/fsfreeze %{buildroot}/sbin
|
||||
ln -s %{_sbindir}/swaplabel %{buildroot}/sbin
|
||||
ln -s %{_sbindir}/fstrim %{buildroot}/sbin
|
||||
ln -s %{_sbindir}/chcpu %{buildroot}/sbin
|
||||
#EndUsrMerge
|
||||
%endif
|
||||
install -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/filesystems
|
||||
echo -e "#!/bin/sh\n/sbin/blockdev --flushbufs \$1" > %{buildroot}%{_sbindir}/flushb
|
||||
chmod 755 %{buildroot}%{_sbindir}/flushb
|
||||
@ -687,16 +687,18 @@ ln -sf service %{buildroot}%{_sbindir}/rcraw
|
||||
mv %{buildroot}%{_docdir}/%{_name}/getopt %{buildroot}%{_datadir}/
|
||||
# Stupid hack so we don't have a tcsh dependency
|
||||
chmod 644 %{buildroot}%{_datadir}/getopt/getopt*.tcsh
|
||||
%if !0%{?usrmerged}
|
||||
# login is always and only in /bin
|
||||
mv %{buildroot}%{_bindir}/login %{buildroot}/bin/
|
||||
%endif
|
||||
# arch dependent
|
||||
%ifarch s390 s390x
|
||||
rm -f %{buildroot}%{_sysconfdir}/fdprm
|
||||
rm -f %{buildroot}%{_sbindir}/fdformat
|
||||
rm -f %{buildroot}%{_sbindir}/hwclock
|
||||
#UsrMerge
|
||||
%if !0%{?usrmerged}
|
||||
rm -f %{buildroot}/sbin/hwclock
|
||||
#EndUsrMerge
|
||||
%endif
|
||||
rm -f %{buildroot}%{_bindir}/setterm
|
||||
rm -f %{buildroot}%{_sbindir}/tunelp
|
||||
rm -f %{buildroot}%{_mandir}/man8/fdformat.8*
|
||||
@ -707,19 +709,17 @@ rm -f %{buildroot}%{_mandir}/man8/tunelp.8*
|
||||
rm -f %{buildroot}%{_mandir}/man8/cfdisk.8*
|
||||
rm -f %{buildroot}%{_mandir}/man8/sfdisk.8*
|
||||
rm -f %{buildroot}%{_sbindir}/cfdisk
|
||||
#UsrMerge
|
||||
rm -f %{buildroot}/sbin/cfdisk
|
||||
#EndUsrMerge
|
||||
rm -f %{buildroot}%{_sbindir}/sfdisk
|
||||
#UsrMerge
|
||||
%if !0%{?usrmerged}
|
||||
rm -f %{buildroot}/sbin/cfdisk
|
||||
rm -f %{buildroot}/sbin/sfdisk
|
||||
#EndUsrMerge
|
||||
%endif
|
||||
%endif
|
||||
%ifarch ia64 m68k
|
||||
rm -f %{buildroot}%{_sbindir}/fdisk
|
||||
#UsrMerge
|
||||
%if !0%{?usrmerged}
|
||||
rm -f %{buildroot}/sbin/fdisk
|
||||
#EndUsrMerge
|
||||
%endif
|
||||
rm -f %{buildroot}%{_mandir}/man8/fdisk.8*
|
||||
%endif
|
||||
%find_lang %{name} %{name}.lang
|
||||
@ -738,7 +738,9 @@ mkdir -p %{buildroot}/bin
|
||||
mkdir -p %{buildroot}%{_sbindir}
|
||||
mkdir -p %{buildroot}%{_localstatedir}/lib/libuuid
|
||||
mkdir -p %{buildroot}/run/uuidd
|
||||
%if !0%{?usrmerged}
|
||||
ln -s %{_bindir}/logger %{buildroot}/bin
|
||||
%endif
|
||||
# clock.txt from uuidd is a ghost file
|
||||
touch %{buildroot}%{_localstatedir}/lib/libuuid/clock.txt
|
||||
ln -sf /sbin/service %{buildroot}/usr/sbin/rcuuidd
|
||||
@ -917,7 +919,7 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
|
||||
%config(noreplace) %{_sysconfdir}/default/su
|
||||
%endif
|
||||
%config %dir %{_sysconfdir}/issue.d
|
||||
#UsrMerge
|
||||
%if !0%{?usrmerged}
|
||||
/bin/kill
|
||||
/bin/su
|
||||
/bin/dmesg
|
||||
@ -952,7 +954,7 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
|
||||
/sbin/swaplabel
|
||||
/sbin/fstrim
|
||||
/sbin/chcpu
|
||||
#EndUsrMerge
|
||||
%endif
|
||||
%{_bindir}/kill
|
||||
%verify(not mode) %{_bindir}/su
|
||||
%{_bindir}/eject
|
||||
@ -984,6 +986,9 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
|
||||
%endif
|
||||
%{_bindir}/line
|
||||
%{_bindir}/look
|
||||
%if 0%{?usrmerged}
|
||||
%{_bindir}/login
|
||||
%endif
|
||||
%{_bindir}/lsblk
|
||||
%{_bindir}/lscpu
|
||||
%{_bindir}/lsipc
|
||||
@ -1191,27 +1196,27 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
|
||||
%ifnarch ia64 m68k
|
||||
#XXX: post our patches upstream
|
||||
#XXX: call fdupes on /usr/share/man
|
||||
#UsrMerge
|
||||
%if !0%{?usrmerged}
|
||||
/sbin/fdisk
|
||||
#EndUsrMerge
|
||||
%endif
|
||||
%{_sbindir}/fdisk
|
||||
%{_mandir}/man8/fdisk.8.gz
|
||||
%endif
|
||||
%ifnarch %sparc ia64 m68k
|
||||
%{_mandir}/man8/cfdisk.8.gz
|
||||
%{_mandir}/man8/sfdisk.8.gz
|
||||
#UsrMerge
|
||||
%if !0%{?usrmerged}
|
||||
/sbin/cfdisk
|
||||
/sbin/sfdisk
|
||||
#EndUsrMerge
|
||||
%endif
|
||||
%{_sbindir}/cfdisk
|
||||
%{_sbindir}/sfdisk
|
||||
%endif
|
||||
%ifnarch s390 s390x
|
||||
%{_sbindir}/fdformat
|
||||
#UsrMerge
|
||||
%if !0%{?usrmerged}
|
||||
/sbin/hwclock
|
||||
#EndUsrMerge
|
||||
%endif
|
||||
%{_sbindir}/hwclock
|
||||
%{_bindir}/setterm
|
||||
%{_sbindir}/tunelp
|
||||
@ -1310,7 +1315,9 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
|
||||
%files
|
||||
%endif
|
||||
%defattr(-, root, root)
|
||||
%if !0%{?usrmerged}
|
||||
/bin/logger
|
||||
%endif
|
||||
%{_bindir}/logger
|
||||
%{_bindir}/lslogins
|
||||
#BEGIN bootstrap_hack
|
||||
|
||||
Loading…
Reference in New Issue
Block a user