From cfce6073523564fb1c471d569e5730986463f13e Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Oct 30 2018 05:09:30 +0000 Subject: debrand redhat-rpm-config-9.1.0-87.el7 --- diff --git a/SOURCES/redhat-rpm-config-9.1.0-centos.dist.patch b/SOURCES/redhat-rpm-config-9.1.0-centos.dist.patch new file mode 100644 index 0000000..bdb0ee2 --- /dev/null +++ b/SOURCES/redhat-rpm-config-9.1.0-centos.dist.patch @@ -0,0 +1,12 @@ +diff -uNrp redhat-rpm-config-9.1.0.orig/dist.sh redhat-rpm-config-9.1.0/dist.sh +--- redhat-rpm-config-9.1.0.orig/dist.sh 2010-02-02 03:24:04.000000000 -0600 ++++ redhat-rpm-config-9.1.0/dist.sh 2014-06-19 09:29:04.064790458 -0500 +@@ -25,7 +25,7 @@ function check_rhl { + } + + function check_rhel { +- egrep -q "(Enterprise|Advanced)" $RELEASEFILE && echo $DISTNUM ++ egrep -q "(Enterprise|Advanced|CentOS)" $RELEASEFILE && echo $DISTNUM + } + + function check_fedora { diff --git a/SPECS/redhat-rpm-config.spec b/SPECS/redhat-rpm-config.spec index fbd2248..30659ed 100644 --- a/SPECS/redhat-rpm-config.spec +++ b/SPECS/redhat-rpm-config.spec @@ -1,4 +1,4 @@ -Summary: Red Hat specific rpm configuration files +Summary: CentOS specific rpm configuration files Name: redhat-rpm-config Version: 9.1.0 Release: 87%{?dist} @@ -116,6 +116,7 @@ Patch47: redhat-rpm-config-9.1.0-compressed-kmods-support.patch # ppc64 little endian support Patch99: redhat-rpm-config-9.1.0-ppc64le.patch +Patch100: redhat-rpm-config-9.1.0-centos.dist.patch BuildArch: noarch @@ -127,7 +128,7 @@ Requires: zip Provides: system-rpm-config = %{version}-%{release} %description -Red Hat specific rpm configuration files. +CentOS specific rpm configuration files. %prep %setup -q @@ -181,6 +182,7 @@ Red Hat specific rpm configuration files. %patch47 -p1 %patch99 -p2 +%patch100 -p1 %build @@ -209,6 +211,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_sysconfdir}/rpm/* %changelog +* Tue Oct 30 2018 CentOS Sources - 9.1.0-87.el7.centos +- update check_rhl function in dist.sh + * Fri Sep 14 2018 Eugene Syromiatnikov - 9.1.0-87 - Revert to usage of join instead of comm in find-requires.ksym:mod_requires() as generated "Requires:" and "Provides:" lists have different format