From 3af1bf38962c95ee7686aa5da6224ec721c57285 Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Dec 03 2013 07:28:27 +0000 Subject: - dont override CONFIG_SITE if already set (related to #962837) --- diff --git a/rpm-4.11.x-siteconfig.patch b/rpm-4.11.x-siteconfig.patch index fdbc336..f32f859 100644 --- a/rpm-4.11.x-siteconfig.patch +++ b/rpm-4.11.x-siteconfig.patch @@ -5,7 +5,7 @@ diff -up rpm-4.11.1-rc1/macros.in.siteconfig rpm-4.11.1-rc1/macros.in export CLASSPATH}\ PKG_CONFIG_PATH=\"${PKG_CONFIG_PATH}:%{_libdir}/pkgconfig:%{_datadir}/pkgconfig\"\ export PKG_CONFIG_PATH\ -+ CONFIG_SITE=NONE\ ++ CONFIG_SITE=${CONFIG_SITE:-NONE}\ + export CONFIG_SITE\ \ %{verbose:set -x}%{!verbose:exec > /dev/null}\ diff --git a/rpm.spec b/rpm.spec index 4aeb671..0e917da 100644 --- a/rpm.spec +++ b/rpm.spec @@ -524,6 +524,7 @@ exit 0 %changelog * Tue Dec 03 2013 Panu Matilainen - 4.11.1-11 - generate kmod(module.ko) provides for kernel (#1025513) +- dont override CONFIG_SITE if already set (related to #962837) * Mon Nov 18 2013 Panu Matilainen - 4.11.1-10 - python 3 string and file compatibility fixes