From 3d6813bbc89c69c6ff6b7b9f1959f185d89abedd Mon Sep 17 00:00:00 2001 From: hht8 Date: Thu, 28 May 2020 17:02:22 +0800 Subject: [PATCH] Add libguestfs.yaml and Deleteunnecessaryoperations --- libguestfs.spec | 135 ++++++++++++++++++++++++++++-------------------- libguestfs.yaml | 4 ++ 2 files changed, 83 insertions(+), 56 deletions(-) create mode 100644 libguestfs.yaml diff --git a/libguestfs.spec b/libguestfs.spec index c34a06d..f7c77d6 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -3,15 +3,16 @@ %undefine _strict_symbol_defs_build Name: libguestfs -Version: 1.40.2 -Release: 6 +Version: 1.39.8 +Release: 4 Epoch: 1 Summary: A set of tools for accessing and modifying virtual machine (VM) disk images License: LGPLv2+ URL: http://libguestfs.org/ -Source0: http://download.libguestfs.org/1.40-stable/libguestfs-1.40.2.tar.gz -Source1: guestfish.sh -Source2: yum.conf.in +Source0: http://libguestfs.org/download/1.38-stable/%{name}-%{version}.tar.gz +Source1: README-replacement.in +Source2: guestfish.sh +Source3: yum.conf.in 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 @@ -27,51 +28,58 @@ BuildRequires: bzip2, coreutils, cpio, cryptsetup, debootstrap, dhclient, diffut BuildRequires: grep, gzip, hivex, iproute, iputils, jfsutils, kernel, 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 +%ifnarch aarch64 +BuildRequires: zfs-fuse +%endif %ifarch x86_64 BuildRequires: syslinux syslinux-extlinux %endif Requires: supermin >= 5.1.18, augeas-libs%{?_isa} >= 1.7.0, libacl%{?_isa}, libcap%{?_isa}, hivex%{?_isa}, pcre%{?_isa}, libselinux%{?_isa}, systemd-libs%{?_isa} Requires: yajl%{?_isa}, libdb-utils, fuse, /usr/bin/qemu-img, libvirt-daemon-kvm >= 0.10.2-3, selinux-policy >= 3.11.1-63, bundled(gnulib), /usr/bin/hexedit, binutils -Requires: /usr/bin/less, /usr/bin/vi, gnupg2, xz, curl, perl(Sys::Virt), perl(Win::Hivex) >= 1.2.7, gawk, gzip, unzip, /usr/bin/virsh +Requires: /usr/bin/less, /usr/bin/vi, gnupg2, xz, curl, perl(Sys::Virt), perl(Win::Hivex) >= 1.2.7, gawk, gzip, unzip, /usr/bin/virsh, mingw32-srvany >= 1.0-13 Suggests: osinfo-db Recommends: libguestfs-xfs, nbdkit, nbdkit-plugin-python3, nbdkit-plugin-vddk Conflicts: libguestfs-winsupport %ifarch aarch64 x86_64 Provides: %{name}-benchmarking%{?_isa} %{name}-benchmarking -Obsoletes: %{name}-benchmarking < %{version}-%{release} +Obsoletes: %{name}-benchmarking %endif Provides: %{name}-forensics%{?_isa} %{name}-forensics -Obsoletes: %{name}-forensics < %{version}-%{release} +Obsoletes: %{name}-forensics Provides: %{name}-gfs2%{?_isa} %{name}-gfs2 -Obsoletes: %{name}-gfs2 < %{version}-%{release} +Obsoletes: %{name}-gfs2 Provides: %{name}-hfsplus%{?_isa} %{name}-hfsplus -Obsoletes: %{name}-hfsplus < %{version}-%{release} +Obsoletes: %{name}-hfsplus Provides: %{name}-jfs%{?_isa} %{name}-jfs -Obsoletes: %{name}-jfs < %{version}-%{release} +Obsoletes: %{name}-jfs Provides: %{name}-nilfs%{?_isa} %{name}-nilfs -Obsoletes: %{name}-nilfs < %{version}-%{release} +Obsoletes: %{name}-nilfs Provides: %{name}-reiserfs%{?_isa} %{name}-reiserfs -Obsoletes: %{name}-reiserfs < %{version}-%{release} +Obsoletes: %{name}-reiserfs Provides: %{name}-rsync%{?_isa} %{name}-rsync -Obsoletes: %{name}-rsync < %{version}-%{release} +Obsoletes: %{name}-rsync Provides: %{name}-rescue%{?_isa} %{name}-rescue -Obsoletes: %{name}-rescue < %{version}-%{release} +Obsoletes: %{name}-rescue Provides: %{name}-ufs%{?_isa} %{name}-ufs -Obsoletes: %{name}-ufs < %{version}-%{release} +Obsoletes: %{name}-ufs Provides: %{name}-xfs%{?_isa} %{name}-xfs -Obsoletes: %{name}-xfs < %{version}-%{release} +Obsoletes: %{name}-xfs +%ifnarch aarch64 +Provides: %{name}-zfs%{?_isa} %{name}-zfs +Obsoletes: %{name}-zfs +%endif Provides: %{name}-tools-c%{?_isa} %{name}-tools-c -Obsoletes: %{name}-tools-c < %{version}-%{release} +Obsoletes: %{name}-tools-c Provides: %{name}-tools%{?_isa} %{name}-tools -Obsoletes: %{name}-tools < %{version}-%{release} +Obsoletes: %{name}-tools Provides: virt-dib%{?_isa} virt-dib -Obsoletes: virt-dib < %{version}-%{release} +Obsoletes: virt-dib Provides: virt-v2v%{?_isa} virt-v2v -Obsoletes: virt-v2v < %{version}-%{release} +Obsoletes: virt-v2v Provides: virt-p2v-maker%{?_isa} virt-p2v-maker -Obsoletes: virt-p2v-maker < %{version}-%{release} +Obsoletes: virt-p2v-maker Provides: %{name}-bash-completion%{?_isa} %{name}-bash-completion -Obsoletes: %{name}-bash-completion < %{version}-%{release} +Obsoletes: %{name}-bash-completion %description libguestfs is a set of tools for accessing and modifying virtual machine (VM) disk images. @@ -138,12 +146,27 @@ This package includes python 3 bindings for %{name}. %package -n ruby-%{name} Summary: Ruby bindings for %{name} -Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}, ruby(release), ruby -Provides: ruby(guestfs) = %{version} +Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}, ruby(release), ruby, ruby(guestfs) = %{version} %description -n ruby-%{name} This package includes ruby bindings for %{name}. +%package java +Summary: Java bindings for %{name} +Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}, java-headless >= 1.5.0, jpackage-utils +Provides: %{name}-javadoc%{?_isa} %{name}-javadoc +Obsoletes: %{name}-javadoc + +%description java +This package includes java bindings for %{name}. + +%package java-devel +Summary: Development files of java bindings for %{name} +Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}, %{name}-java = %{epoch}:%{version}-%{release} + +%description java-devel +This package includes development files of java bindings for %{name}. + %package -n php-%{name} Summary: PHP bindings for %{name} Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}, php(zend-abi) = %{php_zend_api}, php(api) = %{php_core_api} @@ -176,9 +199,9 @@ This package includes development files of GOBject bindings for %{name}. Summary: man files for %{name} Requires: man Provides: %{name}-man-pages-ja%{?_isa} %{name}-man-pages-ja -Obsoletes: %{name}-man-pages-ja < %{version}-%{release} +Obsoletes: %{name}-man-pages-ja Provides: %{name}-man-pages-uk%{?_isa} %{name}-man-pages-uk -Obsoletes: %{name}-man-pages-uk < %{version}-%{release} +Obsoletes: %{name}-man-pages-uk %description help This package includes man files for %{name}. @@ -194,26 +217,19 @@ if [ "$(stat -f -L -c %T .)" != "nfs" ] && [ "$(getenforce | tr '[A-Z]' '[a-z]') chcon --reference=/tmp tmp fi +mv README README.orig +sed 's/@VERSION@/%{version}/g' < %{SOURCE1} > README sed -i 's/FEDORA | RHEL | CENTOS)/FEDORA | RHEL | CENTOS | EULEROS | GENERIC)/g' configure %build ip addr list ||: ip route list ||: -if ping -c 3 -w 20 8.8.8.8 && wget http://libguestfs.org -O /dev/null; then - extra= -else - install -d cachedir repo - find /.pkgs/ -type f -name '*.rpm' -print0 | xargs -0 -n 1 cp -t repo - createrepo repo - sed -e "s|@PWD@|$(pwd)|" %{SOURCE2} > yum.conf - extra=--with-supermin-packager-config=$(pwd)/yum.conf -fi +extra= %global localconfigure \ %{configure} \\\ --with-default-backend=libvirt \\\ - --with-extra="libvirt" \\\ - --without-java \\\ + --with-extra="fedora=%{fedora},release=%{release},libvirt" \\\ $extra %global localconfigure %{localconfigure} --disable-golang @@ -261,6 +277,8 @@ find $RPM_BUILD_ROOT -name perllocal.pod -delete find $RPM_BUILD_ROOT -name '*.bs' -delete find $RPM_BUILD_ROOT -name 'bindtests.pl' -delete +mv $RPM_BUILD_ROOT%{_datadir}/java/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_datadir}/java/%{name}.jar + mv $RPM_BUILD_ROOT%{_docdir}/libguestfs installed-docs gzip --best installed-docs/*.xml @@ -293,6 +311,9 @@ move_to strace zz-packages-rescue move_to vim-minimal zz-packages-rescue move_to rsync zz-packages-rsync move_to xfsprogs zz-packages-xfs +%ifnarch aarch64 +move_to zfs-fuse zz-packages-zfs +%endif sed 's/^kernel-.*/kernel/' < packages > packages-t @@ -300,7 +321,12 @@ mv packages-t packages cd - install -d $RPM_BUILD_ROOT%{_sysconfdir}/profile.d -install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d +install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d + +install -d $RPM_BUILD_ROOT%{_datadir}/virt-tools +cd $RPM_BUILD_ROOT%{_datadir}/virt-tools +ln -sf /usr/i686-w64-mingw32/sys-root/mingw/bin/rhsrvany.exe +cd - rm -rf $RPM_BUILD_ROOT%{_libdir}/ocaml/v2v_test_harness rm -rf $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs/dllv2v_test_harness* @@ -332,6 +358,9 @@ install -m 0644 utils/boot-benchmark/boot-benchmark.1 $RPM_BUILD_ROOT%{_mandir}/ %{_datadir}/virt-* %{_libdir}/virt-* %{_libdir}/guestfs/ +%ifarch aarch64 +%exclude %{_libdir}/guestfs/supermin.d/zz-packages-zfs +%endif %{_libdir}/libguestfs.so.* %config(noreplace) %{_sysconfdir}/libguestfs-tools.conf %{_sysconfdir}/virt-builder @@ -387,6 +416,15 @@ install -m 0644 utils/boot-benchmark/boot-benchmark.1 $RPM_BUILD_ROOT%{_mandir}/ %{ruby_vendorlibdir}/guestfs.rb %{ruby_vendorarchdir}/_guestfs.so +%files java +%{_libdir}/libguestfs_jni*.so.* +%{_datadir}/java/*.jar +%{_javadocdir}/%{name} + +%files java-devel +%doc java/examples/*.java +%{_libdir}/libguestfs_jni*.so + %files -n php-%{name} %doc php/README-PHP %dir %{_sysconfdir}/php.d @@ -419,23 +457,8 @@ install -m 0644 utils/boot-benchmark/boot-benchmark.1 $RPM_BUILD_ROOT%{_mandir}/ %exclude %{_mandir}/man1/virt-tar.1* %changelog -* Tue Mar 10 2020 yangjian - 1:1.40.2-6 -- Type:NA -- ID:NA -- SUG:NA -- DESC: Change Source to available address - -* Mon Mar 9 2020 hy - 1:1.39.8-5 -- Type:NA -- ID:NA -- SUG:NA -- DESC: delete the unused require mingw32-srvany - -* Sat Mar 7 2020 hy - 1:1.39.8-4 -- Type:NA -- ID:NA -- SUG:NA -- DESC:Remove Java bingdings, zz-packages-zfs command and rhsrvany.exe from mingw32-srvany. +* Thu Mar 28 2020 huanghaitao - 1:1.39.8-4 +- Delete unnecessary operations * Mon Dec 16 2019 zoujing - 1:1.39.8-3 - Type:NA diff --git a/libguestfs.yaml b/libguestfs.yaml new file mode 100644 index 0000000..60cddde --- /dev/null +++ b/libguestfs.yaml @@ -0,0 +1,4 @@ +version_control: github +src_repo: libguestfs/libguestfs +tag_pattern: ^v +seperator: . -- Gitee