- update to rpm-4.14.0
OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=420
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
--- ./build/parseReqs.c.orig 2017-01-19 13:11:21.618153943 +0000
|
||||
+++ ./build/parseReqs.c 2017-01-19 13:24:32.661841405 +0000
|
||||
--- ./build/parseReqs.c.orig 2017-10-05 10:04:56.887602165 +0000
|
||||
+++ ./build/parseReqs.c 2017-12-01 16:00:06.956343096 +0000
|
||||
@@ -42,7 +42,7 @@ static rpmRC checkEpoch(const char *s, c
|
||||
return RPMRC_OK;
|
||||
}
|
||||
@@ -38,15 +38,15 @@
|
||||
_free(N);
|
||||
_free(EVR);
|
||||
} else if (type == RPMRICH_PARSE_OP) {
|
||||
@@ -231,6 +237,7 @@ rpmRC parseRCPOT(rpmSpec spec, Package p
|
||||
@@ -223,6 +229,7 @@ rpmRC parseRCPOT(rpmSpec spec, Package p
|
||||
goto exit;
|
||||
}
|
||||
data.spec = spec;
|
||||
+ data.tagflags = tagflags;
|
||||
data.sb = newStringBuf();
|
||||
if (rpmrichParse(&r, &emsg, parseRCPOTRichCB, &data) != RPMRC_OK) {
|
||||
if (rpmrichParseForTag(&r, &emsg, parseRCPOTRichCB, &data, nametag) != RPMRC_OK) {
|
||||
freeStringBuf(data.sb);
|
||||
@@ -282,7 +289,7 @@ rpmRC parseRCPOT(rpmSpec spec, Package p
|
||||
@@ -274,7 +281,7 @@ rpmRC parseRCPOT(rpmSpec spec, Package p
|
||||
}
|
||||
|
||||
/* check that dependency is well-formed */
|
||||
@@ -55,9 +55,9 @@
|
||||
goto exit;
|
||||
|
||||
if (nametag == RPMTAG_FILETRIGGERNAME ||
|
||||
--- ./macros.in.orig 2017-01-19 13:15:43.113390933 +0000
|
||||
+++ ./macros.in 2017-01-19 13:15:56.263352524 +0000
|
||||
@@ -413,7 +413,7 @@ package or when debugging this package.\
|
||||
--- ./macros.in.orig 2017-12-01 16:00:02.705355493 +0000
|
||||
+++ ./macros.in 2017-12-01 16:00:06.957343106 +0000
|
||||
@@ -456,7 +456,7 @@ package or when debugging this package.\
|
||||
%_invalid_encoding_terminates_build 0
|
||||
|
||||
# Should invalid version format in requires, provides, ... terminate a build?
|
||||
|
Reference in New Issue
Block a user