Compare commits
10 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
34179eda22 | ||
|
|
6c6a9b2ba1 | ||
|
|
1c3c810504 | ||
|
|
7bf5ff8e0e | ||
|
|
6ea00cfb6c | ||
|
|
adee476de7 | ||
|
|
b98f29c18b | ||
|
|
f3beaa5264 | ||
|
|
6545277573 | ||
|
|
dfb0f42367 |
4 changed files with 26 additions and 36 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -1,3 +1,4 @@
|
||||||
/clog
|
/clog
|
||||||
/nbdkit-*.tar.gz
|
/nbdkit-*.tar.gz
|
||||||
/nbdkit-*.tar.gz.sig
|
/nbdkit-*.tar.gz.sig
|
||||||
|
/*~
|
||||||
|
|
|
||||||
Binary file not shown.
57
nbdkit.spec
57
nbdkit.spec
|
|
@ -24,7 +24,7 @@
|
||||||
# On all other architectures, a simpler test suite must pass. This
|
# On all other architectures, a simpler test suite must pass. This
|
||||||
# omits any tests that run full qemu, since running qemu under TCG is
|
# omits any tests that run full qemu, since running qemu under TCG is
|
||||||
# often broken on non-x86_64 arches.
|
# often broken on non-x86_64 arches.
|
||||||
%global complete_test_arches x86_64
|
%global complete_test_arches NONE
|
||||||
|
|
||||||
# If the test suite is broken on a particular architecture, document
|
# If the test suite is broken on a particular architecture, document
|
||||||
# it as a bug and add it to this list.
|
# it as a bug and add it to this list.
|
||||||
|
|
@ -50,8 +50,8 @@ ExclusiveArch: x86_64
|
||||||
%global source_directory 1.26-stable
|
%global source_directory 1.26-stable
|
||||||
|
|
||||||
Name: nbdkit
|
Name: nbdkit
|
||||||
Version: 1.26.0
|
Version: 1.26.6
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
Summary: NBD server
|
Summary: NBD server
|
||||||
|
|
||||||
License: BSD
|
License: BSD
|
||||||
|
|
@ -108,9 +108,6 @@ BuildRequires: platform-python-devel
|
||||||
BuildRequires: python3-devel
|
BuildRequires: python3-devel
|
||||||
%endif
|
%endif
|
||||||
%if !0%{?rhel}
|
%if !0%{?rhel}
|
||||||
BuildRequires: python3-boto3
|
|
||||||
%endif
|
|
||||||
%if !0%{?rhel}
|
|
||||||
%if 0%{?have_ocaml}
|
%if 0%{?have_ocaml}
|
||||||
# Requires OCaml 4.02.2 which contains fix for
|
# Requires OCaml 4.02.2 which contains fix for
|
||||||
# http://caml.inria.fr/mantis/view.php?id=6693
|
# http://caml.inria.fr/mantis/view.php?id=6693
|
||||||
|
|
@ -461,24 +458,6 @@ This package lets you write Ruby plugins for %{name}.
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%if !0%{?rhel}
|
|
||||||
# In theory this is noarch, but because plugins are placed in _libdir
|
|
||||||
# which varies across architectures, RPM does not allow this.
|
|
||||||
%package S3-plugin
|
|
||||||
Summary: Amazon S3 and Ceph plugin for %{name}
|
|
||||||
License: BSD
|
|
||||||
|
|
||||||
Requires: %{name}-python-plugin >= 1.22
|
|
||||||
# XXX Should not need to add this.
|
|
||||||
Requires: python3-boto3
|
|
||||||
|
|
||||||
|
|
||||||
%description S3-plugin
|
|
||||||
This package lets you open disk images stored in Amazon S3
|
|
||||||
or Ceph using %{name}.
|
|
||||||
%endif
|
|
||||||
|
|
||||||
|
|
||||||
%package ssh-plugin
|
%package ssh-plugin
|
||||||
Summary: SSH plugin for %{name}
|
Summary: SSH plugin for %{name}
|
||||||
License: BSD
|
License: BSD
|
||||||
|
|
@ -810,9 +789,9 @@ for f in cc cdi torrent; do
|
||||||
rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/nbdkit-$f-plugin.so
|
rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/nbdkit-$f-plugin.so
|
||||||
rm -f $RPM_BUILD_ROOT%{_mandir}/man?/nbdkit-$f-plugin.*
|
rm -f $RPM_BUILD_ROOT%{_mandir}/man?/nbdkit-$f-plugin.*
|
||||||
done
|
done
|
||||||
|
%endif
|
||||||
rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/nbdkit-S3-plugin
|
rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/nbdkit-S3-plugin
|
||||||
rm -f $RPM_BUILD_ROOT%{_mandir}/man1/nbdkit-S3-plugin.1*
|
rm -f $RPM_BUILD_ROOT%{_mandir}/man1/nbdkit-S3-plugin.1*
|
||||||
%endif
|
|
||||||
|
|
||||||
|
|
||||||
%check
|
%check
|
||||||
|
|
@ -1051,15 +1030,6 @@ export LIBGUESTFS_TRACE=1
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%if !0%{?rhel}
|
|
||||||
%files S3-plugin
|
|
||||||
%doc README
|
|
||||||
%license LICENSE
|
|
||||||
%{_libdir}/%{name}/plugins/nbdkit-S3-plugin
|
|
||||||
%{_mandir}/man1/nbdkit-S3-plugin.1*
|
|
||||||
%endif
|
|
||||||
|
|
||||||
|
|
||||||
%files ssh-plugin
|
%files ssh-plugin
|
||||||
%doc README
|
%doc README
|
||||||
%license LICENSE
|
%license LICENSE
|
||||||
|
|
@ -1241,6 +1211,25 @@ export LIBGUESTFS_TRACE=1
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Feb 18 2022 Richard W.M. Jones <rjones@redhat.com> - 1.26.6-2
|
||||||
|
- Drop S3 subpackage, dependencies fail on F34
|
||||||
|
|
||||||
|
* Wed Sep 22 2021 Richard W.M. Jones <rjones@redhat.com> - 1.26.6-1
|
||||||
|
- New upstream stable version 1.26.6.
|
||||||
|
- Remove upstream patch.
|
||||||
|
|
||||||
|
* Fri Aug 20 2021 Eric Blake <eblake@redhat.com> - 1.26.5-1
|
||||||
|
- New upstream stable version 1.26.5; fixes CVE-2021-3716.
|
||||||
|
|
||||||
|
* Thu Aug 05 2021 Richard W.M. Jones <rjones@redhat.com> - 1.26.3-1
|
||||||
|
- New upstream stable version 1.26.3.
|
||||||
|
|
||||||
|
* Mon Jul 05 2021 Richard W.M. Jones <rjones@redhat.com> - 1.26.2-1
|
||||||
|
- New upstream stable version 1.26.2.
|
||||||
|
|
||||||
|
* Fri Jun 11 2021 Richard W.M. Jones <rjones@redhat.com> - 1.26.1-1
|
||||||
|
- New upstream stable version 1.26.1.
|
||||||
|
|
||||||
* Mon Jun 07 2021 Richard W.M. Jones <rjones@redhat.com> - 1.26.0-1
|
* Mon Jun 07 2021 Richard W.M. Jones <rjones@redhat.com> - 1.26.0-1
|
||||||
- New upstream version 1.26.0.
|
- New upstream version 1.26.0.
|
||||||
|
|
||||||
|
|
|
||||||
4
sources
4
sources
|
|
@ -1,2 +1,2 @@
|
||||||
SHA512 (nbdkit-1.26.0.tar.gz) = f5330a1ad47e45dfdfeed800af1fa5e5e02aa471da5cce45bf0d8f46f82655be8974bfc8fd2fd16a6cfc60349ada38675bc7e0b73b81f941d9022ac3cdda23ca
|
SHA512 (nbdkit-1.26.6.tar.gz) = 750e3d6e667aa028794f16f2d7c83f1be9a8dd0392b26bda3e720a619eeddb48554f8bdfb350c97228bba257ba5decf0940c5e324487c302b5a2b99785ad9b88
|
||||||
SHA512 (nbdkit-1.26.0.tar.gz.sig) = 838c10ecda260e801e5c760c9c61fa78a7713e6dd89fa7f3737259dcfeb64ebeba08ad2443190efe3190ef3c22617b1ca9cb4676a28512fd13708845e23a1d57
|
SHA512 (nbdkit-1.26.6.tar.gz.sig) = 6b1e180abb97e834affc66a211030688ea3e5a8dd66935d9cc2db64defe35ed36ce55200d5bb57e7508c08af03627677164a93478e5b8025e0e62cd447633e7f
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue