From 7daa636abdc592326b62466d459718b6b8f06e0d Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Aug 06 2019 11:01:17 +0000 Subject: import redhat-rpm-config-9.1.0-88.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 deleted file mode 100644 index bdb0ee2..0000000 --- a/SOURCES/redhat-rpm-config-9.1.0-centos.dist.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 30659ed..730b2e0 100644 --- a/SPECS/redhat-rpm-config.spec +++ b/SPECS/redhat-rpm-config.spec @@ -1,7 +1,7 @@ -Summary: CentOS specific rpm configuration files +Summary: Red Hat specific rpm configuration files Name: redhat-rpm-config Version: 9.1.0 -Release: 87%{?dist} +Release: 88%{?dist} # No version specified. License: GPL+ Group: Development/System @@ -116,19 +116,19 @@ 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 Requires: coreutils Requires: perl-srpm-macros +Requires: python-srpm-macros Requires: rpm >= 4.9.0 Requires: dwz >= 0.4 Requires: zip Provides: system-rpm-config = %{version}-%{release} %description -CentOS specific rpm configuration files. +Red Hat specific rpm configuration files. %prep %setup -q @@ -182,7 +182,6 @@ CentOS specific rpm configuration files. %patch47 -p1 %patch99 -p2 -%patch100 -p1 %build @@ -211,8 +210,8 @@ 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 +* Wed Feb 20 2019 Tomas Orsava - 9.1.0-88 +- Add dependency on python-srpm-macros (#1679229) * Fri Sep 14 2018 Eugene Syromiatnikov - 9.1.0-87 - Revert to usage of join instead of comm in find-requires.ksym:mod_requires()