[packages/util-linux] - R: gawk for bash-completion subpackage (needed for helper for umount) - rel 5

adwol adwol at pld-linux.org
Sun Nov 24 23:24:21 CET 2019


commit 71297c41305b2d1608e6705cafc11d837e5a7e91
Author: Adam Osuchowski <adwol at pld-linux.org>
Date:   Sun Nov 24 23:22:19 2019 +0100

    - R: gawk for bash-completion subpackage (needed for helper for umount)
    - rel 5

 util-linux-completion-gawk.patch | 12 ++++++++++++
 util-linux.spec                  |  5 ++++-
 2 files changed, 16 insertions(+), 1 deletion(-)
---
diff --git a/util-linux.spec b/util-linux.spec
index 83580c4..5e14ca8 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -39,7 +39,7 @@ Summary(tr.UTF-8):	Temel sistem araçları
 Summary(uk.UTF-8):	Набір базових системних утиліт для Linux
 Name:		util-linux
 Version:	2.34
-Release:	4
+Release:	5
 License:	GPL v2+
 Group:		Applications/System
 # https://github.com/karelzak/util-linux (GitHub backup)
@@ -66,6 +66,7 @@ Patch4:		su-paths.patch
 Patch5:		%{name}-ac.patch
 Patch6:		%{name}-diet.patch
 Patch7:		%{name}-pl.po.patch
+Patch8:		%{name}-completion-gawk.patch
 URL:		https://github.com/karelzak/util-linux
 BuildRequires:	audit-libs-devel >= 1.0.6
 BuildRequires:	autoconf >= 2.60
@@ -727,6 +728,7 @@ Summary(pl.UTF-8):	Bashowe dopełnianie parametrów dla poleceń z pakietu util-
 Group:		Applications/Shells
 Requires:	%{name} = %{version}-%{release}
 Requires:	bash-completion >= 2.0
+Requires:	gawk
 %if "%{_rpmversion}" >= "5"
 BuildArch:	noarch
 %endif
@@ -747,6 +749,7 @@ Bashowe dopełnianie parametrów dla poleceń z pakietu util-linux.
 %patch5 -p1
 %{?with_initrd:%patch6 -p1}
 #%patch7 -p1
+%patch8 -p1
 
 cp -p %{SOURCE10} nologin.c
 
diff --git a/util-linux-completion-gawk.patch b/util-linux-completion-gawk.patch
new file mode 100644
index 0000000..af9cff6
--- /dev/null
+++ b/util-linux-completion-gawk.patch
@@ -0,0 +1,12 @@
+diff -ruNp util-linux-2.34.orig/bash-completion/umount util-linux-2.34/bash-completion/umount
+--- util-linux-2.34.orig/bash-completion/umount	2019-04-02 12:12:03.180261025 +0200
++++ util-linux-2.34/bash-completion/umount	2019-11-24 23:13:33.844871532 +0100
+@@ -51,7 +51,7 @@ _umount_module()
+ 
+ 	local oldifs=$IFS
+ 	IFS=$'\n'
+-	COMPREPLY=( $( compgen -W "$(findmnt -lno TARGET | awk \
++	COMPREPLY=( $( compgen -W "$(findmnt -lno TARGET | gawk \
+ 		'{
+ 			if ($0 ~ ENVIRON["HOME"]) {
+ 				homeless = $0
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/util-linux.git/commitdiff/71297c41305b2d1608e6705cafc11d837e5a7e91



More information about the pld-cvs-commit mailing list