public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Stephen Gallagher <sgallagh@fedoraproject.org>
To: git-commits@fedoraproject.org
Subject: [rpms/fedora-release] f45: Merge #139 `Add comp-neuro spin`
Date: Mon, 10 Aug 2026 09:35:18 GMT [thread overview]
Message-ID: <178635451816.1.12711883740412107241.rpms-fedora-release-b4279c92d748@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/fedora-release
Branch : f45
Commit : b4279c92d7485b716c6adb98d25cf3385037069e
Author : Stephen Gallagher <sgallagh@fedoraproject.org>
Date : 2020-08-18T15:01:51+00:00
Stats : +54/-1 in 1 file(s)
URL : https://src.fedoraproject.org/rpms/fedora-release/c/b4279c92d7485b716c6adb98d25cf3385037069e?branch=f45
Log:
Merge #139 `Add comp-neuro spin`
Signed-off-by: Stephen Gallagher <sgallagh@fedoraproject.org>
---
diff --git a/fedora-release.spec b/fedora-release.spec
index 7de405a..bb62240 100644
--- a/fedora-release.spec
+++ b/fedora-release.spec
@@ -163,6 +163,41 @@ Conflicts: fedora-release-identity
Provides the necessary files for a Fedora installation that is identifying
itself as Fedora Cloud Edition.
+%package compneuro
+Summary: Base package for Fedora Comp Neuro specific default configurations
+
+RemovePathPostfixes: .compneuro
+Provides: fedora-release = %{version}-%{release}
+Provides: fedora-release-variant = %{version}-%{release}
+Provides: system-release
+Provides: system-release(%{version})
+Provides: base-module(platform:f%{version})
+Requires: fedora-release-common = %{version}-%{release}
+
+# fedora-release-common Requires: fedora-release-identity, so at least one
+# package must provide it. This Recommends: pulls in
+# fedora-release-identity-compneuro if nothing else is already doing so.
+Recommends: fedora-release-identity-compneuro
+
+
+%description compneuro
+Provides a base package for Fedora Comp Neuro specific configuration files to
+depend on as well as Comp Neuro system defaults.
+
+
+%package identity-compneuro
+Summary: Package providing the identity for Fedora Comp Neuro Lab
+
+RemovePathPostfixes: .compneuro
+Provides: fedora-release-identity = %{version}-%{release}
+Conflicts: fedora-release-identity
+
+
+%description identity-compneuro
+Provides the necessary files for a Fedora installation that is identifying
+itself as Fedora Comp Neuro Lab.
+
+
%package container
Summary: Base package for Fedora container specific default configurations
@@ -634,6 +669,16 @@ echo "VARIANT_ID=cloud" >> %{buildroot}%{_prefix}/lib/os-release.cloud
sed -i -e "s|(%{release_name}%{?prerelease})|(Cloud Edition%{?prerelease})|g" %{buildroot}%{_prefix}/lib/os-release.cloud
sed -e "s#\$version#%{bug_version}#g" -e 's/$edition/Cloud/;s/<!--.*-->//;/^$/d' %{SOURCE20} > %{buildroot}%{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.cloud
+# Comp Neuro
+cp -p %{buildroot}%{_prefix}/lib/os-release \
+ %{buildroot}%{_prefix}/lib/os-release.compneuro
+echo "VARIANT=\"Comp Neuro\"" >> %{buildroot}%{_prefix}/lib/os-release.compneuro
+echo "VARIANT_ID=compneuro" >> %{buildroot}%{_prefix}/lib/os-release.compneuro
+sed -i -e "s|(%{release_name}%{?prerelease})|(CompNeuro%{?prerelease})|g" %{buildroot}%{_prefix}/lib/os-release.compneuro
+sed -i -e 's|DOCUMENTATION_URL=.*|DOCUMENTATION_URL="https://neuro.fedoraproject.org"|' %{buildroot}%{_prefix}/lib/os-release.compneuro
+sed -i -e 's|HOME_URL=.*|HOME_URL="https://labs.fedoraproject.org"|' %{buildroot}/%{_prefix}/lib/os-release.compneuro
+sed -e "s#\$version#%{bug_version}#g" -e 's/$edition/CompNeuro/;s/<!--.*-->//;/^$/d' %{SOURCE20} > %{buildroot}%{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.compneuro
+
# Container
cp -p %{buildroot}%{_prefix}/lib/os-release \
%{buildroot}%{_prefix}/lib/os-release.container
@@ -835,6 +880,11 @@ ln -s %{_swidtagdir} %{buildroot}%{_sysconfdir}/swid/swidtags.d/fedoraproject.or
%{_prefix}/lib/os-release.cloud
%attr(0644,root,root) %{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.cloud
+%files compneuro
+%files identity-compneuro
+%{_prefix}/lib/os-release.compneuro
+%attr(0644,root,root) %{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.compneuro
+
%files container
%files identity-container
diff --git a/fedora-release.spec b/fedora-release.spec
index 59526a8..bb62240 100644
--- a/fedora-release.spec
+++ b/fedora-release.spec
@@ -15,7 +15,7 @@
Summary: Fedora release files
Name: fedora-release
Version: 34
-Release: 0.2
+Release: 0.3%{?eln:.eln%{eln}}
License: MIT
URL: https://fedoraproject.org/
@@ -966,6 +966,9 @@ ln -s %{_swidtagdir} %{buildroot}%{_sysconfdir}/swid/swidtags.d/fedoraproject.or
%changelog
+* Mon Aug 17 2020 Troy Dawson <tdawson@redhat.com> - 34-0.3
+- Change release if building for eln
+
* Tue Aug 11 2020 Troy Dawson <tdawson@redhat.com> - 34-0.2
- Set %rhel and %eln when appropriate
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=178635451816.1.12711883740412107241.rpms-fedora-release-b4279c92d748@fedoraproject.org \
--to=sgallagh@fedoraproject.org \
--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