[packages/ndctl] - updated to 63 - added bashcompdir patch (allow to pass bash completion dir again)

qboosh qboosh at pld-linux.org
Wed Dec 12 17:41:46 CET 2018


commit 605b7fc7de3363f2bdf2ca2b5f6512d0813623bc
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Dec 12 17:46:18 2018 +0100

    - updated to 63
    - added bashcompdir patch (allow to pass bash completion dir again)

 ndctl-bashcompdir.patch | 16 ++++++++++++++++
 ndctl.spec              | 15 +++++++++++----
 2 files changed, 27 insertions(+), 4 deletions(-)
---
diff --git a/ndctl.spec b/ndctl.spec
index 8aeb603..e089ead 100644
--- a/ndctl.spec
+++ b/ndctl.spec
@@ -5,14 +5,16 @@
 Summary:	Manage "libnvdimm" subsystem devices (Non-volatile Memory)
 Summary(pl.UTF-8):	Zarządzanie urządzeniami podsystemu "libnvdimm" (pamięci nieulotnej)
 Name:		ndctl
-Version:	60.1
-Release:	2
+Version:	63
+Release:	1
 License:	LGPL v2.1+ (libraries), GPL v2+ with CC0 and MIT parts (utilities)
 Group:		Applications/System
 #Source0Download: https://github.com/pmem/ndctl/releases
 Source0:	https://github.com/pmem/ndctl/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	b67e154bf6cf6e34ac8c43bbae85952e
+# Source0-md5:	a4e2fa6f776ff6c1ebf3ba9dcb660f8f
+Patch0:		%{name}-bashcompdir.patch
 URL:		http://pmem.io/ndctl/
+# TODO: asciidoctor
 BuildRequires:	asciidoc
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake >= 1:1.11
@@ -158,6 +160,7 @@ Statyczna biblioteka daxctl.
 
 %prep
 %setup -q
+%patch0 -p1
 
 echo '%{version}' >version
 
@@ -169,9 +172,10 @@ echo '%{version}' >version
 %{__autoheader}
 %{__automake}
 %configure \
+	--disable-asciidoctor \
 	--disable-silent-rules \
 	%{?with_static_libs:--enable-static} \
-	--with-bash-completion-dir=%{bash_compdir}
+	--with-bash=%{bash_compdir}
 %{__make}
 
 %install
@@ -196,6 +200,9 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc README.md licenses/{BSD-MIT,CC0}
 %attr(755,root,root) %{_bindir}/ndctl
+%dir %{_sysconfdir}/ndctl
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ndctl/monitor.conf
+%{systemdunitdir}/ndctl-monitor.service
 %{_mandir}/man1/ndctl.1*
 %{_mandir}/man1/ndctl-*.1*
 
diff --git a/ndctl-bashcompdir.patch b/ndctl-bashcompdir.patch
new file mode 100644
index 0000000..2490506
--- /dev/null
+++ b/ndctl-bashcompdir.patch
@@ -0,0 +1,16 @@
+--- ndctl-63/configure.ac.orig	2018-10-05 22:22:09.000000000 +0200
++++ ndctl-63/configure.ac	2018-12-11 21:44:27.071045966 +0100
+@@ -124,10 +124,12 @@
+ if test "x$with_bash" = "xyes"; then
+ 	PKG_CHECK_MODULES([BASH_COMPLETION], [bash-completion >= 2.0],
+ 		[BASH_COMPLETION_DIR=$($PKG_CONFIG --variable=completionsdir bash-completion)], [])
++elif test "x$with_bash" != "no"; then
++	BASH_COMPLETION_DIR="$with_bash"
+ fi
+ 
+ AC_SUBST([BASH_COMPLETION_DIR])
+-AM_CONDITIONAL([ENABLE_BASH_COMPLETION], [test "x$with_bash" = "xyes"])
++AM_CONDITIONAL([ENABLE_BASH_COMPLETION], [test "x$with_bash" != "xno"])
+ 
+ AC_ARG_ENABLE([local],
+         AS_HELP_STRING([--disable-local], [build against kernel ndctl.h @<:@default=system@:>@]),
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ndctl.git/commitdiff/605b7fc7de3363f2bdf2ca2b5f6512d0813623bc



More information about the pld-cvs-commit mailing list