From d5d37080ba6fc1ba4ce9fe708f46786029968623 Mon Sep 17 00:00:00 2001 From: Neil Hanlon Date: Nov 09 2021 04:12:51 +0000 Subject: [PATCH 1/2] Change logic on dnf vars to detect non-Stream installations properly --- diff --git a/SPECS/centos-release-nfv.spec b/SPECS/centos-release-nfv.spec index f0f3043..cdaa5db 100644 --- a/SPECS/centos-release-nfv.spec +++ b/SPECS/centos-release-nfv.spec @@ -54,7 +54,7 @@ install -D -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/yum.repos.d/CentOS-NFV-e if [ -f /etc/os-release ]; then source /etc/os-release fi -if [[ $ID == 'centos' && $NAME == *'Stream' ]] || [ $ID != 'centos' ]; then +if [[ $ID == 'centos' && $NAME == *'Stream' ]]; then echo "8-stream" > /etc/dnf/vars/nfvsigdist else echo "8" > /etc/dnf/vars/nfvsigdist @@ -78,6 +78,9 @@ fi %config(noreplace) %{_sysconfdir}/yum.repos.d/CentOS-NFV-extras.repo %changelog +* Mon Nov 08 2021 Neil Hanlon - 1-4 +- Fix logic for dnf vars to detect non-Stream installations + * Thu Apr 15 2021 Alfredo Moralejo - 1-3 - Use different repos for CentOS Linux 8 and CentOS Stream 8 From 328657f89bb2070cd1f1d1ecf1c2b5047536217a Mon Sep 17 00:00:00 2001 From: Neil Hanlon Date: Nov 09 2021 05:23:46 +0000 Subject: [PATCH 2/2] bump release --- diff --git a/SPECS/centos-release-nfv.spec b/SPECS/centos-release-nfv.spec index cdaa5db..a8e7679 100644 --- a/SPECS/centos-release-nfv.spec +++ b/SPECS/centos-release-nfv.spec @@ -1,7 +1,7 @@ Summary: Config to enable the repository for the NFV SIG Name: centos-release-nfv Version: 1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 Group: System Environment/Base URL: http://wiki.centos.org/SpecialInterestGroup/NFV