public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Troy Dawson <tdawson@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/fedora-release] f45: Set %rhel and %eln when appropriate
Date: Mon, 10 Aug 2026 09:35:16 GMT [thread overview]
Message-ID: <178635451629.1.15745085151782326589.rpms-fedora-release-e57de46a3569@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/fedora-release
Branch : f45
Commit : e57de46a3569218ed0f7d11e133c1bd61386125a
Author : Troy Dawson <tdawson@redhat.com>
Date : 2020-08-11T10:26:12-07:00
Stats : +15/-5 in 1 file(s)
URL : https://src.fedoraproject.org/rpms/fedora-release/c/e57de46a3569218ed0f7d11e133c1bd61386125a?branch=f45
Log:
Set %rhel and %eln when appropriate
Signed-off-by: Troy Dawson <tdawson@redhat.com>
---
diff --git a/fedora-release.spec b/fedora-release.spec
index 736b40d..748d7d5 100644
--- a/fedora-release.spec
+++ b/fedora-release.spec
@@ -1,5 +1,6 @@
%define release_name Rawhide
%define dist_version 34
+%define rhel_dist_version 9
%define bug_version rawhide
# Change this when branching to fNN
@@ -14,7 +15,7 @@
Summary: Fedora release files
Name: fedora-release
Version: 34
-Release: 0.1
+Release: 0.2
License: MIT
URL: https://fedoraproject.org/
@@ -736,12 +737,18 @@ install -d -m 755 %{buildroot}%{_rpmconfigdir}/macros.d
cat >> %{buildroot}%{_rpmconfigdir}/macros.d/macros.dist << EOF
# dist macros.
-%if !0%{?eln}
+%%__bootstrap ~bootstrap
+%if 0%{?eln}
+%%rhel %{rhel_dist_version}
+%%el%{rhel_dist_version} 1
+# Although eln is set in koji tags, we put it in the macros.dist file for local and mock builds.
+%%eln %{eln}
+%%dist %%{!?distprefix0:%%{?distprefix}}%%{expand:%%{lua:for i=0,9999 do print("%%{?distprefix" .. i .."}") end}}.el%%{eln}%%{?with_bootstrap:%{__bootstrap}}
+%else
%%fedora %{dist_version}
%%fc%{dist_version} 1
-%endif
-%%__bootstrap ~bootstrap
%%dist %%{!?distprefix0:%%{?distprefix}}%%{expand:%%{lua:for i=0,9999 do print("%%{?distprefix" .. i .."}") end}}.fc%%{fedora}%%{?with_bootstrap:%{__bootstrap}}
+%endif
EOF
# Install licenses
@@ -909,10 +916,13 @@ ln -s %{_swidtagdir} %{buildroot}%{_sysconfdir}/swid/swidtags.d/fedoraproject.or
%changelog
+* Tue Aug 11 2020 Troy Dawson <tdawson@redhat.com> - 34-0.2
+- Set %rhel and %eln when appropriate
+
* Mon Aug 10 2020 Tomas Hrcka <thrcka@redhat.com> - 34-0.1
- Setup for rawhide being F34
-* Thu Aug 06 2020 Ben Cotton <tdawson@redhat.com> - 33-0.11
+* Mon Aug 10 2020 Troy Dawson <tdawson@redhat.com> - 33-0.11
- No %fedora set for eln
* Thu Aug 06 2020 Ben Cotton <bcotton@fedoraproject.org> - 33-0.10
reply other threads:[~2026-08-10 9:35 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=178635451629.1.15745085151782326589.rpms-fedora-release-e57de46a3569@fedoraproject.org \
--to=tdawson@redhat.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