commit 712102b744988cfd78be9b6aa56b2217cf64bb96
Author: Jakub Bogusz <qbo...@pld-linux.org>
Date: Tue Jun 18 21:31:21 2024 +0200
- updated to 1.52.1
appliance-pld.patch | 27 ++++++++-------------------
libguestfs.spec | 12 ++++++------
2 files changed, 14 insertions(+), 25 deletions(-)
---
diff --git a/libguestfs.spec b/libguestfs.spec
index e8ef1f6..00109a9 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -37,12 +37,12 @@
Summary: Library and tools for accessing and modifying virtual machine
disk images
Summary(pl.UTF-8): Biblioteka i narzędzia do dostępu i modyfikacji obrazów
dysków maszyn wirtualnych
Name: libguestfs
-Version: 1.50.1
-Release: 2
+Version: 1.52.1
+Release: 1
License: LGPL v2+
Group: Libraries
-Source0:
https://libguestfs.org/download/1.50-stable/%{name}-%{version}.tar.gz
-# Source0-md5: eea08678d34a856dea49ef688634a341
+Source0:
https://download.libguestfs.org/1.52-stable/%{name}-%{version}.tar.gz
+# Source0-md5: 5465be85dd004775f4f2f4adee1af5b2
Patch0: ncurses.patch
Patch1: augeas-libxml2.patch
Patch2: %{name}-completionsdir.patch
@@ -75,7 +75,7 @@ BuildRequires: libvirt-devel >= 0.10.2
BuildRequires: libxml2-devel >= 2.0
BuildRequires: libxml2-progs
BuildRequires: ncurses-devel
-BuildRequires: ocaml >= 1:4.04
+BuildRequires: ocaml >= 1:4.07
BuildRequires: ocaml-augeas-devel
BuildRequires: ocaml-findlib
BuildRequires: ocaml-hivex-devel
@@ -99,7 +99,7 @@ BuildRequires: systemd-devel >= 1:196
BuildRequires: xz
BuildRequires: xz-devel
BuildRequires: yara-devel >= 4.0.0
-BuildRequires: zstd
+BuildRequires: zstd-devel
%if %{with appliance}
BuildRequires: supermin >= 5.2.2-2
%endif
diff --git a/appliance-pld.patch b/appliance-pld.patch
index 614f964..7561076 100644
--- a/appliance-pld.patch
+++ b/appliance-pld.patch
@@ -1,17 +1,17 @@
---- libguestfs-1.50.1.orig/m4/guestfs-appliance.m4 2023-02-20
13:08:27.926251990 +0100
-+++ libguestfs-1.50.1/m4/guestfs-appliance.m4 2023-06-24 11:33:37.996124936
+0200
-@@ -129,7 +129,7 @@
+--- libguestfs-1.52.1/m4/guestfs-appliance.m4.orig 2024-06-18
06:02:35.802278052 +0200
++++ libguestfs-1.52.1/m4/guestfs-appliance.m4 2024-06-18 19:53:54.552061673
+0200
+@@ -130,7 +130,7 @@ if test "x$ENABLE_APPLIANCE" = "xyes"; t
AC_SUBST([DISTRO])
fi
AM_CONDITIONAL([HAVE_RPM],
-- [AS_CASE([$DISTRO], [REDHAT | SUSE | OPENMANDRIVA | MAGEIA ], [true],
-+ [AS_CASE([$DISTRO], [REDHAT | SUSE | OPENMANDRIVA | MAGEIA | PLD ],
[true],
+- [AS_CASE([$DISTRO], [REDHAT | SUSE | OPENMANDRIVA | MAGEIA | OPENCLOUDOS
], [true],
++ [AS_CASE([$DISTRO], [REDHAT | SUSE | OPENMANDRIVA | MAGEIA | OPENCLOUDOS
| PLD ], [true],
[*], [false])])
AM_CONDITIONAL([HAVE_DPKG],
[AS_CASE([$DISTRO], [DEBIAN | UBUNTU ], [true],
---- libguestfs-1.50.1.orig/appliance/packagelist.in 2023-02-21
21:39:30.320831356 +0100
-+++ libguestfs-1.50.1/appliance/packagelist.in 2023-06-25 20:41:33.719990490
+0200
-@@ -214,6 +214,27 @@
+--- libguestfs-1.52.1/appliance/packagelist.in.orig 2024-05-13
15:12:19.002830902 +0200
++++ libguestfs-1.52.1/appliance/packagelist.in 2024-06-18 06:02:35.802278052
+0200
+@@ -238,6 +238,27 @@ ifelse(OPENCLOUDOS,1,
zstd
)
@@ -39,14 +39,3 @@
include(guestfsd.deps)
acl
-@@ -290,6 +311,10 @@
- qemu-img
- which
- )
-+ifelse(PLD,1,
-+ qemu-img
-+ which
-+)
- curl
- kpartx
- dnl (virt-dib) tools optionally used for elements
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libguestfs.git/commitdiff/712102b744988cfd78be9b6aa56b2217cf64bb96
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
