]> git.ipfire.org Git - people/ms/pakfire.git/commitdiff
Fix inheritance of build dependencies for packages.
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 22 Dec 2011 21:14:50 +0000 (22:14 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 22 Dec 2011 21:14:50 +0000 (22:14 +0100)
macros/templates.macro
python/pakfire/packages/lexer.py

index 05eeb5370be55595d7d35fe5cd960a04ff446e63..d6b90f947aa97689097817aa8024ce084b6eda5d 100644 (file)
@@ -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
                        /
index ac68971f6aec3c8621073c8cf5c86c4dffe80965..95cb308ee6d97d484386debd2919bf91c50c4477 100644 (file)
@@ -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():