diff --git a/.gitignore b/.gitignore index c01d168..a70db32 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /v52.tar.gz +/ndctl-53.tar.gz diff --git a/ndctl.spec b/ndctl.spec index 69c0daa..9b2e11b 100644 --- a/ndctl.spec +++ b/ndctl.spec @@ -1,11 +1,11 @@ Name: ndctl -Version: 52 +Version: 53 Release: 1%{?dist} Summary: Manage "libnvdimm" subsystem devices (Non-volatile Memory) License: GPLv2 Group: System Environment/Base Url: https://github.com/pmem/ndctl -Source0: https://github.com/pmem/ndctl/archive/v%{version}.tar.gz +Source0: https://github.com/pmem/ndctl/releases/download/ndctl-%{version}/ndctl-%{version}.tar.gz BuildRequires: autoconf BuildRequires: asciidoc @@ -17,6 +17,7 @@ BuildRequires: pkgconfig(libkmod) BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(uuid) BuildRequires: pkgconfig(json-c) +BuildRequires: pkgconfig(bash-completion) %description Utility library for managing the "libnvdimm" subsystem. The "libnvdimm" @@ -35,20 +36,45 @@ Requires: ndctl-libs%{?_isa} = %{version}-%{release} The %{name}-devel package contains libraries and header files for developing applications that use %{name}. +%package -n daxctl-devel +Summary: Development files for libdaxctl +License: LGPLv2 +Group: Development/Libraries +Requires: daxctl-libs%{?_isa} = %{version}-%{release} + +%description -n daxctl-devel +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}, a library for enumerating +"Device DAX" devices. Device DAX is a facility for establishing DAX +mappings of performance / feature-differentiated memory. + %package -n ndctl-libs Summary: Management library for "libnvdimm" subsystem devices (Non-volatile Memory) License: LGPLv2 Group: System Environment/Libraries +Requires: daxctl-libs%{?_isa} = %{version}-%{release} + %description -n ndctl-libs Libraries for %{name}. +%package -n daxctl-libs +Summary: Management library for "Device DAX" devices +License: LGPLv2 +Group: System Environment/Libraries + +%description -n daxctl-libs +Device DAX is a facility for establishing DAX mappings of performance / +feature-differentiated memory. daxctl-libs provides an enumeration / +control API for these devices. + + %prep -%setup -q v%{version} +%setup -q ndctl-%{version} %build -echo "52" > version +echo "53" > version ./autogen.sh %configure --disable-static --enable-local --disable-silent-rules make %{?_smp_mflags} @@ -64,22 +90,45 @@ make check %postun -n ndctl-libs -p /sbin/ldconfig +%post -n daxctl-libs -p /sbin/ldconfig + +%postun -n daxctl-libs -p /sbin/ldconfig + +%define bashcompdir %(pkg-config --variable=completionsdir bash-completion) + %files %license licenses/GPLv2 licenses/BSD-MIT licenses/CC0 %{_bindir}/ndctl %{_mandir}/man1/* +%{bashcompdir}/ %files -n ndctl-libs %doc README.md %license COPYING licenses/BSD-MIT licenses/CC0 %{_libdir}/libndctl.so.* +%files -n daxctl-libs +%doc README.md +%license COPYING licenses/BSD-MIT licenses/CC0 +%{_libdir}/libdaxctl.so.* + %files -n ndctl-devel %license COPYING %{_includedir}/ndctl/ %{_libdir}/libndctl.so %{_libdir}/pkgconfig/libndctl.pc +%files -n daxctl-devel +%license COPYING +%{_includedir}/daxctl/ +%{_libdir}/libdaxctl.so +%{_libdir}/pkgconfig/libdaxctl.pc + + %changelog +* Fri May 27 2016 Dan Williams - 53-1 +- add daxctl-libs + daxctl-devel packages +- add bash completion + * Mon Apr 04 2016 Dan Williams - 52-1 - Initial rpm submission to Fedora diff --git a/sources b/sources index 115811c..9ce4322 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ca20c8e5839ee3a4b2ee7131141c04c7 v52.tar.gz +e375c3fbf1cb7eefdac3cedd5af9f125 ndctl-53.tar.gz