Compare commits
23 Commits
Author | SHA1 | Date |
---|---|---|
Richard W.M. Jones | 6868ae6dc9 | |
Richard W.M. Jones | f7f7c57d23 | |
Richard W.M. Jones | aa423bb2ef | |
Richard W.M. Jones | 15e241691d | |
Richard W.M. Jones | 37d98a4b3e | |
Richard W.M. Jones | 246b4bd277 | |
Richard W.M. Jones | 0deb7b11d4 | |
Richard W.M. Jones | 8fd182627b | |
Richard W.M. Jones | f8a07e05e1 | |
Richard W.M. Jones | f7dbebf58e | |
Richard W.M. Jones | 25248aa8e4 | |
Richard W.M. Jones | 2f7d85fd85 | |
Richard W.M. Jones | 451663e6ac | |
Richard W.M. Jones | cd71d8d33a | |
Richard W.M. Jones | ee3fd0e5ef | |
Richard W.M. Jones | 78e81666e0 | |
Richard W.M. Jones | 2b58f2e7f5 | |
Richard W.M. Jones | 75e47a783b | |
Richard W.M. Jones | c739c90a4a | |
Richard W.M. Jones | 7622c61a59 | |
Richard W.M. Jones | 055d5bb77c | |
Richard W.M. Jones | cda8370501 | |
Richard W.M. Jones | 06eb82a75f |
|
@ -1,2 +1,3 @@
|
||||||
/clog
|
/clog
|
||||||
/nbdkit-*.tar.gz
|
/nbdkit-*.tar.gz
|
||||||
|
/nbdkit-*.tar.gz.sig
|
||||||
|
|
Binary file not shown.
75
nbdkit.spec
75
nbdkit.spec
|
@ -9,22 +9,40 @@
|
||||||
# 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 aarch64 x86_64
|
%global complete_test_arches x86_64
|
||||||
|
|
||||||
# Currently everything has Python 2. RHEL 7 doesn't have Python 3.
|
# Currently everything has Python 2. RHEL 7 doesn't have Python 3.
|
||||||
%if 0%{?rhel} != 7
|
%if 0%{?rhel} != 7
|
||||||
%global have_python3 1
|
%global have_python3 1
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
# If we should verify tarball signature with GPGv2.
|
||||||
|
%global verify_tarball_signature 1
|
||||||
|
|
||||||
|
# If there are patches which touch autotools files, set this to 1.
|
||||||
|
%global patches_touch_autotools %{nil}
|
||||||
|
|
||||||
|
# The source directory.
|
||||||
|
%global source_directory 1.2-stable
|
||||||
|
|
||||||
Name: nbdkit
|
Name: nbdkit
|
||||||
Version: 1.1.28
|
Version: 1.2.6
|
||||||
Release: 5%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: NBD server
|
Summary: NBD server
|
||||||
|
|
||||||
License: BSD
|
License: BSD
|
||||||
URL: https://github.com/libguestfs/nbdkit
|
URL: https://github.com/libguestfs/nbdkit
|
||||||
|
|
||||||
Source0: http://libguestfs.org/download/nbdkit/%{name}-%{version}.tar.gz
|
Source0: http://libguestfs.org/download/nbdkit/%{source_directory}/%{name}-%{version}.tar.gz
|
||||||
|
%if 0%{verify_tarball_signature}
|
||||||
|
Source1: http://libguestfs.org/download/nbdkit/%{source_directory}/%{name}-%{version}.tar.gz.sig
|
||||||
|
# Keyring used to verify tarball signature.
|
||||||
|
Source2: libguestfs.keyring
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if 0%{patches_touch_autotools}
|
||||||
|
BuildRequires: autoconf, automake, libtool
|
||||||
|
%endif
|
||||||
|
|
||||||
%if 0%{?rhel} == 7
|
%if 0%{?rhel} == 7
|
||||||
# On RHEL 7, nothing in the virt stack is shipped on aarch64 and
|
# On RHEL 7, nothing in the virt stack is shipped on aarch64 and
|
||||||
|
@ -59,6 +77,9 @@ BuildRequires: python3-devel
|
||||||
BuildRequires: ocaml >= 4.02.2
|
BuildRequires: ocaml >= 4.02.2
|
||||||
%endif
|
%endif
|
||||||
BuildRequires: ruby-devel
|
BuildRequires: ruby-devel
|
||||||
|
%if 0%{verify_tarball_signature}
|
||||||
|
BuildRequires: gnupg2
|
||||||
|
%endif
|
||||||
|
|
||||||
# Only for running the test suite:
|
# Only for running the test suite:
|
||||||
BuildRequires: /usr/bin/certtool
|
BuildRequires: /usr/bin/certtool
|
||||||
|
@ -300,6 +321,8 @@ Summary: Tar archive plugin for %{name}
|
||||||
License: BSD
|
License: BSD
|
||||||
|
|
||||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||||
|
# XXX This dependency should be autogenerated.
|
||||||
|
Requires: %{name}-plugin-perl
|
||||||
|
|
||||||
|
|
||||||
%description plugin-tar
|
%description plugin-tar
|
||||||
|
@ -364,12 +387,19 @@ plugins for %{name}.
|
||||||
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%if 0%{verify_tarball_signature}
|
||||||
%autopatch -p1
|
tmphome="$(mktemp -d)"
|
||||||
|
gpgv2 --homedir "$tmphome" --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
|
||||||
|
%endif
|
||||||
|
%autosetup -p1
|
||||||
|
%if 0%{patches_touch_autotools}
|
||||||
|
autoreconf -i
|
||||||
|
%endif
|
||||||
|
|
||||||
%ifnarch %{complete_test_arches}
|
%ifnarch %{complete_test_arches}
|
||||||
# Simplify the test suite so it doesn't require qemu.
|
# Simplify the test suite so it doesn't require qemu.
|
||||||
sed -i -e '/^if HAVE_LIBGUESTFS/,/^endif HAVE_LIBGUESTFS/d' tests/Makefile.am
|
sed -i -e '/^if HAVE_LIBGUESTFS/,/^endif HAVE_LIBGUESTFS/d' tests/Makefile.am
|
||||||
|
sed -i -e '/^if HAVE_GUESTFISH/,/^endif HAVE_GUESTFISH/d' tests/Makefile.am
|
||||||
autoreconf -i
|
autoreconf -i
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
@ -617,6 +647,39 @@ popd
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Aug 1 2018 Richard W.M. Jones <rjones@redhat.com> - 1.2.6-1
|
||||||
|
- New upstream version 1.2.6.
|
||||||
|
|
||||||
|
* Wed Jul 25 2018 Richard W.M. Jones <rjones@redhat.com> - 1.2.5-1
|
||||||
|
- New stable version 1.2.5.
|
||||||
|
- Small refactorings in the spec file.
|
||||||
|
|
||||||
|
* Sun Jul 1 2018 Richard W.M. Jones <rjones@redhat.com> - 1.2.4-3
|
||||||
|
- Add all upstream patches since 1.2.4 was released.
|
||||||
|
|
||||||
|
* Tue Jun 12 2018 Richard W.M. Jones <rjones@redhat.com> - 1.2.4-2
|
||||||
|
- Add all upstream patches since 1.2.4 was released.
|
||||||
|
|
||||||
|
* Sat Jun 9 2018 Richard W.M. Jones <rjones@redhat.com> - 1.2.4-1
|
||||||
|
- New stable version 1.2.4.
|
||||||
|
- Remove upstream patches.
|
||||||
|
- Enable tarball signatures.
|
||||||
|
- Add upstream patch to fix tests when guestfish not available.
|
||||||
|
|
||||||
|
* Wed Jun 6 2018 Richard W.M. Jones <rjones@redhat.com> - 1.2.3-1
|
||||||
|
- New stable version 1.2.3.
|
||||||
|
- Add patch to work around libvirt problem with relative socket paths.
|
||||||
|
- Add patch to fix the xz plugin test with recent guestfish.
|
||||||
|
|
||||||
|
* Sat Apr 21 2018 Richard W.M. Jones <rjones@redhat.com> - 1.2.2-1
|
||||||
|
- New stable version 1.2.2.
|
||||||
|
|
||||||
|
* Mon Apr 9 2018 Richard W.M. Jones <rjones@redhat.com> - 1.2.1-1
|
||||||
|
- New stable version 1.2.1.
|
||||||
|
|
||||||
|
* Fri Apr 6 2018 Richard W.M. Jones <rjones@redhat.com> - 1.2.0-1
|
||||||
|
- Move to stable branch version 1.2.0.
|
||||||
|
|
||||||
* Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.1.28-5
|
* Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.1.28-5
|
||||||
- Escape macros in %%changelog
|
- Escape macros in %%changelog
|
||||||
|
|
||||||
|
|
3
sources
3
sources
|
@ -1 +1,2 @@
|
||||||
SHA512 (nbdkit-1.1.28.tar.gz) = cbf40dffc773575a69d20edc42570bf63bd5f189ec0a3c4beeca7fca518ec969b94a15fdc834762f322c99145a95a015f5aad60edb078ba98c7b805583218fef
|
SHA512 (nbdkit-1.2.6.tar.gz) = 0eb171bb1f8f0bda9b424605512e90f16a30b2a11ae980c600c32309c667a99cedcd974adbd80c85fbf298f0b44b49974bade8164c0035fd8c96cd6e352d9421
|
||||||
|
SHA512 (nbdkit-1.2.6.tar.gz.sig) = f69df2c4656d9c3ca12b0a487631ef4a7978d5168d1fb0da3bb95856846e1d9672902c5ee175c42a1f16d344586507a4fbe8c3d8b9b683c5e31c1ace9b941e4f
|
||||||
|
|
Loading…
Reference in New Issue