sinjuginas/rpm-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Add macro to allow dependencies beginning with a dot character in spec file"

Browse Source 
These odd dependencies are no longer generated.

This reverts commit 443060d11a7d442af14be684e1a2403c363f493a.
This commit is contained in:
Дмитрий Левин 2019-01-10 23:20:03 +00:00
parent 41f81eaa9c
commit f438f6b5df
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build/parseReqs.c
View File

@ -35,7 +35,6 @@ static struct ReqComp {
int parseRCPOT(Spec spec, Package pkg, const char *field, int tag,
int index, rpmsenseFlags tagflags)
{
static int allowbdot = -1;
const char *r, *re, *v, *ve;
char * req, * version;
Header h;
@ -96,11 +95,8 @@ int parseRCPOT(Spec spec, Package pkg, const char *field, int tag,
flags = (tagflags & ~RPMSENSE_SENSEMASK);
/* Tokens must begin with alphanumeric, _, or /
It also can begin with dot symbol if _allow_deps_with_beginning_dot macro is set */
if (allowbdot < 0)
allowbdot = rpmExpandNumeric("%{?_allow_deps_with_beginning_dot}");
if (!(xisalnum(r[0]) || r[0] == '_' || r[0] == '/' || (allowbdot && r[0] == '.'))) {
/* Tokens must begin with alphanumeric, _, or / */
if (!(xisalnum(r[0]) || r[0] == '_' || r[0] == '/')) {
rpmError(RPMERR_BADSPEC,
_("line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s\n"),
spec->lineNum, (spec->fileStack ? spec->line : field));