diff --git a/SOURCES/redhat-rpm-config-116-centos.dist.patch b/SOURCES/redhat-rpm-config-116-centos.dist.patch new file mode 100644 index 0000000..63c735f --- /dev/null +++ b/SOURCES/redhat-rpm-config-116-centos.dist.patch @@ -0,0 +1,12 @@ +diff -uNrp redhat-rpm-config-116.orig/dist.sh redhat-rpm-config-116/dist.sh +--- redhat-rpm-config-116.orig/dist.sh 2019-05-09 21:50:36.521460585 +0000 ++++ redhat-rpm-config-116/dist.sh 2019-05-09 21:53:19.328349008 +0000 +@@ -25,7 +25,7 @@ function check_rhl { + } + + function check_rhel { +- egrep -q "(Enterprise|Advanced)" $RELEASEFILE && echo $DISTNUM ++ egrep -q "(Enterprise|AdvancedCentOS)" $RELEASEFILE && echo $DISTNUM + } + + function check_fedora { diff --git a/SPECS/redhat-rpm-config.spec b/SPECS/redhat-rpm-config.spec index 927fb96..cde7758 100644 --- a/SPECS/redhat-rpm-config.spec +++ b/SPECS/redhat-rpm-config.spec @@ -4,7 +4,7 @@ # 2) When making changes, update version by +1, leave release alone. # -Summary: Red Hat specific rpm configuration files +Summary: CentOS specific rpm configuration files Name: redhat-rpm-config Version: 116 Release: 1%{?dist} @@ -83,6 +83,8 @@ Source702: brp-kmod-restore-perms # Documentation Source900: buildflags.md +Patch9999: redhat-rpm-config-116-centos.dist.patch + BuildArch: noarch BuildRequires: perl-generators Requires: coreutils @@ -118,7 +120,7 @@ Provides: system-rpm-config = %{version}-%{release} %global rrcdir /usr/lib/rpm/redhat %description -Red Hat specific rpm configuration files. +CentOS specific rpm configuration files. %package -n kernel-rpm-macros Summary: Macros and scripts for building kernel module packages. @@ -135,6 +137,7 @@ Macros and scripts for building kernel module packages. # of source numbers in install section %setup -c -T cp -p %{sources} . +%patch9999 -p1 %install mkdir -p %{buildroot}%{rrcdir} @@ -198,6 +201,9 @@ install -p -m 755 %{SOURCE21} %{buildroot}%{_rpmconfigdir}/kabi.sh %{_rpmconfigdir}/macros.d/macros.kmp %changelog +* Thu May 9 2019 Johnny Hughes - 116-1 +- Manual CentOS Debranding + * Wed Feb 06 2019 Eugene Syromiatnikov - 116-1 - Forward-port RHEL-specific kmodtool/macros.kmp changes from RHEL 7, update kmodtool script for RHEL 8 (#1658414, #1666162)