- updated to 73, now uses meson

- bashcompdir patch obsolete

diff --git a/ndctl-bashcompdir.patch b/ndctl-bashcompdir.patch
deleted file mode 100644 (file)
index 2490506..0000000
--- a/ndctl-bashcompdir.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- 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@:>@]),

diff --git a/ndctl.spec b/ndctl.spec
index ddf889a2de2618fb48bae92947ea8eb656317503..6287df0ce6c5edeb1473191109e31ee5855fe0ef 100644 (file)
--- a/ndctl.spec
+++ b/ndctl.spec
@@ -6,27 +6,25 @@
 Summary:       Manage "libnvdimm" subsystem devices (Non-volatile Memory)
 Summary(pl.UTF-8):     Zarządzanie urządzeniami podsystemu "libnvdimm" (pamięci nieulotnej)
 Name:          ndctl
-Version:       72.1
+Version:       73
 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: faa0fa043dbd922d13ecb6f31b00e3b2
-Patch0:                %{name}-bashcompdir.patch
+# Source0-md5: 0c9f6f8c0bcc29ed7fcae3b1df7f61d6
 URL:           https://pmem.io/ndctl/
-# TODO: asciidoctor
+# or asciidoctor instead of asciidoc+xmlto
 BuildRequires: asciidoc
-BuildRequires: autoconf >= 2.60
-BuildRequires: automake >= 1:1.11
 BuildRequires: glibc-devel >= 6:2.28
 BuildRequires: iniparser-devel
 BuildRequires: json-c-devel
 BuildRequires: keyutils-devel
 BuildRequires: kmod-devel
-BuildRequires: libtool >= 2:2
 BuildRequires: libuuid-devel
 BuildRequires: linux-libc-headers >= 7:4.15
+BuildRequires: meson
+BuildRequires: ninja >= 1.5
 BuildRequires: pkgconfig
 BuildRequires: rpmbuild(macros) >= 1.673
 %{?with_systemd:BuildRequires: systemd-devel}
@@ -246,34 +244,20 @@ Statyczna biblioteka daxctl.
 
 %prep
 %setup -q
-%patch0 -p1
-
-echo '%{version}' >version
 
 %build
-./git-version-gen
-%{__libtoolize}
-%{__aclocal} -I m4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
-       --disable-asciidoctor \
-       --disable-silent-rules \
-       %{?with_static_libs:--enable-static} \
-       --with-bash=%{bash_compdir} \
-       --with-udevrulesdir=/lib/udev/rules.d \
-       %{!?with_systemd:--without-systemd}
-%{__make}
+%meson build \
+       %{!?with_static_libs:--default-library=shared} \
+       -Dasciidoctor=disabled \
+       -Dbashcompletiondir=%{bash_compdir} \
+       %{!?with_systemd:-Dsystemd=disabled}
+
+%ninja_build -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT
-
-# obsoleted by pkg-config
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/lib*.la
+%ninja_install -C build
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -370,7 +354,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n daxctl-libs
 %defattr(644,root,root,755)
-%doc README.md LICENSES/other/{CC0-1.0,MIT}
+%doc COPYING README.md LICENSES/other/{CC0-1.0,MIT}
 %attr(755,root,root) %{_libdir}/libdaxctl.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libdaxctl.so.1