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 5969b7c..d4c82ed 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: 68%{?dist} @@ -85,6 +85,7 @@ Patch31: redhat-rpm-config-9.1.0-use-kverrel-for-kmodtool.patch Patch32: redhat-rpm-config-9.1.0-fix-kabi-path.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 Requires: coreutils @@ -95,7 +96,7 @@ Requires: zip Provides: system-rpm-config = %{version}-%{release} %description -Red Hat specific rpm configuration files. +CentOS specific rpm configuration files. %prep %setup -q @@ -134,6 +135,7 @@ Red Hat specific rpm configuration files. %patch32 -p1 %patch99 -p2 +%patch100 -p1 %build @@ -162,6 +164,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_sysconfdir}/rpm/* %changelog +* Thu Mar 05 2015 CentOS Sources - 9.1.0-68.el7.centos +- update check_rhl function in dist.sh + * Wed Nov 12 2014 Weiping Pan - 9.1.0-68 - fix kabi path (#1126086)