From 02bbd776ff9610927ad9fee33f14aa970f304a6a Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 22 Dec 2011 22:14:50 +0100 Subject: [PATCH] Fix inheritance of build dependencies for packages. --- macros/templates.macro | 8 ++++++++ python/pakfire/packages/lexer.py | 2 ++ 2 files changed, 10 insertions(+) diff --git a/macros/templates.macro b/macros/templates.macro index 05eeb5370..d6b90f947 100644 --- a/macros/templates.macro +++ b/macros/templates.macro @@ -5,6 +5,14 @@ thisapp = %{name}-%{version} thisver = %{version}-%{_release} packages + # Don't inherit dependency information from somewhere else + # (like build dependencies). + prerequires = + requires = + provides = + conflicts = + obsoletes = + template MAIN def files / diff --git a/python/pakfire/packages/lexer.py b/python/pakfire/packages/lexer.py index ac68971f6..95cb308ee 100644 --- a/python/pakfire/packages/lexer.py +++ b/python/pakfire/packages/lexer.py @@ -950,6 +950,8 @@ class PackagesLexer(DefaultLexer): return templates def inherit(self, other): + DefaultLexer.inherit(self, other) + # Copy all templates and packages but make sure # to update the parent lexer (for accessing each other). for name, template in other.templates.items(): -- 2.39.5