[rpms/reuse] epel10: Update to version 6.2.0

[rpms/reuse] epel10: Update to version 6.2.0

[@ 2026-08-19 12:50 UTC (permalink / raw)]

A new commit has been pushed.

Repo   : rpms/reuse
Branch : epel10
Commit : 6484cb6a9f6bbd46bf75a4dd96f95d189d48586f
Author : Jan Staněk <jstanek@redhat.com>
Date   : 2025-10-29T16:18:23+01:00
Stats  : +42/-57 in 6 file(s)
URL    : https://src.fedoraproject.org/rpms/reuse/c/6484cb6a9f6bbd46bf75a4dd96f95d189d48586f?branch=epel10

Log:
Update to version 6.2.0

---
diff --git a/0001-remove-dependency-on-python-magic.patch b/0001-remove-dependency-on-python-magic.patch
deleted file mode 100644
index 99a2b22..0000000
--- a/0001-remove-dependency-on-python-magic.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 5aed4a73cbaa70d6656b2931f9b139e44f20157b Mon Sep 17 00:00:00 2001
-From: rpm-build <rpm-build>
-Date: Fri, 10 Oct 2025 12:34:30 +0200
-Subject: [PATCH] remove dependency on python-magic
-
-python-magic conflicts with the python bindings shipped with the
-libmagic itself, and the reuse code does not currently allow us
-to use that.
-
-Related: https://bugzilla.redhat.com/show_bug.cgi?id=2402682
-Signed-off-by: rpm-build <rpm-build>
----
- pyproject.toml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pyproject.toml b/pyproject.toml
-index cee2c2b..682c6ce 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -66,7 +66,7 @@ click = ">=8.1"
- # libmagic to be available. The other libraries are fallbacks, in that order. If
- # you do not want a dependency on python-magic, you can patch out this
- # requirement and instead hard-require one of the fallbacks.
--python-magic = ">=0.4.12"
-+#python-magic = ">=0.4.12"
- charset-normalizer = { version = ">=2.0.5", optional = true }
- chardet = { version = ">=3.0.2", optional = true }
- 
--- 
-2.51.0
-

diff --git a/0001-use-python-file-magic-for-filetype-detection.patch b/0001-use-python-file-magic-for-filetype-detection.patch
new file mode 100644
index 0000000..3d58c7a
--- /dev/null
+++ b/0001-use-python-file-magic-for-filetype-detection.patch
@@ -0,0 +1,38 @@
+From b3616d4b49a83f21bf6e3bbca7b524edb56c8bdc Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Wed, 29 Oct 2025 15:43:09 +0100
+Subject: [PATCH] use python-file-magic for filetype detection
+
+Signed-off-by: rpm-build <rpm-build>
+---
+ pyproject.toml | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/pyproject.toml b/pyproject.toml
+index e2b8112..3599a38 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -70,16 +70,17 @@ click = ">=8.1"
+ # used as fallback, in the below order. If you do not want a dependency on
+ # python-magic, you can patch out this requirement and instead hard-require one
+ # of the fallbacks.
+-python-magic = ">=0.4.12"
++#python-magic = ">=0.4.12"
+ # Annoyingly, file-magic has the same module namespace as python-magic
+ # ('magic'). If both are installed simultaneously, it is not self-evident which
+ # of the two is imported. file-magic is the 'official' magic module.
+-file-magic = { version = ">=0.4.1", optional = true }
++file-magic = { version = ">=0.4", optional = false }
+ charset-normalizer = { version = ">=2.0.5", optional = true }
+ chardet = { version = ">=3.0.2", optional = true }
+ 
+ [tool.poetry.extras]
+-file-magic = ["file-magic"]
++# mark this as non-extra so the dependency generator picks it up
++#file-magic = ["file-magic"]
+ charset-normalizer = ["charset-normalizer"]
+ chardet = ["chardet"]
+ 
+-- 
+2.51.0
+

diff --git a/reuse-chardet.csh b/reuse-chardet.csh
deleted file mode 100644
index 84c4e60..0000000
--- a/reuse-chardet.csh
+++ /dev/null
@@ -1,6 +0,0 @@
-# select charset detection module for reuse
-# This is a workaround around issue https://github.com/fsfe/reuse-tool/issues/1261,
-# and will be removed once it is resolved
-
-if ($?REUSE_ENCODING_MODULE) exit
-setenv REUSE_ENCODING_MODULE charset_normalizer

