From 72ea4ee01d61781918dd3439150541066ed6fedc Mon Sep 17 00:00:00 2001 From: ChengyuZhu6 Date: Tue, 10 Mar 2026 16:45:05 +0800 Subject: [PATCH] upgrade to 1.9.1 Signed-off-by: ChengyuZhu6 --- erofs-utils.spec | 55 +++++++++++++++++++++++++++++++++--------------- sources | 2 +- 2 files changed, 39 insertions(+), 18 deletions(-) diff --git a/erofs-utils.spec b/erofs-utils.spec index a57e4ed..89bac2f 100644 --- a/erofs-utils.spec +++ b/erofs-utils.spec @@ -1,31 +1,42 @@ -%bcond deflate 1 -%bcond fuse 1 -%bcond lz4 1 -%bcond lzma 1 -%bcond selinux 1 -%bcond uuid 1 -%bcond zlib 1 +%bcond_without deflate +%bcond_without fuse +%bcond_without lz4 +%bcond_without lzma +%bcond_without oci +%bcond_without selinux +%bcond_without uuid +%bcond_without xxhash +%bcond_without zlib +%bcond_without zstd Name: erofs-utils -Version: 1.7.1 -Release: 2%{?dist} +Version: 1.9.1 +Release: 1%{?dist} Summary: Utilities for working with EROFS -License: GPL-2.0-only AND GPL-2.0-or-later AND (GPL-2.0-only OR Apache-2.0) AND (GPL-2.0-or-later OR Apache-2.0) AND (GPL-2.0-only OR BSD-2-Clause) AND (GPL-2.0-or-later OR BSD-2-Clause) AND Unlicense +License: GPL-2.0-only AND GPL-2.0-or-later AND (GPL-2.0-only OR Apache-2.0) AND (GPL-2.0-or-later OR Apache-2.0) AND (GPL-2.0-only OR BSD-2-Clause) AND (GPL-2.0-or-later OR BSD-2-Clause) AND Unlicense AND MIT URL: https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git Source0: %{url}/snapshot/%{name}-%{version}.tar.gz -BuildRequires: %[ "%{toolchain}" == "clang" ? "clang compiler-rt" : "gcc" ] +%if "%{toolchain}" == "clang" +BuildRequires: clang compiler-rt +%else +BuildRequires: gcc +%endif BuildRequires: libtool BuildRequires: make %{?with_deflate:BuildRequires: pkgconfig(libdeflate)} -%{?with_fuse:BuildRequires: pkgconfig(fuse) >= 2.6} +%{?with_fuse:BuildRequires: pkgconfig(fuse3) >= 3.0} %{?with_lz4:BuildRequires: lz4-devel >= 1.9.3} %{?with_lzma:BuildRequires: xz-devel >= 5.4} +%{?with_oci:BuildRequires: pkgconfig(libcurl)} +%{?with_oci:BuildRequires: pkgconfig(json-c)} %{?with_selinux:BuildRequires: pkgconfig(libselinux)} %{?with_uuid:BuildRequires: pkgconfig(uuid)} +%{?with_xxhash:BuildRequires: pkgconfig(libxxhash)} %{?with_zlib:BuildRequires: pkgconfig(zlib)} +%{?with_zstd:BuildRequires: pkgconfig(libzstd) >= 1.4.0} %description EROFS stands for Enhanced Read-Only File System. It aims to be a general @@ -37,7 +48,7 @@ This package includes tools to create, check, and extract EROFS images. %if %{with fuse} %package -n erofs-fuse Summary: FUSE support for mounting EROFS images -Requires: fuse +Requires: fuse3 %description -n erofs-fuse EROFS stands for Enhanced Read-Only File System. It aims to be a general @@ -58,9 +69,14 @@ autoreconf -fi --%{?with_fuse:enable}%{!?with_fuse:disable}-fuse \ --%{?with_lz4:enable}%{!?with_lz4:disable}-lz4 \ --%{?with_lzma:enable}%{!?with_lzma:disable}-lzma \ + --%{?with_oci:enable}%{!?with_oci:disable}-oci \ + --%{?with_oci:with}%{!?with_oci:without}-libcurl \ + --%{?with_oci:with}%{!?with_oci:without}-json-c \ --%{?with_selinux:with}%{!?with_selinux:without}-selinux \ --%{?with_uuid:with}%{!?with_uuid:without}-uuid \ - --%{?with_zlib:with}%{!?with_zlib:without}-zlib + --%{?with_xxhash:with}%{!?with_xxhash:without}-xxhash \ + --%{?with_zlib:with}%{!?with_zlib:without}-zlib \ + --%{?with_zstd:with}%{!?with_zstd:without}-libzstd %make_build %install @@ -71,23 +87,28 @@ autoreconf -fi %{_bindir}/dump.erofs %{_bindir}/fsck.erofs %{_bindir}/mkfs.erofs +%{_sbindir}/mount.erofs %{_mandir}/man1/dump.erofs.1* %{_mandir}/man1/fsck.erofs.1* %{_mandir}/man1/mkfs.erofs.1* +%{_mandir}/man8/mount.erofs.8* %doc AUTHORS ChangeLog README docs/PERFORMANCE.md docs/compress-hints.example -%license LICENSES/Apache-2.0 LICENSES/GPL-2.0 +%license LICENSES/Apache-2.0 LICENSES/GPL-2.0 LICENSES/MIT %if %{with fuse} %files -n erofs-fuse %{_bindir}/erofsfuse %{_mandir}/man1/erofsfuse.1* %doc AUTHORS ChangeLog README -%license LICENSES/Apache-2.0 LICENSES/GPL-2.0 +%license LICENSES/Apache-2.0 LICENSES/GPL-2.0 LICENSES/MIT %endif %changelog -* Wed Jun 04 2025 bbrucezhang +* Tue Mar 10 2026 hudsonzhu - 1.9.1-1 +- [DESC] upgrade to 1.9.1 + +* Wed Jun 04 2025 bbrucezhang - 1.7.1-2 - Rebuilt for loongarch64 * Fri Jul 19 2024 OpenCloudOS Release Engineering - 1.7.1-1 diff --git a/sources b/sources index 449842b..2233253 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (erofs-utils-1.7.1.tar.gz) = f5fc08d8d70e3e06c06aaa5a36e9b16ca1ff7c722fc88dba1f5c46fa86914be02e45e948c59504bd0fd4a3a4050ad7a27a5da2657ffbf40ec20ef0d1bfb832ff +SHA512 (erofs-utils-1.9.1.tar.gz) = c66ac253e319886fc41e96813de2edb4281317df6477a8ea71a4af49d5750991964347d533a9be825daf2320370141859e3643c52abbac6bfabdd477f7365ebf -- Gitee