diff --git a/README-replacement.in b/README-replacement.in deleted file mode 100644 index 6392cb49603110fcb902ceba6c87c31414620ba0..0000000000000000000000000000000000000000 --- a/README-replacement.in +++ /dev/null @@ -1,38 +0,0 @@ -Libguestfs is a set of tools and a library for accessing and modifying -guest disk images. For more information see the home page: - - http://libguestfs.org/ - -For discussion, development, patches, etc. please use the mailing -list: - - http://www.redhat.com/mailman/listinfo/libguestfs - -This Fedora package comes with a lot of help and examples to get you -started. - -The first place to start are the manual pages. Type: - - man guestfs - man guestfs-faq - man guestfs-release-notes - man guestfish - man virt-cat # and other virt-* tools - -If you install the libguestfs-devel package, then in the -/usr/share/doc/libguestfs-devel/ directory you will also -find: - - - BUGS: list of open bugs in this version - - - ChangeLog: the detailed list of changes in this version - - - ROADMAP: the roadmap for future versions - - - TODO: ideas for extending libguestfs - - - *.c: example C programs using the API - - - *.xml: example virt-inspector output - - - *.rng: virt-inspector RelaxNG schema diff --git a/README.en.md b/README.en.md deleted file mode 100644 index 78ba59ad4e5433a183e7a4f8a3cce1a456026f88..0000000000000000000000000000000000000000 --- a/README.en.md +++ /dev/null @@ -1,36 +0,0 @@ -# libguestfs - -#### Description -{**When you're done, you can delete the content in this README and update the file with details for others getting started with your repository**} - -#### Software Architecture -Software architecture description - -#### Installation - -1. xxxx -2. xxxx -3. xxxx - -#### Instructions - -1. xxxx -2. xxxx -3. xxxx - -#### Contribution - -1. Fork the repository -2. Create Feat_xxx branch -3. Commit your code -4. Create Pull Request - - -#### Gitee Feature - -1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md -2. Gitee blog [blog.gitee.com](https://blog.gitee.com) -3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore) -4. The most valuable open source project [GVP](https://gitee.com/gvp) -5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help) -6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/README.md b/README.md deleted file mode 100644 index 0013a52cb87e5fff731fdc8d2f5211cf87f9d296..0000000000000000000000000000000000000000 --- a/README.md +++ /dev/null @@ -1,39 +0,0 @@ -# libguestfs - -#### 介绍 -{**以下是码云平台说明，您可以替换此简介** -码云是 OSCHINA 推出的基于 Git 的代码托管平台（同时支持 SVN）。专为开发者提供稳定、高效、安全的云端软件开发协作平台 -无论是个人、团队、或是企业，都能够用码云实现代码托管、项目管理、协作开发。企业项目请看 [https://gitee.com/enterprises](https://gitee.com/enterprises)} - -#### 软件架构 -软件架构说明 - - -#### 安装教程 - -1. xxxx -2. xxxx -3. xxxx - -#### 使用说明 - -1. xxxx -2. xxxx -3. xxxx - -#### 参与贡献 - -1. Fork 本仓库 -2. 新建 Feat_xxx 分支 -3. 提交代码 -4. 新建 Pull Request - - -#### 码云特技 - -1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md -2. 码云官方博客 [blog.gitee.com](https://blog.gitee.com) -3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目 -4. [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目，是码云综合评定出的优秀开源项目 -5. 码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help) -6. 码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/libguestfs-1.39.8.tar.gz b/libguestfs-1.40.2.tar.gz similarity index 64% rename from libguestfs-1.39.8.tar.gz rename to libguestfs-1.40.2.tar.gz index fa8ab22b2519daf1ebc44b5d8de8d0d70295e7ce..548ca2b39fe549e9e9dec720c51edad9a037aa50 100644 Binary files a/libguestfs-1.39.8.tar.gz and b/libguestfs-1.40.2.tar.gz differ diff --git a/libguestfs.spec b/libguestfs.spec index 24b780700732f7ec05fe1a1a86a630a43ddb15b0..c34a06df28bf0e62074c28272e73218999724dae 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -3,16 +3,15 @@ %undefine _strict_symbol_defs_build Name: libguestfs -Version: 1.39.8 -Release: 5 +Version: 1.40.2 +Release: 6 Epoch: 1 Summary: A set of tools for accessing and modifying virtual machine (VM) disk images License: LGPLv2+ URL: http://libguestfs.org/ -Source0: http://libguestfs.org/download/1.38-stable/%{name}-%{version}.tar.gz -Source1: README-replacement.in -Source2: guestfish.sh -Source3: yum.conf.in +Source0: http://download.libguestfs.org/1.40-stable/libguestfs-1.40.2.tar.gz +Source1: guestfish.sh +Source2: 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 @@ -39,40 +38,40 @@ 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 +Obsoletes: %{name}-benchmarking < %{version}-%{release} %endif Provides: %{name}-forensics%{?_isa} %{name}-forensics -Obsoletes: %{name}-forensics +Obsoletes: %{name}-forensics < %{version}-%{release} Provides: %{name}-gfs2%{?_isa} %{name}-gfs2 -Obsoletes: %{name}-gfs2 +Obsoletes: %{name}-gfs2 < %{version}-%{release} Provides: %{name}-hfsplus%{?_isa} %{name}-hfsplus -Obsoletes: %{name}-hfsplus +Obsoletes: %{name}-hfsplus < %{version}-%{release} Provides: %{name}-jfs%{?_isa} %{name}-jfs -Obsoletes: %{name}-jfs +Obsoletes: %{name}-jfs < %{version}-%{release} Provides: %{name}-nilfs%{?_isa} %{name}-nilfs -Obsoletes: %{name}-nilfs +Obsoletes: %{name}-nilfs < %{version}-%{release} Provides: %{name}-reiserfs%{?_isa} %{name}-reiserfs -Obsoletes: %{name}-reiserfs +Obsoletes: %{name}-reiserfs < %{version}-%{release} Provides: %{name}-rsync%{?_isa} %{name}-rsync -Obsoletes: %{name}-rsync +Obsoletes: %{name}-rsync < %{version}-%{release} Provides: %{name}-rescue%{?_isa} %{name}-rescue -Obsoletes: %{name}-rescue +Obsoletes: %{name}-rescue < %{version}-%{release} Provides: %{name}-ufs%{?_isa} %{name}-ufs -Obsoletes: %{name}-ufs +Obsoletes: %{name}-ufs < %{version}-%{release} Provides: %{name}-xfs%{?_isa} %{name}-xfs -Obsoletes: %{name}-xfs +Obsoletes: %{name}-xfs < %{version}-%{release} Provides: %{name}-tools-c%{?_isa} %{name}-tools-c -Obsoletes: %{name}-tools-c +Obsoletes: %{name}-tools-c < %{version}-%{release} Provides: %{name}-tools%{?_isa} %{name}-tools -Obsoletes: %{name}-tools +Obsoletes: %{name}-tools < %{version}-%{release} Provides: virt-dib%{?_isa} virt-dib -Obsoletes: virt-dib +Obsoletes: virt-dib < %{version}-%{release} Provides: virt-v2v%{?_isa} virt-v2v -Obsoletes: virt-v2v +Obsoletes: virt-v2v < %{version}-%{release} Provides: virt-p2v-maker%{?_isa} virt-p2v-maker -Obsoletes: virt-p2v-maker +Obsoletes: virt-p2v-maker < %{version}-%{release} Provides: %{name}-bash-completion%{?_isa} %{name}-bash-completion -Obsoletes: %{name}-bash-completion +Obsoletes: %{name}-bash-completion < %{version}-%{release} %description libguestfs is a set of tools for accessing and modifying virtual machine (VM) disk images. @@ -177,9 +176,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 +Obsoletes: %{name}-man-pages-ja < %{version}-%{release} Provides: %{name}-man-pages-uk%{?_isa} %{name}-man-pages-uk -Obsoletes: %{name}-man-pages-uk +Obsoletes: %{name}-man-pages-uk < %{version}-%{release} %description help This package includes man files for %{name}. @@ -195,8 +194,6 @@ 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 @@ -208,7 +205,7 @@ 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)|" %{SOURCE3} > yum.conf + sed -e "s|@PWD@|$(pwd)|" %{SOURCE2} > yum.conf extra=--with-supermin-packager-config=$(pwd)/yum.conf fi @@ -303,7 +300,7 @@ mv packages-t packages cd - install -d $RPM_BUILD_ROOT%{_sysconfdir}/profile.d -install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d +install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d rm -rf $RPM_BUILD_ROOT%{_libdir}/ocaml/v2v_test_harness rm -rf $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs/dllv2v_test_harness* @@ -422,6 +419,12 @@ 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 diff --git a/yum.conf.in b/yum.conf.in index d5e30d0b78c8bae3164b0111638d1b3d3b6d2bde..c1fbe8e6492a29f0113fcf2ffd6648a438f21783 100644 --- a/yum.conf.in +++ b/yum.conf.in @@ -1,6 +1,7 @@ [main] cachedir=@PWD@/cachedir -debuglevel=1 +keepcache=0 +debuglevel=2 logfile=@PWD@/yum.log retries=20 obsoletes=1