rpms/rpm
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- dont override CONFIG_SITE if already set (related to #962837)

Browse Source
This commit is contained in:
Panu Matilainen 2013-12-03 09:28:27 +02:00
parent 3d4d533590
commit 3af1bf3896
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rpm-4.11.x-siteconfig.patch
View File

@ -5,7 +5,7 @@ diff -up rpm-4.11.1-rc1/macros.in.siteconfig rpm-4.11.1-rc1/macros.in
export CLASSPATH}\ export CLASSPATH}\
PKG_CONFIG_PATH=\"${PKG_CONFIG_PATH}:%{_libdir}/pkgconfig:%{_datadir}/pkgconfig\"\ PKG_CONFIG_PATH=\"${PKG_CONFIG_PATH}:%{_libdir}/pkgconfig:%{_datadir}/pkgconfig\"\
export PKG_CONFIG_PATH\ export PKG_CONFIG_PATH\
+ CONFIG_SITE=NONE\ + CONFIG_SITE=${CONFIG_SITE:-NONE}\
+ export CONFIG_SITE\ + export CONFIG_SITE\
\ \
%{verbose:set -x}%{!verbose:exec > /dev/null}\ %{verbose:set -x}%{!verbose:exec > /dev/null}\

1
rpm.spec
View File

@ -524,6 +524,7 @@ exit 0
%changelog %changelog
* Tue Dec 03 2013 Panu Matilainen <pmatilai@redhat.com> - 4.11.1-11 * Tue Dec 03 2013 Panu Matilainen <pmatilai@redhat.com> - 4.11.1-11
- generate kmod(module.ko) provides for kernel (#1025513) - generate kmod(module.ko) provides for kernel (#1025513)
- dont override CONFIG_SITE if already set (related to #962837)
* Mon Nov 18 2013 Panu Matilainen <pmatilai@redhat.com> - 4.11.1-10 * Mon Nov 18 2013 Panu Matilainen <pmatilai@redhat.com> - 4.11.1-10
- python 3 string and file compatibility fixes - python 3 string and file compatibility fixes