public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Rex Dieter <rdieter@math.unl.edu>
To: git-commits@fedoraproject.org
Subject: [rpms/gdb] gdb-17.2-rebase-f44: fix logic of prior Conflicts
Date: Sat, 27 Jun 2026 23:58:01 GMT	[thread overview]
Message-ID: <178260468124.1.17981495195095165667.rpms-gdb-7fedccf706b0@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : rpms/gdb
            Branch : gdb-17.2-rebase-f44
            Commit : 7fedccf706b0797bfafea2f4b4a84eec39a458b5
            Author : Rex Dieter <rdieter@math.unl.edu>
            Date   : 2017-01-02T18:52:52-06:00
            Stats  : +10/-5 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/gdb/c/7fedccf706b0797bfafea2f4b4a84eec39a458b5?branch=gdb-17.2-rebase-f44

            Log:
            fix logic of prior Conflicts

theoretically should not be required due to versioned dependeny
on -headless already, but it cannot hurt either

---
diff --git a/gdb.spec b/gdb.spec
index b11be70..e19cd5d 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -26,7 +26,7 @@ Version: 7.12
 
 # The release always contains a leading reserved number, start it at 1.
 # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 32%{?dist}
+Release: 33%{?dist}
 
 License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ and GPLv2+ with exceptions and GPL+ and LGPLv2+ and BSD and Public Domain and GFDL
 Group: Development/Debuggers
@@ -46,6 +46,12 @@ Recommends: %{?scl_prefix}gcc-gdb-plugin%{?_isa}
 %endif
 
 %if 0%{!?scl:1}
+# when manpages were moved from -headless to main
+# https://bugzilla.redhat.com/show_bug.cgi?id=1402554
+# theoretically should not be required due to versioned dependeny
+# below, but it cannot hurt either -- rdieter
+Conflicts: gdb-headless < 7.12-29
+
 Summary: A stub package for GNU source-level debugger
 Requires: gdb-headless%{?_isa} = %{version}-%{release}
 
@@ -55,10 +61,6 @@ See package 'gdb-headless'.
 
 %package headless
 Group: Development/Debuggers
-%else
-# when manpages were moved from -headless to main
-# https://bugzilla.redhat.com/show_bug.cgi?id=1402554
-Conflicts: gdb-headless < 7.12-29
 %endif
 
 Summary: A GNU source-level debugger for C, C++, Fortran, Go and other languages
@@ -1577,6 +1579,9 @@ then
 fi
 
 %changelog
+* Mon Jan 02 2017 Rex Dieter <rdieter@fedoraproject.org> - 7.12-33
+- fix logic of prior Conflicts
+
 * Mon Jan 02 2017 Rex Dieter <rdieter@fedoraproject.org> - 7.12-32
 - Conflicts: gdb-headless < 7.12-29 (#1402554)
 

                 reply	other threads:[~2026-06-27 23:58 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=178260468124.1.17981495195095165667.rpms-gdb-7fedccf706b0@fedoraproject.org \
    --to=rdieter@math.unl.edu \
    --cc=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