From 55d2ebb2059875c45fcf63463e8e5072b9254d6d Mon Sep 17 00:00:00 2001
From: wenyuzifang <lzx02244079@alibaba-inc.com>
Date: Wed, 27 Aug 2025 11:59:06 +0800
Subject: [PATCH] Update code from upstream

---
 btrfs-progs-v6.15.tar.sign | Bin 0 -> 566 bytes
 btrfs-progs.spec           |  29 ++++++++++++++++++++++++-----
 2 files changed, 24 insertions(+), 5 deletions(-)
 create mode 100644 btrfs-progs-v6.15.tar.sign

diff --git a/btrfs-progs-v6.15.tar.sign b/btrfs-progs-v6.15.tar.sign
new file mode 100644
index 0000000000000000000000000000000000000000..0ba02c97475b7dd7cf9a1543449caef71f445ebf
GIT binary patch
literal 566
zcmV-60?GY}0y6{v0SW*e79j-kv=RWtPWv!83>Q|#W!3rDZCE=60%%!iU;qjU5XEKH
z`PXe&JCJw~0FQFa%;%oDiA*iN%4Ys^p!D&vb6U~EL`=)2>biN~-C~ViUfqoN8^Um;
z_%9tipO3C9$|)`EZLNqpU(jo<T{oTnKj7}pjMdp#;;Tt>01n!B?vfpPGNUvLxp*}$
ztM*V9PjTRyhh1+aJ+Z7Vn1MIF-dVQTRe*9+E^YdP510BQ5rW)wBwn%lzlTe^`S1%=
zq%RTGQq3Qox<CG<7g*P0k0p43uM#{NuN{gbZypKZ_xp_f0?!J1{fg3m#<Oi5FP)Z-
z(A*XsHC&INjjP1$*2b5;0Nj)wh7XLBWF)NG7AYI*Zf2El`1NW}!sMC2&#n|r7$T%t
zSpbuiU4cy_ExSKmmvVM<3#&n`309yOUyiph2N2CD%3DPziCSM2J{Yy45f7NarLW2I
z9=(91wn8s+TmdavhjQWgh-Ybh*_}c(X@RkN>^q%UT<hX3<)2IX^YwCXbdB7W_iMIZ
zB(5jJ&#P28m70(?E|?gOYmRWbv-WDxIHrj+P`L)Q>RFE$Dxlu*5u_V@n^4P-_pJlX
zf8c4(mqV_QRk3Bfy<rxe<g+tUKgDF&qHKbG)W>&r%ARwqZ{tOTD%~e?6@bwxycz{W
z!G2EFt0a}0OCKSMuZHtpv9k4Cu2zG;Zj14yes75QeR_itMkommjz(n(FILIqa5}tG
E^(@sCkpKVy

literal 0
HcmV?d00001

diff --git a/btrfs-progs.spec b/btrfs-progs.spec
index c2439f7..6ef00f4 100644
--- a/btrfs-progs.spec
+++ b/btrfs-progs.spec
@@ -1,20 +1,35 @@
-%define anolis_release 3
+%define anolis_release		1
 
 Name:           btrfs-progs
 Summary:        An userspace programs named btrfs
-Version:        6.1.2
+Version:	6.15
 Release:        %{anolis_release}%{?dist}
 
 License:        GPLv2
 URL:            https://btrfs.wiki.kernel.org/index.php/Main_Page
-Source0:        https://mirrors.edge.kernel.org/pub/linux/kernel/people/kdave/%{name}/%{name}-v%{version}.tar.xz
-Source1:        https://mirrors.edge.kernel.org/pub/linux/kernel/people/kdave/%{name}/%{name}-v%{version}.tar.sign
-Source2:        gpgkey-F2B41200C54EFB30380C1756C565D5F9D76D583B.gpg
+Source:	https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v6.15.tar.sign
+Source2:	gpgkey-F2B41200C54EFB30380C1756C565D5F9D76D583B.gpg
+Source3:	https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v6.15.tar.xz
 
 BuildRequires:  gnupg2 e2fsprogs-devel libacl-devel, lzo-devel systemd
 BuildRequires:  gcc, autoconf, automake, make
 BuildRequires:  pkgconfig(blkid) pkgconfig(uuid) pkgconfig(zlib) pkgconfig(libgcrypt) >= 1.8.0 pkgconfig(libudev) pkgconfig(libzstd) >= 1.0.0
 BuildRequires:  python3-devel >= 3.4 python3-sphinx python3-setuptools python3-rpm-macros
+BuildRequires: python3-setuptools
+BuildRequires: python3-sphinx
+BuildRequires: python3-devel >= 3.4
+BuildRequires: pkgconfig(libgcrypt) >= 1.8.0
+BuildRequires: python3dist(sphinx-rtd-theme)
+BuildRequires: pkgconfig(zlib)
+BuildRequires: pkgconfig(libudev)
+BuildRequires: systemd
+BuildRequires: gnupg2
+BuildRequires: e2fsprogs-devel
+BuildRequires: libacl-devel
+BuildRequires: pkgconfig(blkid)
+BuildRequires: lzo-devel
+BuildRequires: pkgconfig(uuid)
+BuildRequires: pkgconfig(libzstd) >= 1.0.0
 
 %description
 Btrfs is a modern copy on write (COW) filesystem for Linux
@@ -143,6 +158,10 @@ popd
 %{python3_sitearch}/btrfsutil.*.so
 
 %changelog
+* Wed Aug 27 2025 wenyuzifang <lzx02244079@alibaba-inc.com> - 6.15-1
+- Updated to version 6.15 to fix xxxxxxxxx
+
+
 * Mon Mar 11 2024 Bo Ren <rb01097748@alibaba-inc.com> - 6.1.2-3
 - Rebuild with python3.11
 - Fix build error
-- 
Gitee