public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
To: git-commits@fedoraproject.org
Subject: [rpms/samba] rawhide: Remove obsolete NetworkManager < 1.20 conflict
Date: Tue, 28 Jul 2026 06:00:45 GMT	[thread overview]
Message-ID: <178521844511.1.5400467822060049303.rpms-samba-b850e552d31d@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : rpms/samba
            Branch : rawhide
            Commit : b850e552d31d866ba84a58e642d250a798a19fd9
            Author : Pavel Filipenský <pfilipensky@samba.org>
            Date   : 2026-07-28T07:54:41+02:00
            Stats  : +0/-3 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/samba/c/b850e552d31d866ba84a58e642d250a798a19fd9?branch=rawhide

            Log:
            Remove obsolete NetworkManager < 1.20 conflict

This conflict was added in 2019 when moving the dispatcher script from
/etc to /usr/lib. NetworkManager 1.20+ is now the minimum in all
supported Fedora releases.

---
diff --git a/samba.spec b/samba.spec
index 7c73105..748701d 100644
--- a/samba.spec
+++ b/samba.spec
@@ -1079,9 +1079,6 @@ Requires: %{name}-dcerpc = %{samba_depver}
 Provides: samba4-winbind = %{samba_depver}
 Obsoletes: samba4-winbind < %{samba_depver}
 
-# Old NetworkManager expects the dispatcher scripts in a different place
-Conflicts: NetworkManager < 1.20
-
 Provides: bundled(libreplace) = %{samba_depver}
 
 %description winbind

                 reply	other threads:[~2026-07-28  6:00 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=178521844511.1.5400467822060049303.rpms-samba-b850e552d31d@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