From fb64f7cd5daf17b0ba17adbeee847450674918e0 Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Thu, 7 Jan 2010 09:27:49 +0000 Subject: [PATCH] - pull out the macro scoping patch for now, it breaks font package macros --- rpm-4.7.90-macro-scope.patch | 26 -------------------------- rpm.spec | 7 ++++--- 2 files changed, 4 insertions(+), 29 deletions(-) delete mode 100644 rpm-4.7.90-macro-scope.patch diff --git a/rpm-4.7.90-macro-scope.patch b/rpm-4.7.90-macro-scope.patch deleted file mode 100644 index 0d2bac9..0000000 --- a/rpm-4.7.90-macro-scope.patch +++ /dev/null @@ -1,26 +0,0 @@ -commit f895acd285366cf58cc3c97b5f188fecbfd782a8 -Author: Panu Matilainen -Date: Mon Jan 4 12:20:09 2010 +0200 - - Always free locally defined macros when they go out of scope - - Prior to this, local defines in constructs like %{!?foo: %define foo bar} - would remain defined until a parametrized macro gets called, causing - obscure and confusing errors in specs such as RhBug:551971 and countless - others. Use of %global is now always required for such constructs. - -diff --git a/rpmio/macro.c b/rpmio/macro.c -index 88fb583..11db47d 100644 ---- a/rpmio/macro.c -+++ b/rpmio/macro.c -@@ -1344,9 +1344,8 @@ expandMacro(MacroBuf mb) - me->used++; /* Mark macro as used */ - } - -- /* Free args for "%name " macros with opts */ -- if (me->opts != NULL) -- freeArgs(mb); -+ /* Free locally defined macros, such as macro options */ -+ freeArgs(mb); - - s = se; - } diff --git a/rpm.spec b/rpm.spec index 0569c29..6cf71ad 100644 --- a/rpm.spec +++ b/rpm.spec @@ -21,7 +21,7 @@ Summary: The RPM package management system Name: rpm Version: %{rpmver} -Release: 0.%{snapver}.5 +Release: 0.%{snapver}.6 Group: System Environment/Base Url: http://www.rpm.org/ Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2 @@ -40,7 +40,6 @@ Patch3: rpm-4.7.90-fedora-specspo.patch Patch200: rpm-4.7.90-python-bytecompile.patch Patch201: rpm-4.7.90-python-refcounts.patch Patch202: rpm-4.7.90-spec-allow-unexpanded-macros.patch -Patch203: rpm-4.7.90-macro-scope.patch # These are not yet upstream Patch301: rpm-4.6.0-niagara.patch @@ -188,7 +187,6 @@ packages on a system. %patch200 -p1 -b .python-bytecompile %patch201 -p1 -b .python-refcounts %patch202 -p1 -b .spec-unexpanded-macros -%patch203 -p1 -b .macro-scope %patch301 -p1 -b .niagara %patch302 -p1 -b .geode @@ -403,6 +401,9 @@ exit 0 %doc doc/librpm/html/* %changelog +* Thu Jan 07 2010 Panu Matilainen - 4.8.0-0.beta1.6 +- pull out macro scoping "fix" for now, it breaks font package macros + * Mon Jan 04 2010 Panu Matilainen - 4.8.0-0.beta1.5 - always clear locally defined macros when they go out of scope