public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Tom Rix <Tom.Rix@amd.com>
To: git-commits@fedoraproject.org
Subject: [rpms/rocm-compilersupport] epel10: Add conflicts for rocm-compilersupport-macros
Date: Tue, 09 Jun 2026 23:07:05 GMT	[thread overview]
Message-ID: <178104642518.1.10260993170410928686.rpms-rocm-compilersupport-a358ee6beaca@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : rpms/rocm-compilersupport
            Branch : epel10
            Commit : a358ee6beaca7f3fd6d7442617d273a64fc7c283
            Author : Tom Rix <Tom.Rix@amd.com>
            Date   : 2026-05-07T11:17:04-07:00
            Stats  : +10/-1 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/rocm-compilersupport/c/a358ee6beaca7f3fd6d7442617d273a64fc7c283?branch=epel10

            Log:
            Add conflicts for rocm-compilersupport-macros

Signed-off-by: Tom Rix <Tom.Rix@amd.com>

---
diff --git a/rocm-compilersupport.spec b/rocm-compilersupport.spec
index 40bb057..ca1efeb 100644
--- a/rocm-compilersupport.spec
+++ b/rocm-compilersupport.spec
@@ -130,7 +130,7 @@ Version:        %{llvm_maj_ver}
 %if %{with preview}
 Release:        1000.rocm%{rocm_version}%{?dist}
 %else
-Release:        10.rocm%{rocm_version}%{?dist}
+Release:        11.rocm%{rocm_version}%{?dist}
 %endif
 
 Summary:        Various AMD ROCm LLVM related services
@@ -216,6 +216,12 @@ Summary:        ROCm Compiler RPM macros
 BuildArch:      noarch
 
 Requires:       rpm
+# Compat version of macros conflict with the normal version
+%if %{with compat}
+Conflicts: rocm-compilersupport-macros
+%else
+Conflicts: rocm-compilersupport7.2-macros
+%endif
 
 %description macros
 This package contains ROCm compiler related RPM macros.
@@ -1107,6 +1113,9 @@ rm %{buildroot}%{bundle_prefix}/lib/libear/ear.c
 %endif
 
 %changelog
+* Thu May 7 2026 Tom Rix <Tom.Rix@amd.com> - 22-11.rocm7.2.1
+- Add conflicts for rocm-compilersupport-macros
+
 * Thu Apr 30 2026 Tom Rix <Tom.Rix@amd.com> 22-10.rocm7.2.1
 - Merge rocm-compilersupport7.2 changes back
 

                 reply	other threads:[~2026-06-09 23:07 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=178104642518.1.10260993170410928686.rpms-rocm-compilersupport-a358ee6beaca@fedoraproject.org \
    --to=tom.rix@amd.com \
    --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