This commit is contained in:
Vishal Verma 2022-03-07 18:23:08 -07:00
parent 5363e6d480
commit 5a06a7d1d2
3 changed files with 40 additions and 12 deletions

1
.gitignore vendored
View File

@ -35,3 +35,4 @@
/ndctl-71.1.tar.gz
/ndctl-72.tar.gz
/ndctl-72.1.tar.gz
/ndctl-73.tar.gz

View File

@ -1,6 +1,6 @@
Name: ndctl
Version: 72.1
Release: 2%{?dist}
Version: 73
Release: 1%{?dist}
Summary: Manage "libnvdimm" subsystem devices (Non-volatile Memory)
License: GPLv2
Url: https://github.com/pmem/ndctl
@ -12,9 +12,10 @@ Requires: cxl-libs%{?_isa} = %{version}-%{release}
BuildRequires: autoconf
%if 0%{?rhel} < 9
BuildRequires: asciidoc
%define asciidoc --disable-asciidoctor
%define asciidoctor -Dasciidoctor=disabled
%else
BuildRequires: rubygem-asciidoctor
%define asciidoctor -Dasciidoctor=enabled
%endif
BuildRequires: xmlto
BuildRequires: automake
@ -29,6 +30,7 @@ BuildRequires: pkgconfig(systemd)
BuildRequires: keyutils-libs-devel
BuildRequires: systemd-rpm-macros
BuildRequires: iniparser-devel
BuildRequires: meson
%description
Utility library for managing the "libnvdimm" subsystem. The "libnvdimm"
@ -36,6 +38,9 @@ subsystem defines a kernel device model and control message interface for
platform NVDIMM resources like those defined by the ACPI 6+ NFIT (NVDIMM
Firmware Interface Table).
%if 0%{?flatpak}
%global _udevrulesdir %{_prefix}/lib/udev/rules.d
%endif
%package -n ndctl-devel
Summary: Development files for libndctl
@ -117,17 +122,14 @@ libcxl is a library for enumerating and communicating with CXL devices.
%setup -q ndctl-%{version}
%build
echo %{version} > version
./autogen.sh
%configure --disable-static --disable-silent-rules %{?asciidoc}
make %{?_smp_mflags}
%meson %{?asciidoctor} -Dversion-tag=%{version}
%meson_build
%install
%make_install
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%meson_install
%check
make check
%meson_test
%ldconfig_scriptlets -n ndctl-libs
@ -137,6 +139,31 @@ make check
%define bashcompdir %(pkg-config --variable=completionsdir bash-completion)
%pre
if [ -f %{_sysconfdir}/ndctl/monitor.conf ] ; then
if ! [ -f %{_sysconfdir}/ndctl.conf.d/monitor.conf ] ; then
cp -a %{_sysconfdir}/ndctl/monitor.conf /var/run/ndctl-monitor.conf-migration
fi
fi
%post
if [ -f /var/run/ndctl-monitor.conf-migration ] ; then
config_found=false
while read line ; do
[ -n "$line" ] || continue
case "$line" in
\#*) continue ;;
esac
config_found=true
break
done < /var/run/ndctl-monitor.conf-migration
if $config_found ; then
echo "[monitor]" > %{_sysconfdir}/ndctl.conf.d/monitor.conf
cat /var/run/ndctl-monitor.conf-migration >> %{_sysconfdir}/ndctl.conf.d/monitor.conf
fi
rm /var/run/ndctl-monitor.conf-migration
fi
%files
%license LICENSES/preferred/GPL-2.0 LICENSES/other/MIT LICENSES/other/CC0-1.0
%{_bindir}/ndctl
@ -198,7 +225,7 @@ make check
%{_libdir}/libcxl.so
%{_libdir}/pkgconfig/libcxl.pc
%{_mandir}/man3/cxl*
%{_mandir}/man3/libcxl.3.gz
%{_mandir}/man3/libcxl.3*
%changelog

View File

@ -1 +1 @@
SHA512 (ndctl-72.1.tar.gz) = 7304e23121c99457fa6e22a399fb636f6a66d6d07b090463ec41e424687b06e7e8a1a18623ab9dd5783aaccfa09ff964e3477b63aaa4614ac60f6e6050452f12
SHA512 (ndctl-73.tar.gz) = a52a1fb655f044e5cd48b95b3abd89b4f6a991d6439c02e66da6b55947b8a08c279fec873def0b5a18a4e0b670d40e246c333b619fb62f0c6808357d15d847a5