Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire

Conflicts:
	python/pakfire/packages/make.py

diff --cc python/pakfire/packages/lexer.py
Simple merge

diff --cc python/pakfire/packages/make.py
index 41c6aadaf894f64578a288910a047123b8749444,61fafbbdd49d2bb6a4eeb8069258b42455ca8674..7a1086697da90b214ed968de61b00323c927dce2
--- 1/python/pakfire/packages/make.py
--- 2/python/pakfire/packages/make.py
+++ b/python/pakfire/packages/make.py
@@@ -270,13 -270,9 +270,12 @@@ class Makefile(MakefileBase)
  
        @property
        def requires(self):
 -              reqs = self.lexer.build.get_var("requires", "").splitlines()
 +              reqs = []
 +
 +              for line in self.lexer.build.get_var("requires", "").splitlines():
 +                      reqs += [r.strip() for r in line.split(",")]
  
-               # Remove all empty items.
-               return [r for r in reqs if r]
+               return self.filter_deps(reqs)
  
        @property
        def provides(self):