From 17c685dc70b27b61a3d8a99b953fe36e9224b5ff Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa@fedoraproject.org>
Date: Wed, 25 Jan 2023 18:10:46 -0500
Subject: [PATCH] Update to 6.1.3

- Switch to SPDX license identifiers
---
 .gitignore       |  2 ++
 btrfs-progs.spec | 18 +++++++++++-------
 sources          |  4 ++--
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8ed3713..e424c84 100644
--- a/.gitignore
+++ b/.gitignore
@@ -116,3 +116,5 @@
 /btrfs-progs-v6.1.1.tar.xz
 /btrfs-progs-v6.1.2.tar.sign
 /btrfs-progs-v6.1.2.tar.xz
+/btrfs-progs-v6.1.3.tar.sign
+/btrfs-progs-v6.1.3.tar.xz
diff --git a/btrfs-progs.spec b/btrfs-progs.spec
index effccc1..ccc9624 100644
--- a/btrfs-progs.spec
+++ b/btrfs-progs.spec
@@ -2,11 +2,11 @@
 %{!?version_no_tilde: %define version_no_tilde %{shrink:%(echo '%{version}' | tr '~' '-')}}
 
 Name:           btrfs-progs
-Version:        6.1.2
-Release:        2%{?dist}
+Version:        6.1.3
+Release:        1%{?dist}
 Summary:        Userspace programs for btrfs
 
-License:        GPLv2
+License:        GPL-2.0-only
 URL:            https://btrfs.wiki.kernel.org/index.php/Main_Page
 Source0:        https://www.kernel.org/pub/linux/kernel/people/kdave/%{name}/%{name}-v%{version_no_tilde}.tar.xz
 Source1:        https://www.kernel.org/pub/linux/kernel/people/kdave/%{name}/%{name}-v%{version_no_tilde}.tar.sign
@@ -34,7 +34,7 @@ check, modify and correct any inconsistencies in the btrfs filesystem.
 
 %package -n libbtrfs
 Summary:        btrfs filesystem-specific runtime libraries
-License:        GPLv2
+License:        GPL-2.0-only
 # Upstream deprecated this library
 Provides:       deprecated()
 # This was not properly split out before
@@ -46,7 +46,7 @@ filesystem-specific programs.
 
 %package -n libbtrfsutil
 Summary:        btrfs filesystem-specific runtime utility libraries
-License:        LGPLv2+
+License:        LGPL-2.1-or-later
 # This was not properly split out before
 Conflicts:      %{name}-devel < 4.20.2
 
@@ -57,7 +57,7 @@ filesystem-specific programs.
 %package devel
 Summary:        btrfs filesystem-specific libraries and headers
 # libbtrfsutil is LGPLv2+
-License:        GPLv2 and LGPLv2+
+License:        GPL-2.0-only and LGPL-2.1-or-later
 Requires:       %{name} = %{version}-%{release}
 Requires:       libbtrfs%{?_isa} = %{version}-%{release}
 Requires:       libbtrfsutil%{?_isa} = %{version}-%{release}
@@ -75,7 +75,7 @@ btrfs filesystem-specific programs.
 
 %package -n python3-btrfsutil
 Summary:        Python 3 bindings for libbtrfsutil
-License:        LGPLv2+
+License:        LGPL-2.1-or-later
 Requires:       libbtrfsutil%{?_isa} = %{version}-%{release}
 %{?python_provide:%python_provide python3-btrfsutil}
 
@@ -147,6 +147,10 @@ popd
 %{python3_sitearch}/btrfsutil-*.egg-info/
 
 %changelog
+* Wed Jan 25 2023 Neal Gompa <ngompa@fedoraproject.org> - 6.1.3-1
+- Update to 6.1.3
+- Switch to SPDX license identifiers
+
 * Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 6.1.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 
diff --git a/sources b/sources
index dfdaea5..22ff8d7 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (btrfs-progs-v6.1.2.tar.sign) = bc3248a473c3bcc16b50c462514f73b04ba9c1825cda3d9d5a8e10503e3df8a417ce4b113aac0796f67be40775ca25e1de869bd8be10480bfbb3b0ae921b16ce
-SHA512 (btrfs-progs-v6.1.2.tar.xz) = 0b02502f9f0902b7db04817fcfbaa4f6155035d47dd908c4c1faa86e4677e302d069756bb0935db7c88f0859c0f9ef87975b2777be7ad7f4d2389d2e95c1ff82
+SHA512 (btrfs-progs-v6.1.3.tar.sign) = 68e768c93ed4df5735ae8c882dab9dfcf5497d89a4cee09d5b963b9035e242c3e3830fbcbcc42a032e7593668a4a295ada367ea1b32e7e856c3dd89f14d87919
+SHA512 (btrfs-progs-v6.1.3.tar.xz) = 7c40d8bc3fcef0b2a7bf4be7d52923015b5b11c3f14bfc550ffa95a47d673f640b7deb840fee22fb7cc2743b6098fb12b5caea586fbf0972a1bc9a7606f3f375