From 090b90d00e2a12b0e1d5477e40f61e0a202b57d7 Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Jun 11 2013 12:08:51 +0000 Subject: - whoops, siteconfig patch got diffed against wrong version --- diff --git a/rpm-4.11.x-siteconfig.patch b/rpm-4.11.x-siteconfig.patch index 502064f..fdbc336 100644 --- a/rpm-4.11.x-siteconfig.patch +++ b/rpm-4.11.x-siteconfig.patch @@ -1,9 +1,9 @@ -diff -up rpm-4.11.0.1/macros.in.siteconfig rpm-4.11.0.1/macros.in ---- rpm-4.11.0.1/macros.in.siteconfig 2013-06-11 14:45:01.446979922 +0300 -+++ rpm-4.11.0.1/macros.in 2013-06-11 14:45:22.148930246 +0300 -@@ -654,6 +654,8 @@ package or when debugging this package.\ +diff -up rpm-4.11.1-rc1/macros.in.siteconfig rpm-4.11.1-rc1/macros.in +--- rpm-4.11.1-rc1/macros.in.siteconfig 2013-06-07 13:19:21.000000000 +0300 ++++ rpm-4.11.1-rc1/macros.in 2013-06-11 15:06:59.525747503 +0300 +@@ -647,6 +647,8 @@ package or when debugging this package.\ export CLASSPATH}\ - PKG_CONFIG_PATH=\"%{_libdir}/pkgconfig:%{_datadir}/pkgconfig\"\ + PKG_CONFIG_PATH=\"${PKG_CONFIG_PATH}:%{_libdir}/pkgconfig:%{_datadir}/pkgconfig\"\ export PKG_CONFIG_PATH\ + CONFIG_SITE=NONE\ + export CONFIG_SITE\