Revert ndctl, modify xmlto to fix build break (#2532)
* revert ndctl. update xmlto * update licenses
This commit is contained in:
Andrew Phelps
GitHub
Родитель
940b67df97
Коммит
7e43400fd5
Различия файлов скрыты, потому что одна или несколько строк слишком длинны
|
|
@ -1035,7 +1035,6 @@
|
|||
"mythes-uk",
|
||||
"nbd",
|
||||
"nbdkit",
|
||||
"ndctl",
|
||||
"neon",
|
||||
"netcf",
|
||||
"netlabel_tools",
|
||||
|
|
@ -2914,6 +2913,7 @@
|
|||
"nano",
|
||||
"nasm",
|
||||
"ncurses",
|
||||
"ndctl",
|
||||
"net-snmp",
|
||||
"net-tools",
|
||||
"nettle",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"Signatures": {
|
||||
"ndctl-71.1.tar.gz": "cfd0d9d6c893a83491296c40c710f4202d6e9b5b6c74ae1aca905584a5db512b"
|
||||
"ndctl-65.tar.gz": "01870de8ed902b14314485f71e0d36e72694c7046e0603b41df107b2827d3781"
|
||||
}
|
||||
}
|
||||
|
|
@ -1,54 +1,46 @@
|
|||
%{!?_udevdir: %define _udevdir /lib/udev/}
|
||||
Summary: Manage "libnvdimm" subsystem devices (Non-volatile Memory)
|
||||
Name: ndctl
|
||||
Version: 65
|
||||
Release: 2%{?dist}
|
||||
License: LGPLv2
|
||||
Group: System Environment/Base
|
||||
Url: https://github.com/pmem/ndctl
|
||||
Source0: https://github.com/pmem/%{name}/archive/ndctl-%{version}.tar.gz
|
||||
#Source0: https://github.com/pmem/%{name}/archive/v%{version}.tar.gz
|
||||
Vendor: Microsoft Corporation
|
||||
Distribution: Mariner
|
||||
Name: ndctl
|
||||
Version: 71.1
|
||||
Release: 2%{?dist}
|
||||
Summary: Manage "libnvdimm" subsystem devices (Non-volatile Memory)
|
||||
License: GPLv2
|
||||
Url: https://github.com/pmem/ndctl
|
||||
Source0: https://github.com/pmem/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||
|
||||
Requires: ndctl-libs%{?_isa} = %{version}-%{release}
|
||||
Requires: daxctl-libs%{?_isa} = %{version}-%{release}
|
||||
BuildRequires: autoconf
|
||||
%if 0%{?rhel} < 9
|
||||
BuildRequires: asciidoc
|
||||
%define asciidoc --disable-asciidoctor
|
||||
%else
|
||||
BuildRequires: rubygem-asciidoctor
|
||||
%endif
|
||||
BuildRequires: xmlto
|
||||
BuildRequires: automake
|
||||
BuildRequires: libtool
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: pkgconfig(libkmod)
|
||||
BuildRequires: pkgconfig(libudev)
|
||||
BuildRequires: pkgconfig(uuid)
|
||||
BuildRequires: pkgconfig(json-c)
|
||||
BuildRequires: pkgconfig(bash-completion)
|
||||
BuildRequires: pkgconfig(systemd)
|
||||
BuildRequires: keyutils-libs-devel
|
||||
BuildRequires: asciidoc
|
||||
BuildRequires: which
|
||||
BuildRequires: xmlto
|
||||
BuildRequires: libtool
|
||||
BuildRequires: pkg-config
|
||||
BuildRequires: kmod-devel
|
||||
BuildRequires: systemd-devel
|
||||
BuildRequires: json-c-devel
|
||||
BuildRequires: bash-completion-devel
|
||||
BuildRequires: keyutils-devel
|
||||
|
||||
%description
|
||||
Utility library for managing the "libnvdimm" subsystem. The "libnvdimm"
|
||||
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).
|
||||
platform NVDIMM resources.
|
||||
|
||||
%package devel
|
||||
Summary: Development files for ndctl
|
||||
License: LGPLv2
|
||||
Group: Development/Libraries
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
||||
%package -n ndctl-devel
|
||||
Summary: Development files for libndctl
|
||||
License: LGPLv2
|
||||
Requires: ndctl-libs%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description -n ndctl-devel
|
||||
%description devel
|
||||
The %{name}-devel package contains libraries and header files for
|
||||
developing applications that use %{name}.
|
||||
|
||||
%package -n daxctl
|
||||
Summary: Manage Device-DAX instances
|
||||
License: GPLv2
|
||||
Requires: daxctl-libs%{?_isa} = %{version}-%{release}
|
||||
Summary: Manage Device-DAX instances
|
||||
License: GPLv2
|
||||
Group: System Environment/Base
|
||||
|
||||
%description -n daxctl
|
||||
The daxctl utility provides enumeration and provisioning commands for
|
||||
|
|
@ -57,9 +49,10 @@ of performance / feature differentiated memory without need of a
|
|||
filesystem.
|
||||
|
||||
%package -n daxctl-devel
|
||||
Summary: Development files for libdaxctl
|
||||
License: LGPLv2
|
||||
Requires: daxctl-libs%{?_isa} = %{version}-%{release}
|
||||
Summary: Development files for daxctl
|
||||
License: LGPLv2
|
||||
Group: Development/Libraries
|
||||
Requires: daxctl = %{version}-%{release}
|
||||
|
||||
%description -n daxctl-devel
|
||||
The %{name}-devel package contains libraries and header files for
|
||||
|
|
@ -67,236 +60,71 @@ 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
|
||||
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
|
||||
|
||||
%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 ndctl-%{version}
|
||||
|
||||
%build
|
||||
echo %{version} > version
|
||||
./autogen.sh
|
||||
%configure --disable-static --disable-silent-rules %{?asciidoc}
|
||||
%configure \
|
||||
--disable-static \
|
||||
--enable-local \
|
||||
--disable-docs
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
%make_install
|
||||
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
|
||||
make install DESTDIR=%{buildroot}
|
||||
find %{buildroot} -name '*.la' -delete
|
||||
|
||||
%check
|
||||
make check
|
||||
|
||||
%ldconfig_scriptlets -n ndctl-libs
|
||||
%post -p /sbin/ldconfig
|
||||
|
||||
%ldconfig_scriptlets -n daxctl-libs
|
||||
|
||||
%define bashcompdir %(pkg-config --variable=completionsdir bash-completion)
|
||||
%postun -p /sbin/ldconfig
|
||||
|
||||
%files
|
||||
%license LICENSES/preferred/GPL-2.0 LICENSES/other/MIT LICENSES/other/CC0-1.0
|
||||
%defattr(-,root,root)
|
||||
%license util/COPYING licenses/BSD-MIT licenses/CC0
|
||||
%{_bindir}/ndctl
|
||||
%{_mandir}/man1/ndctl*
|
||||
%{bashcompdir}/
|
||||
%{_unitdir}/ndctl-monitor.service
|
||||
%{_sysconfdir}/ndctl/keys/keys.readme
|
||||
%{_sysconfdir}/modprobe.d/nvdimm-security.conf
|
||||
|
||||
%config(noreplace) %{_sysconfdir}/ndctl/monitor.conf
|
||||
|
||||
%files -n daxctl
|
||||
%license LICENSES/preferred/GPL-2.0 LICENSES/other/MIT LICENSES/other/CC0-1.0
|
||||
%{_bindir}/daxctl
|
||||
%{_mandir}/man1/daxctl*
|
||||
%{_datadir}/daxctl/daxctl.conf
|
||||
|
||||
%files -n ndctl-libs
|
||||
%doc README.md
|
||||
%license LICENSES/preferred/LGPL-2.1 LICENSES/other/MIT LICENSES/other/CC0-1.0
|
||||
%{_libdir}/libndctl.so.*
|
||||
%{_datadir}/bash-completion/
|
||||
%{_sysconfdir}/ndctl/*
|
||||
%{_sysconfdir}/modprobe.d/nvdimm-security.conf
|
||||
%{_unitdir}/ndctl-monitor.service
|
||||
|
||||
%files -n daxctl-libs
|
||||
%doc README.md
|
||||
%license LICENSES/preferred/LGPL-2.1 LICENSES/other/MIT LICENSES/other/CC0-1.0
|
||||
%{_libdir}/libdaxctl.so.*
|
||||
|
||||
%files -n ndctl-devel
|
||||
%license LICENSES/preferred/LGPL-2.1
|
||||
%files devel
|
||||
%defattr(-,root,root)
|
||||
%license COPYING
|
||||
%{_includedir}/ndctl/
|
||||
%{_libdir}/libndctl.so
|
||||
%{_libdir}/pkgconfig/libndctl.pc
|
||||
|
||||
%files -n daxctl
|
||||
%defattr(-,root,root)
|
||||
%license util/COPYING licenses/BSD-MIT licenses/CC0
|
||||
%{_bindir}/daxctl
|
||||
%{_libdir}/libdaxctl.so.*
|
||||
%{_datadir}/daxctl/daxctl.conf
|
||||
|
||||
%files -n daxctl-devel
|
||||
%license LICENSES/preferred/LGPL-2.1
|
||||
%defattr(-,root,root)
|
||||
%license COPYING
|
||||
%{_includedir}/daxctl/
|
||||
%{_libdir}/libdaxctl.so
|
||||
%{_libdir}/pkgconfig/libdaxctl.pc
|
||||
|
||||
%changelog
|
||||
* Fri Oct 15 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 71.1-2
|
||||
- Initial CBL-Mariner import from Fedora 33 (license: MIT).
|
||||
- License verified.
|
||||
|
||||
* Tue Dec 22 2020 Vishal Verma <vishal.l.verma@intel.com> - 71.1-1
|
||||
- release v71.1
|
||||
|
||||
* Sat Dec 19 2020 Vishal Verma <vishal.l.verma@intel.com> - 71-1
|
||||
- release v71
|
||||
|
||||
* Sat Oct 10 2020 Vishal Verma <vishal.l.verma@intel.com> - 70.1-1
|
||||
- release v70.1
|
||||
|
||||
* Tue Oct 06 2020 Vishal Verma <vishal@stellar.sh> - 70-1
|
||||
- release v70
|
||||
|
||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 69-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Thu Jul 23 2020 Vishal Verma <vishal.l.verma@intel.com> - 69-1
|
||||
- release v69
|
||||
|
||||
* Tue Apr 21 2020 Björn Esser <besser82@fedoraproject.org> - 68-2
|
||||
- Rebuild (json-c)
|
||||
|
||||
* Tue Mar 24 2020 Vishal Verma <vishal@stellar.sh> - 68-1
|
||||
- release v68
|
||||
|
||||
* Fri Jan 31 2020 Vishal Verma <vishal.l.verma@intel.com> - 67-3
|
||||
- Add fix for GCC10 builds
|
||||
|
||||
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 67-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Mon Oct 28 2019 Vishal Verma <vishal.l.verma@intel.com> - 67-1
|
||||
- release v67
|
||||
|
||||
* Wed Aug 07 2019 Vishal Verma <vishal.l.verma@intel.com> - 66-1
|
||||
- release v66
|
||||
|
||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 65-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Sat May 11 2019 Vishal Verma <vishal.l.verma@intel.com> - 65-1
|
||||
- release v65
|
||||
|
||||
* Wed Feb 06 2019 Vishal Verma <vishal.l.verma@intel.com> - 64.1-1
|
||||
- release v64.1
|
||||
|
||||
* Mon Feb 04 2019 Vishal Verma <vishal.l.verma@intel.com> - 64-1
|
||||
- release v64
|
||||
|
||||
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 63-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Fri Oct 05 2018 Vishal Verma <vishal.l.verma@intel.com> - 63-1
|
||||
- release v63
|
||||
- remove ndctl-udev and related files
|
||||
|
||||
* Tue Aug 14 2018 Vishal Verma <vishal@stellar.sh> - 62-1
|
||||
- release v62
|
||||
- Add files for udev and ndctl-monitor
|
||||
|
||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 61.2-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Wed Jul 11 2018 Vishal Verma <vishal.l.verma@intel.com> - 61.2-1
|
||||
- release v61.2
|
||||
|
||||
* Tue Jun 26 2018 Vishal Verma <vishal@stellar.sh> - 61.1-1
|
||||
- release v61.1
|
||||
|
||||
* Tue Jun 26 2018 Vishal Verma <vishal@stellar.sh> - 61-1
|
||||
- new version
|
||||
|
||||
* Thu May 17 2018 Dan Williams <dan.j.williams@intel.com> - 60.3-1
|
||||
- release v60.3
|
||||
|
||||
* Mon Apr 23 2018 Dan Williams <dan.j.williams@intel.com> - 60.1-1
|
||||
- release v60.1
|
||||
|
||||
* Thu Apr 19 2018 Dan Williams <dan.j.williams@intel.com> - 60-1
|
||||
- release v60
|
||||
|
||||
* Tue Mar 27 2018 Dan Williams <dan.j.williams@intel.com> - 59.3-1
|
||||
- release v59.3
|
||||
|
||||
* Tue Mar 06 2018 Björn Esser <besser82@fedoraproject.org> - 59.2-2
|
||||
- Rebuilt for libjson-c.so.4 (json-c v0.13.1)
|
||||
|
||||
* Fri Feb 09 2018 Dan Williams <dan.j.williams@intel.com> - 59.2-1
|
||||
- release v59.2
|
||||
|
||||
* Fri Feb 09 2018 Dan Williams <dan.j.williams@intel.com> - 59.1-1
|
||||
- release v59.1
|
||||
|
||||
* Fri Feb 09 2018 Dan Williams <dan.j.williams@intel.com> - 59-1
|
||||
- release v59
|
||||
|
||||
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 58.4-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Sun Dec 10 2017 Björn Esser <besser82@fedoraproject.org> - 58.4-2
|
||||
- Rebuilt for libjson-c.so.3
|
||||
|
||||
* Thu Nov 16 2017 Dan Williams <dan.j.williams@intel.com> - 58.4-1
|
||||
- release v58.4
|
||||
|
||||
* Thu Sep 21 2017 Dan Williams <dan.j.williams@intel.com> - 58.2-1
|
||||
- release v58.2
|
||||
|
||||
* Fri Sep 08 2017 Dan Williams <dan.j.williams@intel.com> - 58.1-2
|
||||
- gate libpmem dependency on x86_64
|
||||
|
||||
* Fri Sep 08 2017 Dan Williams <dan.j.williams@intel.com> - 58.1-1
|
||||
- add libpmem dependency
|
||||
- release v58.1
|
||||
|
||||
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 57.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 57.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Fri Jun 30 2017 Dan Williams <dan.j.williams@intel.com> - 57.1-1
|
||||
- Release v57.1
|
||||
|
||||
* Sat May 27 2017 Dan Williams <dan.j.williams@intel.com> - 57-1
|
||||
- Release v57
|
||||
|
||||
* Fri Feb 10 2017 Dan Williams <dan.j.williams@intel.com> - 56-1
|
||||
- Release v56
|
||||
|
||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 55-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Fri Oct 21 2016 Dan Williams <dan.j.williams@intel.com> - 55-1
|
||||
- release v55
|
||||
|
||||
* Fri Aug 05 2016 Dan Williams <dan.j.williams@intel.com> - 54-1
|
||||
- add explicit lib version dependencies
|
||||
|
||||
* Sat May 28 2016 Dan Williams <dan.j.williams@intel.com> - 53.1-1
|
||||
- Fix up tag format vs source url confusion
|
||||
|
||||
* Fri May 27 2016 Dan Williams <dan.j.williams@intel.com> - 53-1
|
||||
- add daxctl-libs + daxctl-devel packages
|
||||
- add bash completion
|
||||
|
||||
* Mon Apr 04 2016 Dan Williams <dan.j.williams@intel.com> - 52-1
|
||||
- Initial rpm submission to Fedora
|
||||
* Wed Mar 16 2022 Andrew Phelps <anphel@microsoft.com> 65-2
|
||||
- License verified.
|
||||
* Tue Mar 17 2020 Henry Beberman <henry.beberman@microsoft.com> 65-1
|
||||
- Update to 65. Remove udev rules reverted in release 63. License fixed.
|
||||
* Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> 62-2
|
||||
- Initial CBL-Mariner import from Photon (license: Apache2).
|
||||
* Wed Sep 12 2018 Him Kalyan Bordoloi <bordoloih@vmware.com> 62-1
|
||||
- Upgrade to v62
|
||||
* Fri Jun 23 2017 Xiaolin Li <xiaolinl@vmware.com> 56-3
|
||||
- Add kmod-devel to BuildRequires
|
||||
* Mon Apr 24 2017 Dheeraj Shetty <dheerajs@vmware.com> 56-2
|
||||
- Removing the Requires section
|
||||
* Thu Apr 06 2017 Dheeraj Shetty <dheerajs@vmware.com> 56-1
|
||||
- Initial build. First version
|
||||
|
|
@ -1,19 +1,18 @@
|
|||
Summary: The purpose of xmlto is to convert an XML file to the desired format
|
||||
Name: xmlto
|
||||
Version: 0.0.28
|
||||
Release: 6%{?dist}
|
||||
License: GPLv2+
|
||||
URL: https://pagure.io/xmlto
|
||||
Group: Applications/System
|
||||
Summary: The purpose of xmlto is to convert an XML file to the desired format
|
||||
Name: xmlto
|
||||
Version: 0.0.28
|
||||
Release: 7%{?dist}
|
||||
License: GPLv2+
|
||||
URL: https://pagure.io/xmlto
|
||||
Group: Applications/System
|
||||
Vendor: Microsoft Corporation
|
||||
Distribution: Mariner
|
||||
Source0: http://releases.pagure.org/xmlto/%{name}-%{version}.tar.gz
|
||||
BuildRequires: docbook-style-xsl
|
||||
BuildRequires: docbook-dtd-xml
|
||||
BuildRequires: libxslt-devel
|
||||
Requires: systemd
|
||||
Requires: docbook-style-xsl
|
||||
Requires: libxslt
|
||||
Source0: http://releases.pagure.org/xmlto/%{name}-%{version}.tar.gz
|
||||
BuildRequires: docbook-style-xsl
|
||||
BuildRequires: docbook-dtd-xml
|
||||
BuildRequires: libxslt-devel
|
||||
Requires: docbook-style-xsl
|
||||
Requires: libxslt
|
||||
|
||||
%description
|
||||
The purpose of xmlto is to convert an XML file to the desired format
|
||||
|
|
@ -47,6 +46,9 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
|
|||
%{_datadir}/xmlto/*
|
||||
|
||||
%changelog
|
||||
* Wed Mar 16 2022 Andrew Phelps <anphel@microsoft.com> - 0.0.28-7
|
||||
- Remove unneeded systemd requires
|
||||
|
||||
* Tue Feb 08 2022 Thomas Crain <thcrain@microsoft.com> - 0.0.28-6
|
||||
- Remove unused `%%define sha1` lines
|
||||
- License verified
|
||||
|
|
|
|||
|
|
@ -14203,8 +14203,8 @@
|
|||
"type": "other",
|
||||
"other": {
|
||||
"name": "ndctl",
|
||||
"version": "71.1",
|
||||
"downloadUrl": "https://github.com/pmem/ndctl/archive/v71.1.tar.gz"
|
||||
"version": "65",
|
||||
"downloadUrl": "https://github.com/pmem/ndctl/archive/v65.tar.gz"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче