diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000000000000000000000000000000000..2f99f3f2ca231ba118096a2ce73646a6cdd781ec --- /dev/null +++ b/.gitattributes @@ -0,0 +1,3 @@ +*.gz filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text diff --git a/.lfsconfig b/.lfsconfig new file mode 100644 index 0000000000000000000000000000000000000000..77aff59f71c298870cdee4348e086e712888f2e7 --- /dev/null +++ b/.lfsconfig @@ -0,0 +1,2 @@ +[lfs] + url = https://artlfs.openeuler.openatom.cn/src-openEuler/libguestfs diff --git a/libguestfs-1.49.5.tar.gz b/libguestfs-1.49.5.tar.gz deleted file mode 100644 index 2a5b12b8895deb024f60f43399bbf8a027a3eaf1..0000000000000000000000000000000000000000 Binary files a/libguestfs-1.49.5.tar.gz and /dev/null differ diff --git a/libguestfs-1.50.2.tar.gz b/libguestfs-1.50.2.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..baac9d15f65ebe4c538b687683d2ebb7dc5d728d --- /dev/null +++ b/libguestfs-1.50.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:da11090bca076f17c50395971238fa994d50cf4510f7ff8448836f2f64c17923 +size 19010409 diff --git a/libguestfs.spec b/libguestfs.spec index 73ef5b7077ea280d9517e4290e65d98a33ebb939..b8f2cc11c2a206d55fda8344d76ea4f2bfbea990 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -3,13 +3,13 @@ %undefine _strict_symbol_defs_build Name: libguestfs -Version: 1.49.5 -Release: 4 +Version: 1.50.2 +Release: 1 Epoch: 1 Summary: A set of tools for accessing and modifying virtual machine (VM) disk images -License: LGPLv2+ -URL: http://libguestfs.org/ -Source0: https://download.libguestfs.org/1.49-development/libguestfs-1.49.5.tar.gz +License: LGPL-2.1-or-later +URL: https://libguestfs.org/ +Source0: https://download.libguestfs.org/1.50-stable/%{name}-%{version}.tar.gz Source1: guestfish.sh Source2: yum.conf.in Patch0001: 001-port-to-php-8.0.0.patch @@ -19,7 +19,7 @@ Patch0004: 0004-libguestfs-Support-openEuler.patch BuildRequires: gcc-c++, rpcgen, libtirpc-devel, supermin-devel >= 5.1.18, hivex-devel >= 1.2.7-7, ocaml-hivex-devel, perl(Pod::Simple), perl(Pod::Man) BuildRequires: /usr/bin/pod2text, po4a, augeas-devel >= 1.7.0, readline-devel, genisoimage, libxml2-devel, createrepo, glibc-static, libselinux-utils -BuildRequires: libselinux-devel, fuse, fuse-devel, pcre-devel, file-devel, libvirt-devel, gperf, flex, bison, libdb-utils, cpio, libconfig-devel, xz-devel +BuildRequires: libselinux-devel, fuse, fuse-devel, pcre-devel, zstd-devel, file-devel, libvirt-devel, gperf, flex, bison, libdb-utils, cpio, libconfig-devel, xz-devel BuildRequires: zip, unzip, systemd-units, netpbm-progs, icoutils, libvirt-daemon-qemu, perl(Expect), libacl-devel, libcap-devel, libldm-devel, jansson-devel BuildRequires: systemd-devel, bash-completion, /usr/bin/ping, /usr/bin/wget, curl, xz, gtk3-devel, dbus-devel, /usr/bin/qemu-img BuildRequires: ocaml, ocaml-ocamldoc, ocaml-findlib-devel, ocaml-gettext-devel, ocaml-ounit-devel, ocaml-libvirt-devel >= 0.6.1.4-5 @@ -31,7 +31,7 @@ BuildRequires: bzip2, coreutils, cpio, cryptsetup, debootstrap, dhclient, diffut BuildRequires: grep, gzip, hivex, iproute, iputils, jfsutils, kmod, kpartx, less, libcap, libldm, libselinux, libxml2, lsof, lsscsi, lvm2, strace BuildRequires: openssh-clients, parted, pciutils, pcre, policycoreutils, procps, psmisc, qemu-img, reiserfs-utils, rsync, scrub, sed, sleuthkit, squashfs-tools BuildRequires: systemd, tar, udev, util-linux, vim-minimal, which, xfsprogs, yajl, zerofree, hfsplus-tools, ntfs-3g, ntfsprogs gettext-devel binutils -BuildRequires: vala +BuildRequires: vala ocaml-augeas-devel %ifarch x86_64 BuildRequires: syslinux syslinux-extlinux %endif @@ -120,7 +120,7 @@ This package includes development files of ocaml bindings for %{name}. %package -n perl-Sys-Guestfs Summary: Perl bindings for %{name} -Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}, perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} %description -n perl-Sys-Guestfs This package includes perl bindings for %{name}. @@ -179,7 +179,7 @@ This package contains Vala bindings for %{name}. %package help Summary: man files for %{name} -Requires: man +Buildarch: noarch Provides: %{name}-man-pages-ja%{?_isa} %{name}-man-pages-ja Obsoletes: %{name}-man-pages-ja < %{version}-%{release} Provides: %{name}-man-pages-uk%{?_isa} %{name}-man-pages-uk @@ -191,19 +191,10 @@ This package includes man files for %{name}. %prep %autosetup -p1 -#automake 1.17 -sed -i "s|am__api_version='1.16|am__api_version='1.17|g" configure - -cd .. -cp -a %{name}-%{version} %{name}-%{version}-python3 -cd - - if [ "$(stat -f -L -c %T .)" != "nfs" ] && [ "$(getenforce | tr '[A-Z]' '[a-z]')" != "disabled" ]; then chcon --reference=/tmp tmp fi -sed -i 's/FEDORA | RHEL | CENTOS)/FEDORA | RHEL | CENTOS | OPENEULER | GENERIC)/g' configure - %build ip addr list ||: ip route list ||: @@ -236,33 +227,15 @@ autoreconf -f %{localconfigure} %{localmake} -cd ../%{name}-%{version}-python3 -autoreconf -f -export PYTHON=%{__python3} -while [ ! -f ../%{name}-%{version}/generator/.pod2text* ] -do - sleep 1 -done -cp ../%{name}-%{version}/generator/.pod2text* generator/ -%{localconfigure} --enable-python --enable-perl --disable-ruby --disable-haskell --disable-php --disable-erlang --disable-lua --disable-golang --disable-gobject -%{localmake} -cd - wait -%check - %install %make_install INSTALLDIRS=vendor NO_PACKLIST=1 - -cd ../%{name}-%{version}-python3 -%make_install INSTALLDIRS=vendor -C python -cd - +%delete_la rm $( find $RPM_BUILD_ROOT -name '*.a' | grep -v /ocaml/ ) -find $RPM_BUILD_ROOT -name '*.la' -delete - find $RPM_BUILD_ROOT -name perllocal.pod -delete find $RPM_BUILD_ROOT -name '*.bs' -delete find $RPM_BUILD_ROOT -name 'bindtests.pl' -delete @@ -365,6 +338,10 @@ rm -rf ocaml/html/.gitignore %lang(uk) %{_mandir}/uk/man*/* %changelog +* Sat Nov 02 2024 Funda Wang - 1:1.50.2-1 +- update to 1.50.2 +- drop useless workaround for multi-version of python + * Tue Sep 17 2024 wangguoquan -1:1.49.5-4 - libguestfs-Support-openEuler diff --git a/support_OPENEULER_to_configure.patch b/support_OPENEULER_to_configure.patch index b8a87eb5e43160bccb39ab18661a5ace721f062d..bb49d06eaeefd0a346dcc2d7d932a64d82cab6ae 100644 --- a/support_OPENEULER_to_configure.patch +++ b/support_OPENEULER_to_configure.patch @@ -4,61 +4,9 @@ Date: Thu, 9 Sep 2021 21:34:40 +0800 Subject: [PATCH] fix not striped --- - libguestfs/configure | 28 + 1 - libguestfs/m4/guestfs-appliance.m4 | 22 + 1 - - 2 files changed, 50 insertions(+), 2 deletions(-) + 1 files changed, 22 insertions(+), 1 deletions(-) -diff -ruN libguestfs/configure libguestfs-1.49.5/configure ---- libguestfs/configure 2022-11-16 23:45:04.603664947 +0800 -+++ libguestfs-1.49.5/configure 2022-11-17 01:11:33.528806347 +0800 -@@ -26381,7 +26381,7 @@ - fi ) | tr '[:lower:]' '[:upper:]' - )" - case $DISTRO in #( -- FEDORA | RHEL | CENTOS | ALMALINUX | CLOUDLINUX \ -+ FEDORA | RHEL | CENTOS | OPENEULER | ALMALINUX | CLOUDLINUX \ - | ROCKY) : - DISTRO=REDHAT ;; #( - OPENSUSE* | SLED | SLES) : -@@ -26395,11 +26395,37 @@ - esac - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DISTRO (from /etc/os-release)" >&5 - printf "%s\n" "$DISTRO (from /etc/os-release)" >&6; } -+ -+elif test -f /etc/openEuler-release; then -+ echo "/etc/openEuler-release:" >&5 -+ cat /etc/openEuler-release >&5 -+ DISTRO="$( -+ . /etc/openEuler-release -+ ( if test -n "$ID_LIKE"; then -+ echo $ID_LIKE | $AWK '{print $1}' -+ else -+ echo $ID -+ fi ) | tr '[:lower:]' '[:upper:]' -+ )" -+ case $DISTRO in #( -+ FEDORA | RHEL | CENTOS | OPENEULER | ALMALINUX | CLOUDLINUX \ -+ | ROCKY) : -+ DISTRO=REDHAT ;; #( -+ OPENSUSE* | SLED | SLES) : -+ DISTRO=SUSE ;; #( -+ ARCH | MANJARO | ARTIX) : -+ DISTRO=ARCHLINUX ;; #( -+ OPENMANDRIVA) : -+ DISTRO=OPENMANDRIVA ;; #( -+ *) : -+ ;; -+esac -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DISTRO (from /etc/openEuler-release)" >&5 -+printf "%s\n" "$DISTRO (from /etc/openEuler-release)" >&6; } - else - as_fn_error $? "/etc/os-release not available, please specify the distro using --with-distro=DISTRO" "$LINENO" 5 - fi - -- - fi - - diff -ruN libguestfs/m4/guestfs-appliance.m4 libguestfs-1.49.5/m4/guestfs-appliance.m4 --- libguestfs/m4/guestfs-appliance.m4 2022-11-16 23:45:04.608664963 +0800 +++ libguestfs-1.49.5/m4/guestfs-appliance.m4 2022-11-17 00:54:05.276385306 +0800 @@ -68,7 +16,7 @@ diff -ruN libguestfs/m4/guestfs-appliance.m4 libguestfs-1.49.5/m4/guestfs-applia AS_CASE([$DISTRO], - [FEDORA | RHEL | CENTOS | ALMALINUX | CLOUDLINUX \ + [FEDORA | RHEL | CENTOS | OPENEULER | ALMALINUX | CLOUDLINUX \ - | ROCKY], + | ROCKY | VIRTUOZZO], [DISTRO=REDHAT], [OPENSUSE* | SLED | SLES],[DISTRO=SUSE], [ARCH | MANJARO | ARTIX],[DISTRO=ARCHLINUX],