From e166c3b1973fd1fed8c2bc228cb0b094acf5a514 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Aug 01 2017 03:23:03 +0000 Subject: import redhat-rpm-config-9.1.0-76.el7 --- diff --git a/SOURCES/redhat-rpm-config-9.1.0-Add-_pkgdocdir.patch b/SOURCES/redhat-rpm-config-9.1.0-Add-_pkgdocdir.patch index 40530fa..7178522 100644 --- a/SOURCES/redhat-rpm-config-9.1.0-Add-_pkgdocdir.patch +++ b/SOURCES/redhat-rpm-config-9.1.0-Add-_pkgdocdir.patch @@ -16,7 +16,7 @@ index 6994751..3776e60 100644 %_mandir %{_prefix}/share/man %_defaultdocdir %{_prefix}/share/doc -+%_pkgdocdir %{_docdir}/%{name} ++%_pkgdocdir %{_docdir}/%{name}-%{version} +%_docdir_fmt %%{NAME}-%%{VERSION} %_fmoddir %{_libdir}/gfortran/modules diff --git a/SOURCES/redhat-rpm-config-9.1.0-arches-macros.patch b/SOURCES/redhat-rpm-config-9.1.0-arches-macros.patch index 0b897a5..cb5da74 100644 --- a/SOURCES/redhat-rpm-config-9.1.0-arches-macros.patch +++ b/SOURCES/redhat-rpm-config-9.1.0-arches-macros.patch @@ -20,7 +20,7 @@ diff -uNr redhat-rpm-config-9.1.0-orig/macros.nodejs-srpm redhat-rpm-config-9.1. +# Enabling Node.js on other arches requires porting the V8 JavaScript JIT to +# those arches. + -+%nodejs_arches %{ix86} x86_64 %{arm} ++%nodejs_arches %{ix86} x86_64 %{arm} aarch64 ppc64le s390x diff -uNr redhat-rpm-config-9.1.0-orig/macros.ocaml-srpm redhat-rpm-config-9.1.0/macros.ocaml-srpm --- redhat-rpm-config-9.1.0-orig/macros.ocaml-srpm 1969-12-31 18:00:00.000000000 -0600 +++ redhat-rpm-config-9.1.0/macros.ocaml-srpm 2011-05-27 10:42:10.638194240 -0500 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 f258395..b5d7ec3 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: 72%{?dist} +Release: 76%{?dist} # No version specified. License: GPL+ Group: Development/System @@ -99,7 +99,6 @@ Patch38: redhat-rpm-config-9.1.0-Add-_pkgdocdir.patch Patch39: redhat-rpm-config-9.1.0-find-requires-fix-detection.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 @@ -110,7 +109,7 @@ Requires: zip Provides: system-rpm-config = %{version}-%{release} %description -CentOS specific rpm configuration files. +Red Hat specific rpm configuration files. %prep %setup -q @@ -156,7 +155,6 @@ CentOS specific rpm configuration files. %patch39 -p1 %patch99 -p2 -%patch100 -p1 %build @@ -185,8 +183,17 @@ rm -rf ${RPM_BUILD_ROOT} %{_sysconfdir}/rpm/* %changelog -* Thu Nov 03 2016 CentOS Sources - 9.1.0-72.el7.centos -- update check_rhl function in dist.sh +* Tue Feb 14 2017 Yaakov Selkowitz - 9.1.0-76 +- Add aarch64/ppc64le/s390x to nodejs_arches (#1417800) + +* Thu Jan 12 2017 Panu Matilainen - 9.1.0-75 +- _pkgdocdir macro is supposed to be versioned on RHEL-7 (#1392354) + +* Fri Dec 16 2016 Florian Festi - 9.1.0-74 +- Temporarily disable hardening again (#1387475) + +* Wed Nov 30 2016 Florian Festi - 9.1.0-73 +- Enable hardening (#1387475) * Mon Aug 29 2016 Florian Festi - 9.1.0-72 - Rebuild for fixed _docdir_fmt