diff --git a/reuse-chardet.sh b/reuse-chardet.sh
deleted file mode 100644
index 2e3139e..0000000
--- a/reuse-chardet.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# select charset detection module for reuse
-# This is a workaround around issue https://github.com/fsfe/reuse-tool/issues/1261,
-# and will be removed once it is resolved
-
-if test -z "$REUSE_ENCODING_MODULE"; then export REUSE_ENCODING_MODULE=charset_normalizer; fi

diff --git a/reuse.spec b/reuse.spec
index d21053a..1db61c8 100644
--- a/reuse.spec
+++ b/reuse.spec
@@ -1,5 +1,5 @@
 Name:           reuse
-Version:        6.1.2
+Version:        6.2.0
 Release:        %autorelease
 Summary:        A tool for compliance with the REUSE recommendations
 # The CC0-1.0 licence applies to json data files, not code.
@@ -7,12 +7,8 @@ Summary:        A tool for compliance with the REUSE recommendations
 License:        Apache-2.0 AND CC0-1.0 AND CC-BY-SA-4.0 AND GPL-3.0-or-later
 Url:            https://github.com/fsfe/reuse-tool
 Source0:        %pypi_source
-# workaround for python-file-magic issues
-# https://github.com/fsfe/reuse-tool/issues/1261
-Source1:        reuse-chardet.sh
-Source2:        reuse-chardet.csh
 
-Patch:  0001-remove-dependency-on-python-magic.patch
+Patch: 0001-use-python-file-magic-for-filetype-detection.patch
 
 # Build
 BuildRequires:  python3-devel
@@ -32,10 +28,6 @@ BuildRequires:  %{py3_dist sphinx_rtd_theme}
 BuildRequires:  %{py3_dist sphinxcontrib-apidoc}
 Recommends:     git
 Recommends:     mercurial
-# FIXME: This probably should be handled by the dependency generator
-# and better handling of extras, but needs to be hardcoded for now
-# See https://bugzilla.redhat.com/show_bug.cgi?id=2402682 for issue that triggered this.
-Requires:       %{py3_dist charset-normalizer}
 BuildArch:      noarch
 
 %description
@@ -47,7 +39,7 @@ generates a project's bill of materials.
 %autosetup -n %{name}-%{version} -S git_am
 
 %generate_buildrequires
-%pyproject_buildrequires -x charset-normalizer
+%pyproject_buildrequires
 
 %build
 %pyproject_wheel
@@ -64,8 +56,6 @@ popd
 
 install -p -m0644 -Dt "${RPM_BUILD_ROOT}%{_mandir}/man1" docs/manpages/*.1
 
-install -p -m0644 -Dt "${RPM_BUILD_ROOT}%{_sysconfdir}/profile.d/" '%{SOURCE1}' '%{SOURCE2}'
-
 %check
 # Note: just running %%{pytest} does not work, since the path manipulation
 # by that macro and `--doctest-modules` confuse the import machinery too much.
@@ -78,7 +68,6 @@ install -p -m0644 -Dt "${RPM_BUILD_ROOT}%{_sysconfdir}/profile.d/" '%{SOURCE1}' 
 %{_bindir}/reuse
 %{_mandir}/man1/reuse.1*
 %{_mandir}/man1/reuse-*.1*
-%{_sysconfdir}/profile.d/reuse-chardet.*
 
 %changelog
 %autochangelog

diff --git a/sources b/sources
index 8f869a2..ca8c847 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (reuse-6.1.2.tar.gz) = e7e29377b386facfc7a659d88daf3fbe81a0022caaccb91a473ed1410da8c4ff3358fea63c84d121b42709476a7049db1b992f62bdfbad4b0d8c8b252a4de5f3
+SHA512 (reuse-6.2.0.tar.gz) = b6409ae761749ff25ba096ec8fc07491fbf0ae14ccbdcd1ebfb5c42157f0fd2a8d9aaed166fbf05f14cf4f61e16e6b9a6dfefa904f81ada1b8c5375258a2b143