From 7ddd15aa075e5c246cd70be00a0a82d3c1ebaef8 Mon Sep 17 00:00:00 2001 From: nazunalika Date: Mon, 29 Nov 2021 18:10:25 -0700 Subject: [PATCH] Syncing Sync with upstream, remove two repo files not in use, modify comments. --- SOURCES/90-default-user.preset | 2 ++ SOURCES/Rocky-FastTrack.repo | 17 ----------------- SOURCES/Rocky-LH.repo | 2 +- SOURCES/Rocky-issue | 21 --------------------- SPECS/rocky-release.spec | 19 ++++++++++++++----- 5 files changed, 17 insertions(+), 44 deletions(-) delete mode 100644 SOURCES/Rocky-FastTrack.repo delete mode 100644 SOURCES/Rocky-issue diff --git a/SOURCES/90-default-user.preset b/SOURCES/90-default-user.preset index 8a37f2b..d0095ff 100644 --- a/SOURCES/90-default-user.preset +++ b/SOURCES/90-default-user.preset @@ -17,3 +17,5 @@ enable pipewire-pulse.socket # https://bugzilla.redhat.com/show_bug.cgi?id=1976006 enable pipewire-media-session.service +# https://bugzilla.redhat.com/show_bug.cgi?id=2022717 +enable wireplumber.service diff --git a/SOURCES/Rocky-FastTrack.repo b/SOURCES/Rocky-FastTrack.repo deleted file mode 100644 index 29e5d85..0000000 --- a/SOURCES/Rocky-FastTrack.repo +++ /dev/null @@ -1,17 +0,0 @@ -# Rocky-FastTrack.repo -# -# The mirrorlist system uses the connecting IP address of the client and the -# update status of each mirror to pick current mirrors that are geographically -# close to the client. You should use this for Rocky updates unless you are -# manually picking other mirrors. -# -# If the mirrorlist does not work for you, you can try the commented out -# baseurl line instead. - -[fasttrack] -name=Rocky Linux $releasever - FastTrack -#mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=fasttrack-$releasever -baseurl=http://dl.rockylinux.org/$contentdir/$releasever/fasttrack/$basearch/os/ -gpgcheck=1 -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 diff --git a/SOURCES/Rocky-LH.repo b/SOURCES/Rocky-LH.repo index d89e054..e4388d0 100644 --- a/SOURCES/Rocky-LH.repo +++ b/SOURCES/Rocky-LH.repo @@ -11,7 +11,7 @@ # The Look Ahead (LH) repository contains packages for the next minor release # or even further of Rocky Linux and Enterprise Linux in general. This # repository *only* has content that is ahead of a stable release. These -# packages are not tested and should always be considered beta quality. +# packages are not tested and should always be considered alpha quality. # [lh-baseos] diff --git a/SOURCES/Rocky-issue b/SOURCES/Rocky-issue deleted file mode 100644 index 5bc4f5f..0000000 --- a/SOURCES/Rocky-issue +++ /dev/null @@ -1,21 +0,0 @@ - `.-/+++++++++/-.` - `-+++++++++++++++++-` -.+++++++++++++++++++++. --+++++++++++++++++++++++. -+++++++++++++++/-/+++++++ -+++++++++++++/. ./+++++ -+++++++++++:. ./+++ -+++++++++:` `:/:` .:/ --++++++:` .:+++++:` - .+++-` ./+++++++++:` - `-` ./+++++++++++- - -+++++++++:-.` - -WARNING: THIS RELEASE IS NOT FOR PRODUCTION. YOU SHOULD NOT UPDATE FROM THIS - INSTALLATION. THIS INSTALLATION IS NOT SUPPORTED. - - PLEASE REPORT ALL PRE-PRODUCTION BUGS OR ISSUES TO OUR BUG TRACKER AT: - https://bugs.rockylinux.org - -\S -- TEST RELEASE -- EVALUATION ONLY -Kernel \r on an \m diff --git a/SPECS/rocky-release.spec b/SPECS/rocky-release.spec index 87c0316..5869fff 100644 --- a/SPECS/rocky-release.spec +++ b/SPECS/rocky-release.spec @@ -10,12 +10,12 @@ %define distro_code Blue Onyx %define major 9 %define minor 0 -%define rocky_rel 1.1 +%define rocky_rel 1.2 %define rpm_license BSD-3-Clause %define base_release_version %{major} -%define full_release_version %{major}.%{minor} %define dist_release_version %{major} +%define full_release_version %{major}.%{minor} %define contentdir pub/rocky @@ -26,6 +26,8 @@ # Avoids a weird anaconda problem %global __requires_exclude_from %{_libexecdir} +# conditional section for future use + Name: rocky-release Version: %{major}.%{minor} Release: %{rocky_rel}.el%{major} @@ -34,7 +36,8 @@ License: %{rpm_license} URL: https://rockylinux.org BuildArch: noarch -# What do we provide? +# What do we provide? Some of these needs are a necesity (think comps and +# groups) and things like EPEL need it. Provides: rocky-release = %{version}-%{release} Provides: rocky-release(upstream) = %{full_release_version} Provides: redhat-release = %{version}-%{release} @@ -55,7 +58,7 @@ Provides: centos-release-eula Requires: rocky-repos(%{major}) # GPG Keys (100-199) -#Source101: RPM-GPG-KEY-rockyofficial +#Source101: RPM-GPG-KEY-rocky-%{major} Source102: RPM-GPG-KEY-rockytesting # Release Sources (200-399) @@ -168,11 +171,12 @@ ln -s ../usr/lib/os-release %{buildroot}%{_sysconfdir}/os-release # write cpe to /etc/system/release-cpe echo "cpe:/o:rocky:rocky:%{full_release_version}:GA" > %{buildroot}%{_sysconfdir}/system-release-cpe -# create /etc/issue and /etc/issue.net +# create /etc/issue and /etc/issue.net, /etc/issue.d echo '\S' > %{buildroot}%{_sysconfdir}/issue echo 'Kernel \r on an \m' >> %{buildroot}%{_sysconfdir}/issue cp %{buildroot}%{_sysconfdir}/issue{,.net} echo >> %{buildroot}%{_sysconfdir}/issue +mkdir -p %{buildroot}%{_sysconfdir}/issue.d # set up the dist tag macros install -d -m 0755 %{buildroot}%{_sysconfdir}/rpm @@ -284,6 +288,7 @@ install -p -m 0644 %{SOURCE102} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/ %config %{_sysconfdir}/system-release-cpe %config(noreplace) %{_sysconfdir}/issue %config(noreplace) %{_sysconfdir}/issue.net +%dir %{_sysconfdir}/issue.d %{_sysconfdir}/rpm/macros.dist %{_datadir}/redhat-release %{_datadir}/rocky-release @@ -309,6 +314,10 @@ install -p -m 0644 %{SOURCE102} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/ %{_datadir}/pki/sb-certs/*.crt %changelog +* Sun Nov 28 2021 Louis Abel - 9.0-1.2 +- Sync with upstream +- Adding conditionals section for future use + * Mon Nov 01 2021 Louis Abel - 9.0-1.1 - Change everything to baseurl for now - Add LH repository