1
0
forked from pool/util-linux

Accepting request 448848 from home:rudi_m:branches:Base:System

- don't install bash-completions for uninstalled binaries (chfn,
  chsh, newgrp, pg)
- for now remove procps dependency  which is only needed for tests
  because it pulls systemd

Note the util-linux bash completions are incompatible to the
installed binaries from the shadow package. We could use the
completions from bash-completion package or we could switch
to the binaries from util-linux. They seem to have more
features and being backward compatible.

I've reverted the previous procps fix. It was not mwerged to
Factory yet.

OBS-URL: https://build.opensuse.org/request/show/448848
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=328
This commit is contained in:
Stanislav Brabec 2017-01-05 16:34:46 +00:00 committed by Git OBS Bridge
parent d6eb5f279b
commit 0f68d9f586
6 changed files with 40 additions and 65 deletions

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Jan 5 12:34:33 UTC 2017 - sweet_f_a@gmx.de
- don't install bash-completions for uninstalled binaries (chfn,
chsh, newgrp, pg)
- for now remove procps dependency which is only needed for tests
because it pulls systemd
-------------------------------------------------------------------
Thu Dec 15 09:26:01 UTC 2016 - fbui@suse.com
@ -5,14 +13,6 @@ Thu Dec 15 09:26:01 UTC 2016 - fbui@suse.com
libsystemd-* libs were deprecated and are gone now.
-------------------------------------------------------------------
Wed Dec 14 08:59:55 UTC 2016 - dimstar@opensuse.org
- Move the procps BuildRequires into the systemd conditional block.
procps is only used during the test suite (some tests run 'ps';
even if we ignore a failure for this in util-linux, we catch the
same in util-linux-systemd, which is sufficient.
-------------------------------------------------------------------
Wed Dec 7 16:12:55 CET 2016 - sbrabec@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package python-libmount
#
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -69,7 +69,7 @@ Name: python-libmount
%endif
Summary: %main_summary
License: GPL-2.0+
Group: %group_pl
Group: %main_group
BuildRequires: audit-devel
BuildRequires: bc
BuildRequires: binutils-devel
@ -92,7 +92,6 @@ BuildRequires: zlib-devel
BuildRequires: librtas-devel
%endif
%if %build_util_linux_systemd
BuildRequires: procps
BuildRequires: socat
BuildRequires: systemd-rpm-macros
BuildRequires: pkgconfig(libsystemd)
@ -372,7 +371,6 @@ SMP systems.
%if %build_util_linux
%package -n python-libmount
Summary: %summary_pl
License: GPL-2.0+
Group: %group_pl
%description -n python-libmount
@ -532,6 +530,10 @@ AUTOPOINT=true autoreconf -vfi
--disable-rpath \
--enable-all-programs \
--disable-reset \
--disable-chfn-chsh \
--disable-newgrp \
--disable-vipw \
--disable-pg \
%if %{without enable_last}
--disable-last \
%endif
@ -677,17 +679,6 @@ ln -sf ../..%{_sysconfdir}/init.d/raw %{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
# Following files we don't want to package, so remove them
rm -f %{buildroot}%{_bindir}/pg
rm -f %{buildroot}%{_mandir}/man1/pg.1*
# Do not package these files to get rid of the perl dependency
rm -f %{buildroot}%{_bindir}/chkdupexe
rm -f %{buildroot}%{_mandir}/man1/chkdupexe.1
# we use this tools from pwdutils
rm -f %{buildroot}%{_bindir}/{chfn,chsh,newgrp}
rm -f %{buildroot}%{_sbindir}/{vigr,vipw}
rm -f %{buildroot}%{_mandir}/man1/{chfn.1*,chsh.1*,newgrp.1*}
rm -f %{buildroot}%{_mandir}/man8/{vigr.8*,vipw.8*}
# login is always and only in /bin
mv %{buildroot}%{_bindir}/login %{buildroot}/bin/
# arch dependent

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Jan 5 12:34:33 UTC 2017 - sweet_f_a@gmx.de
- don't install bash-completions for uninstalled binaries (chfn,
chsh, newgrp, pg)
- for now remove procps dependency which is only needed for tests
because it pulls systemd
-------------------------------------------------------------------
Thu Dec 15 09:26:01 UTC 2016 - fbui@suse.com
@ -5,14 +13,6 @@ Thu Dec 15 09:26:01 UTC 2016 - fbui@suse.com
libsystemd-* libs were deprecated and are gone now.
-------------------------------------------------------------------
Wed Dec 14 08:59:55 UTC 2016 - dimstar@opensuse.org
- Move the procps BuildRequires into the systemd conditional block.
procps is only used during the test suite (some tests run 'ps';
even if we ignore a failure for this in util-linux, we catch the
same in util-linux-systemd, which is sufficient.
-------------------------------------------------------------------
Wed Dec 7 16:12:55 CET 2016 - sbrabec@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package util-linux-systemd
#
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -92,7 +92,6 @@ BuildRequires: zlib-devel
BuildRequires: librtas-devel
%endif
%if %build_util_linux_systemd
BuildRequires: procps
BuildRequires: socat
BuildRequires: systemd-rpm-macros
BuildRequires: pkgconfig(libsystemd)
@ -531,6 +530,10 @@ AUTOPOINT=true autoreconf -vfi
--disable-rpath \
--enable-all-programs \
--disable-reset \
--disable-chfn-chsh \
--disable-newgrp \
--disable-vipw \
--disable-pg \
%if %{without enable_last}
--disable-last \
%endif
@ -676,17 +679,6 @@ ln -sf ../..%{_sysconfdir}/init.d/raw %{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
# Following files we don't want to package, so remove them
rm -f %{buildroot}%{_bindir}/pg
rm -f %{buildroot}%{_mandir}/man1/pg.1*
# Do not package these files to get rid of the perl dependency
rm -f %{buildroot}%{_bindir}/chkdupexe
rm -f %{buildroot}%{_mandir}/man1/chkdupexe.1
# we use this tools from pwdutils
rm -f %{buildroot}%{_bindir}/{chfn,chsh,newgrp}
rm -f %{buildroot}%{_sbindir}/{vigr,vipw}
rm -f %{buildroot}%{_mandir}/man1/{chfn.1*,chsh.1*,newgrp.1*}
rm -f %{buildroot}%{_mandir}/man8/{vigr.8*,vipw.8*}
# login is always and only in /bin
mv %{buildroot}%{_bindir}/login %{buildroot}/bin/
# arch dependent

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Jan 5 12:34:33 UTC 2017 - sweet_f_a@gmx.de
- don't install bash-completions for uninstalled binaries (chfn,
chsh, newgrp, pg)
- for now remove procps dependency which is only needed for tests
because it pulls systemd
-------------------------------------------------------------------
Thu Dec 15 09:26:01 UTC 2016 - fbui@suse.com
@ -5,14 +13,6 @@ Thu Dec 15 09:26:01 UTC 2016 - fbui@suse.com
libsystemd-* libs were deprecated and are gone now.
-------------------------------------------------------------------
Wed Dec 14 08:59:55 UTC 2016 - dimstar@opensuse.org
- Move the procps BuildRequires into the systemd conditional block.
procps is only used during the test suite (some tests run 'ps';
even if we ignore a failure for this in util-linux, we catch the
same in util-linux-systemd, which is sufficient.
-------------------------------------------------------------------
Wed Dec 7 16:12:55 CET 2016 - sbrabec@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package util-linux
#
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -92,7 +92,6 @@ BuildRequires: zlib-devel
BuildRequires: librtas-devel
%endif
%if %build_util_linux_systemd
BuildRequires: procps
BuildRequires: socat
BuildRequires: systemd-rpm-macros
BuildRequires: pkgconfig(libsystemd)
@ -531,6 +530,10 @@ AUTOPOINT=true autoreconf -vfi
--disable-rpath \
--enable-all-programs \
--disable-reset \
--disable-chfn-chsh \
--disable-newgrp \
--disable-vipw \
--disable-pg \
%if %{without enable_last}
--disable-last \
%endif
@ -676,17 +679,6 @@ ln -sf ../..%{_sysconfdir}/init.d/raw %{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
# Following files we don't want to package, so remove them
rm -f %{buildroot}%{_bindir}/pg
rm -f %{buildroot}%{_mandir}/man1/pg.1*
# Do not package these files to get rid of the perl dependency
rm -f %{buildroot}%{_bindir}/chkdupexe
rm -f %{buildroot}%{_mandir}/man1/chkdupexe.1
# we use this tools from pwdutils
rm -f %{buildroot}%{_bindir}/{chfn,chsh,newgrp}
rm -f %{buildroot}%{_sbindir}/{vigr,vipw}
rm -f %{buildroot}%{_mandir}/man1/{chfn.1*,chsh.1*,newgrp.1*}
rm -f %{buildroot}%{_mandir}/man8/{vigr.8*,vipw.8*}
# login is always and only in /bin
mv %{buildroot}%{_bindir}/login %{buildroot}/bin/
# arch dependent