--- SpecCheck.py 10 Aug 2005 06:10:39 -0000 1.29 +++ SpecCheck.py 10 Aug 2005 13:14:46 -0000 @@ -44,6 +44,7 @@ biarch_package_regex=re.compile(DEFAULT_BIARCH_PACKAGES) hardcoded_lib_path_exceptions_regex=re.compile(Config.getOption('HardcodedLibPathExceptions', DEFAULT_HARDCODED_LIB_PATH_EXCEPTIONS)) prereq_regex=re.compile('^PreReq:\s*(.+?)\s*$', re.IGNORECASE) +buildprereq_regex=re.compile('^BuildPreReq:\s*(.+?)\s*$', re.IGNORECASE) # Only check for /lib, /usr/lib, /usr/X11R6/lib # TODO: better handling of X libraries and modules. @@ -185,8 +186,12 @@ res=prereq_regex.search(line) if res: - printError(pkg, 'prereq-use', res.group(1)) - + printWarning(pkg, 'prereq-use', res.group(1)) + + res=buildprereq_regex.search(line) + if res: + printWarning(pkg, 'buildprereq-use', res.group(1)) + if not buildroot: printError(pkg, 'no-buildroot-tag') @@ -272,8 +277,13 @@ patch to be effective only on a given arch.''', 'prereq-use', -'''The use of PreReq is deprecated. You should use Requires(pre), Requires(post), -Requires(preun) or Requires(postun) according to your needs.''', +'''The use of PreReq is deprecated. In the majority of cases, a plain Requires +is enough and the right thing to do. Sometimes Requires(pre), Requires(post), +Requires(preun) and/or Requires(postun) can also be used instead of PreReq.''', + +'buildprereq-use', +'''The use of BuildPreReq is deprecated, build dependencies are always required +before a package can be built. Use plain BuildRequires instead.''', )