public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
To: git-commits@fedoraproject.org
Subject: [rpms/diffoscope] f44: Revert "Drop dependency on python-file-magic module"
Date: Tue, 22 Sep 2026 19:27:09 GMT	[thread overview]
Message-ID: <179010522972.1.9916746917458152121.rpms-diffoscope-551af94180ab@fedoraproject.org> (raw)

            A new commit has been pushed.

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

            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 8b063e8..2156f0d 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
 

                 reply	other threads:[~2026-09-22 19:27 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=179010522972.1.9916746917458152121.rpms-diffoscope-551af94180ab@fedoraproject.org \
    --to=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox