New upstream stable version 1.42.0.
- Drop the benchmarking subpackage: moved to a new package upstream. - Enable Vala bindings.
This commit is contained in:
Richard W.M. Jones
parent
42818e7e23
commit
dd205f300a
|
|
@ -0,0 +1,41 @@
|
|||
From 31e6b187100626cae44bcb505db153088245155c Mon Sep 17 00:00:00 2001
|
||||
From: "Richard W.M. Jones" <rjones@redhat.com>
|
||||
Date: Mon, 9 Mar 2020 17:31:55 +0000
|
||||
Subject: [PATCH] po: Remove virt-v2v related dependency from POTFILES-ml.
|
||||
|
||||
Causes this error if you compile libguestfs 1.42.0 from the tarball
|
||||
without invoking the generator:
|
||||
|
||||
make[4]: *** No rule to make target '../common/mlv2v/uefi.ml', needed by 'libguestfs.pot'. Stop.
|
||||
---
|
||||
Makefile.am | 1 +
|
||||
po/POTFILES-ml | 1 -
|
||||
2 files changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index 27f2c6eed..2f0446d60 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -345,6 +345,7 @@ po/POTFILES-ml: configure.ac
|
||||
cd $(srcdir); \
|
||||
find builder common/ml* customize dib get-kernel resize sparsify sysprep -name '*.ml' | \
|
||||
grep -v '^builder/templates/' | \
|
||||
+ grep -v '^common/mlv2v/' | \
|
||||
grep -v -E '.*_tests\.ml$$' | \
|
||||
LC_ALL=C sort > $@-t
|
||||
mv $@-t $@
|
||||
diff --git a/po/POTFILES-ml b/po/POTFILES-ml
|
||||
index a9b6efdaa..2fbdff03d 100644
|
||||
--- a/po/POTFILES-ml
|
||||
+++ b/po/POTFILES-ml
|
||||
@@ -41,7 +41,6 @@ common/mltools/urandom.ml
|
||||
common/mltools/xpath_helpers.ml
|
||||
common/mlutils/c_utils.ml
|
||||
common/mlutils/unix_utils.ml
|
||||
-common/mlv2v/uefi.ml
|
||||
common/mlvisit/visit.ml
|
||||
common/mlxml/xml.ml
|
||||
customize/append_line.ml
|
||||
--
|
||||
2.25.0
|
||||
|
||||
|
|
@ -33,7 +33,7 @@
|
|||
%global patches_touch_autotools %{nil}
|
||||
|
||||
# The source directory.
|
||||
%global source_directory 1.41-development
|
||||
%global source_directory 1.42-stable
|
||||
|
||||
# Filter perl provides.
|
||||
%{?perl_default_filter}
|
||||
|
|
@ -44,8 +44,8 @@
|
|||
Summary: Access and modify virtual machine disk images
|
||||
Name: libguestfs
|
||||
Epoch: 1
|
||||
Version: 1.41.8
|
||||
Release: 9%{?dist}
|
||||
Version: 1.42.0
|
||||
Release: 1%{?dist}
|
||||
License: LGPLv2+
|
||||
|
||||
# No kernel https://fedoraproject.org/wiki/Changes/Stop_Building_i686_Kernels
|
||||
|
|
@ -76,6 +76,9 @@ Source7: libguestfs.keyring
|
|||
BuildRequires: autoconf, automake, libtool, gettext-devel
|
||||
%endif
|
||||
|
||||
# Upstream patch which fixes build from tarball.
|
||||
Patch1: 0001-po-Remove-virt-v2v-related-dependency-from-POTFILES-.patch
|
||||
|
||||
# Basic build requirements for the library and virt tools.
|
||||
BuildRequires: gcc, gcc-c++
|
||||
BuildRequires: rpcgen
|
||||
|
|
@ -161,6 +164,7 @@ BuildRequires: ruby-irb
|
|||
BuildRequires: php-devel
|
||||
BuildRequires: gobject-introspection-devel
|
||||
BuildRequires: gjs
|
||||
BuildRequires: vala
|
||||
%ifarch %{golang_arches}
|
||||
BuildRequires: golang
|
||||
# This version is required for aarch64 to be supported by gcc-go.
|
||||
|
|
@ -280,7 +284,6 @@ For enhanced features, install:
|
|||
For developers:
|
||||
|
||||
libguestfs-devel C/C++ header files and library
|
||||
libguestfs-benchmarking Benchmarking utilities
|
||||
|
||||
Language bindings:
|
||||
|
||||
|
|
@ -294,20 +297,7 @@ Language bindings:
|
|||
php-libguestfs PHP bindings
|
||||
python3-libguestfs Python 3 bindings
|
||||
ruby-libguestfs Ruby bindings
|
||||
|
||||
|
||||
%ifarch aarch64 x86_64
|
||||
%package benchmarking
|
||||
Summary: Benchmarking utilities for %{name}
|
||||
Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
|
||||
|
||||
|
||||
%description benchmarking
|
||||
%{name}-benchmarking contains utilities for benchmarking and
|
||||
performance analysis of %{name}, and also for general
|
||||
understanding of the performance of the kernel and qemu when booting
|
||||
small appliances.
|
||||
%endif
|
||||
libguestfs-vala Vala language bindings
|
||||
|
||||
|
||||
%package devel
|
||||
|
|
@ -708,6 +698,17 @@ This package is needed if you want to write software using the
|
|||
GObject bindings. It also contains GObject Introspection information.
|
||||
|
||||
|
||||
%package vala
|
||||
Summary: Vala for %{name}
|
||||
Requires: %{name}-devel%{?_isa} = %{epoch}:%{version}-%{release}
|
||||
Requires: vala
|
||||
|
||||
|
||||
%description vala
|
||||
%{name}-vala contains GObject bindings for %{name}.
|
||||
|
||||
|
||||
|
||||
%ifarch %{golang_arches}
|
||||
%package -n golang-guestfs
|
||||
Summary: Golang bindings for %{name}
|
||||
|
|
@ -791,6 +792,7 @@ fi
|
|||
--disable-golang \
|
||||
%endif
|
||||
--without-java \
|
||||
--disable-erlang \
|
||||
$extra
|
||||
|
||||
# Building index-parse.c by hand works around a race condition in the
|
||||
|
|
@ -919,15 +921,6 @@ install -m 0644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
|
|||
# Remove the .gitignore file from ocaml/html which will be copied to docdir.
|
||||
rm ocaml/html/.gitignore
|
||||
|
||||
%ifarch aarch64 x86_64
|
||||
# Copy the benchmarking tools and man pages, since upstream doesn't
|
||||
# install them by default. NB Don't install the libtool wrapper scripts.
|
||||
libtool --mode=install install -m 0755 utils/boot-analysis/boot-analysis $RPM_BUILD_ROOT%{_bindir}/libguestfs-boot-analysis
|
||||
libtool --mode=install install -m 0755 utils/boot-benchmark/boot-benchmark $RPM_BUILD_ROOT%{_bindir}/libguestfs-boot-benchmark
|
||||
install -m 0755 utils/boot-benchmark/boot-benchmark-range.pl $RPM_BUILD_ROOT%{_bindir}/libguestfs-boot-benchmark-range.pl
|
||||
install -m 0644 utils/boot-analysis/boot-analysis.1 $RPM_BUILD_ROOT%{_mandir}/man1/libguestfs-boot-analysis.1
|
||||
install -m 0644 utils/boot-benchmark/boot-benchmark.1 $RPM_BUILD_ROOT%{_mandir}/man1/libguestfs-boot-benchmark.1
|
||||
%endif
|
||||
|
||||
# Find locale files.
|
||||
%find_lang %{name}
|
||||
|
|
@ -948,16 +941,6 @@ install -m 0644 utils/boot-benchmark/boot-benchmark.1 $RPM_BUILD_ROOT%{_mandir}/
|
|||
%{_mandir}/man1/libguestfs-test-tool.1*
|
||||
|
||||
|
||||
%ifarch aarch64 x86_64
|
||||
%files benchmarking
|
||||
%{_bindir}/libguestfs-boot-analysis
|
||||
%{_bindir}/libguestfs-boot-benchmark
|
||||
%{_bindir}/libguestfs-boot-benchmark-range.pl
|
||||
%{_mandir}/man1/libguestfs-boot-analysis.1*
|
||||
%{_mandir}/man1/libguestfs-boot-benchmark.1*
|
||||
%endif
|
||||
|
||||
|
||||
%files devel
|
||||
%doc AUTHORS BUGS ChangeLog.gz HACKING TODO README
|
||||
%doc examples/*.c
|
||||
|
|
@ -1178,6 +1161,11 @@ install -m 0644 utils/boot-benchmark/boot-benchmark.1 $RPM_BUILD_ROOT%{_mandir}/
|
|||
%{_mandir}/man3/guestfs-gobject.3*
|
||||
|
||||
|
||||
%files vala
|
||||
%{_datadir}/vala/vapi/libguestfs-gobject-1.0.deps
|
||||
%{_datadir}/vala/vapi/libguestfs-gobject-1.0.vapi
|
||||
|
||||
|
||||
%ifarch %{golang_arches}
|
||||
%files -n golang-guestfs
|
||||
%doc golang/examples/*.go
|
||||
|
|
@ -1200,6 +1188,11 @@ install -m 0644 utils/boot-benchmark/boot-benchmark.1 $RPM_BUILD_ROOT%{_mandir}/
|
|||
|
||||
|
||||
%changelog
|
||||
* Mon Mar 09 2020 Richard W.M. Jones <rjones@redhat.com> - 1:1.42.0-1
|
||||
- New upstream stable version 1.42.0.
|
||||
- Drop the benchmarking subpackage: moved to a new package upstream.
|
||||
- Enable Vala bindings.
|
||||
|
||||
* Thu Feb 27 2020 Richard W.M. Jones <rjones@redhat.com> - 1:1.41.8-9
|
||||
- OCaml 4.10.0 final.
|
||||
|
||||
|
|
|
|||
4
sources
4
sources
|
|
@ -1,2 +1,2 @@
|
|||
SHA512 (libguestfs-1.41.8.tar.gz) = 25c3d8163305bb630eeb14a90a12639b77179e011d7f22a3d12a531b821b9be6a0601b75e9b02a0a2b3eaca747ec2bee98c8fa00b551a1b134f665837ef74f72
|
||||
SHA512 (libguestfs-1.41.8.tar.gz.sig) = 410b7c6c353270279379394aaeb2f0dd16f1e228faba408960bce1fb87a952800d2e590aeb856a00862261cd2f4e1210acd2402d9e2f397c8c81ee50aaed2578
|
||||
SHA512 (libguestfs-1.42.0.tar.gz) = cb53377582506c3fd3dec27482bef60c9204f63f05bbab8317fb7a02169f0fe1a4c4fb816513e5fa296bda3791cde4155adca6f18759a98db17f6d9b63637a30
|
||||
SHA512 (libguestfs-1.42.0.tar.gz.sig) = 68cef3d4d1cd6fd31b5f390ea55b1b03c789dfe85f3297cdb6214abec8be4833721ec8393b7d962931dd947df814613f4e22b4959817207b27bea4d02b775ac6
|
||||
|
|
|
|||
Loading…
Reference in New Issue