diff --git a/btrfs-progs-v5.16.2.tar.sign b/btrfs-progs-v5.16.2.tar.sign deleted file mode 100644 index 9f7bd3185a57c59842a545cf6b018d11082b2384..0000000000000000000000000000000000000000 Binary files a/btrfs-progs-v5.16.2.tar.sign and /dev/null differ diff --git a/btrfs-progs-v5.16.2.tar.xz b/btrfs-progs-v5.16.2.tar.xz deleted file mode 100644 index 83e28728b87e841530696ca78d8288d1abd12b84..0000000000000000000000000000000000000000 Binary files a/btrfs-progs-v5.16.2.tar.xz and /dev/null differ diff --git a/btrfs-progs-v6.1.2.tar.sign b/btrfs-progs-v6.1.2.tar.sign new file mode 100644 index 0000000000000000000000000000000000000000..e7b9701678bc4ccca01f669a4cdd228837c848b8 Binary files /dev/null and b/btrfs-progs-v6.1.2.tar.sign differ diff --git a/btrfs-progs-v6.1.2.tar.xz b/btrfs-progs-v6.1.2.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..86286ec4461fb1d5e0e3c185bd70bf153fd4dfe9 Binary files /dev/null and b/btrfs-progs-v6.1.2.tar.xz differ diff --git a/btrfs-progs.spec b/btrfs-progs.spec index 3ec933aedf495186c08ddd6b05f2c832cf77c058..74c965efd0ab30ea34db9dab76b173a4f9c682ba 100644 --- a/btrfs-progs.spec +++ b/btrfs-progs.spec @@ -1,9 +1,9 @@ -%define anolis_release 2 +%define anolis_release 1 # Local definition of version_no_tilde when it doesn't exist %{!?version_no_tilde: %define version_no_tilde %{shrink:%(echo '%{version}' | tr '~' '-')}} Name: btrfs-progs -Version: 5.16.2 +Version: 6.1.2 Release: %{anolis_release}%{?dist} Summary: Userspace programs for btrfs @@ -20,9 +20,10 @@ BuildRequires: libacl-devel, lzo-devel BuildRequires: pkgconfig(blkid) BuildRequires: pkgconfig(uuid) BuildRequires: pkgconfig(zlib) +BuildRequires: pkgconfig(libgcrypt) >= 1.8.0 BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(libzstd) >= 1.0.0 -BuildRequires: asciidoc, xmlto +BuildRequires: python3-sphinx BuildRequires: systemd BuildRequires: python3-devel >= 3.4 BuildRequires: python3-setuptools @@ -91,7 +92,7 @@ xzcat '%{SOURCE0}' | %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1} %build ./autogen.sh -%configure CFLAGS="%{optflags} -fno-strict-aliasing" --disable-python +%configure CFLAGS="%{optflags} -fno-strict-aliasing" --with-crypto=libgcrypt --disable-python %make_build pushd libbtrfsutil/python @@ -159,6 +160,11 @@ popd %{python3_sitearch}/btrfsutil-*.egg-info/ %changelog +* Fri Jan 13 2023 Ziyang Zhang - 6.1.2-1 +- remove ascii and xmlto dependency since they are unnecessary now +- add sphinx dependency for building docs +- use libgcrypt for providing hash implementations + * Thu Nov 03 2022 mgb01105731 - 5.16.2-2 - optimise spec file