[rpms/diffoscope] f45: Revert "Drop dependency on python-file-magic module"

[rpms/diffoscope] f45: Revert "Drop dependency on python-file-magic module"

[@ 2026-09-22 19:26 UTC (permalink / raw)]

            A new commit has been pushed.

            Repo   : rpms/diffoscope
            Branch : f45
            Commit : 397008c149895bce240bd8178217dc64858e3cd0
            Author : Miro Hrončok <miro@hroncok.cz>
            Date   : 2026-09-11T13:00:24+02:00
            Stats  : +5/-1 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/diffoscope/c/397008c149895bce240bd8178217dc64858e3cd0?branch=f45

            Log:
            Revert "Drop dependency on python-file-magic module"

This reverts commit ef3db93c9f913d2ac899d6d78d4da73809b80cb9.

The only reason the build pulled both packages was the manually listed python3-magic
in the %tools macro.

This previously worked, because both packages were called python3-magic,
now they are not, so if we want to avoid the conflict, both declarations need to match.

---
diff --git a/diffoscope.spec b/diffoscope.spec
index d576a72..7573312 100644
--- a/diffoscope.spec
+++ b/diffoscope.spec
@@ -63,7 +63,7 @@ ExcludeArch:  %{ix86}
     python3-defusedxml
     python3-h5py
     python3-jsondiff
-    python3-magic
+    python3-file-magic
     python3-pdfminer
     python3-tlsh
     python3-libarchive-c
@@ -136,6 +136,10 @@ was formerly known as "debbindiff".
 %autosetup -p1
 sed -i '1{\@/usr/bin/env@d}' diffoscope/main.py
 
+# We use the python3-file-magic module instead of the python3-magic module.
+# They conflict, and python3-file-magic is required by rpmlint.
+sed -i s/python-magic/file-magic/ setup.py
+
 %generate_buildrequires
 %pyproject_buildrequires