This commit is contained in:
committed by
Git OBS Bridge
parent
83481adde8
commit
9525994e02
@@ -36,7 +36,7 @@ Index: build/parsePreamble.c
|
||||
{ NULL, 0 }
|
||||
};
|
||||
|
||||
@@ -692,6 +696,18 @@ static int handlePreambleTag(Spec spec,
|
||||
@@ -692,6 +696,18 @@ static int handlePreambleTag(Spec spec,
|
||||
if ((rc = parseRCPOT(spec, pkg, field, tag, 0, tagflags)))
|
||||
return rc;
|
||||
break;
|
||||
@@ -74,7 +74,7 @@ Index: build/parseReqs.c
|
||||
===================================================================
|
||||
--- build/parseReqs.c.orig
|
||||
+++ build/parseReqs.c
|
||||
@@ -81,6 +81,14 @@ int parseRCPOT(Spec spec, Package pkg, c
|
||||
@@ -85,6 +85,14 @@ int parseRCPOT(Spec spec, Package pkg, c
|
||||
tagflags |= RPMSENSE_ANY;
|
||||
h = spec->buildRestrictions;
|
||||
break;
|
||||
@@ -114,7 +114,7 @@ Index: build/rpmfc.c
|
||||
===================================================================
|
||||
--- build/rpmfc.c.orig
|
||||
+++ build/rpmfc.c
|
||||
@@ -1350,6 +1350,12 @@ static struct DepMsg_s depMsgs[] = {
|
||||
@@ -1385,6 +1385,12 @@ static struct DepMsg_s depMsgs[] = {
|
||||
{ "Obsoletes", { "%{?__find_obsoletes}", NULL, NULL, NULL },
|
||||
RPMTAG_OBSOLETENAME, RPMTAG_OBSOLETEVERSION, RPMTAG_OBSOLETEFLAGS,
|
||||
0, -1 },
|
||||
@@ -127,7 +127,7 @@ Index: build/rpmfc.c
|
||||
{ NULL, { NULL, NULL, NULL, NULL }, 0, 0, 0, 0, 0 }
|
||||
};
|
||||
|
||||
@@ -1445,6 +1451,14 @@ static int rpmfcGenerateDependsHelper(co
|
||||
@@ -1480,6 +1486,14 @@ static int rpmfcGenerateDependsHelper(co
|
||||
failnonzero = 0;
|
||||
tagflags = RPMSENSE_FIND_REQUIRES;
|
||||
/*@switchbreak@*/ break;
|
||||
@@ -167,7 +167,7 @@ Index: python/rpmmodule.c
|
||||
===================================================================
|
||||
--- python/rpmmodule.c.orig
|
||||
+++ python/rpmmodule.c
|
||||
@@ -354,7 +354,7 @@ void init_rpm(void)
|
||||
@@ -433,7 +433,7 @@ void init_rpm(void)
|
||||
REGISTER_ENUM(RPMSENSE_RPMLIB);
|
||||
REGISTER_ENUM(RPMSENSE_TRIGGERPREIN);
|
||||
REGISTER_ENUM(RPMSENSE_KEYRING);
|
||||
@@ -196,7 +196,7 @@ Index: rpmpopt.in
|
||||
===================================================================
|
||||
--- rpmpopt.in.orig
|
||||
+++ rpmpopt.in
|
||||
@@ -60,6 +60,22 @@ rpm alias --requires --qf \
|
||||
@@ -68,6 +68,22 @@ rpm alias --requires --qf \
|
||||
--POPTdesc=$"list capabilities required by package(s)"
|
||||
rpm alias -R --requires
|
||||
|
||||
@@ -219,7 +219,7 @@ Index: rpmpopt.in
|
||||
rpm alias --info --qf 'Name : %-27{NAME} Relocations: %|PREFIXES?{[%{PREFIXES} ]}:{(not relocatable)}|\n\
|
||||
Version : %-27{VERSION} Vendor: %{VENDOR}\n\
|
||||
Release : %-27{RELEASE} Build Date: %{BUILDTIME:date}\n\
|
||||
@@ -340,6 +356,22 @@ rpmq alias --requires --qf \
|
||||
@@ -351,6 +367,22 @@ rpmq alias --requires --qf \
|
||||
--POPTdesc=$"list capabilities required by package(s)"
|
||||
rpmq alias -R --requires
|
||||
|
||||
@@ -242,7 +242,7 @@ Index: rpmpopt.in
|
||||
rpmq alias --info --qf 'Name : %-27{NAME} Relocations: %|PREFIXES?{[%{PREFIXES} ]}:{(not relocatable)}|\n\
|
||||
Version : %-27{VERSION} Vendor: %{VENDOR}\n\
|
||||
Release : %-27{RELEASE} Build Date: %{BUILDTIME:date}\n\
|
||||
@@ -438,6 +470,22 @@ rpmquery alias --requires --qf \
|
||||
@@ -452,6 +484,22 @@ rpmquery alias --requires --qf \
|
||||
--POPTdesc=$"list capabilities required by package(s)"
|
||||
rpmquery alias -R --requires
|
||||
|
||||
@@ -308,7 +308,7 @@ Index: lib/formats.c
|
||||
/**
|
||||
* Retrieve mounted file system paths.
|
||||
* @param h header
|
||||
@@ -1344,6 +1376,7 @@ const struct headerSprintfExtension_s rp
|
||||
@@ -1347,6 +1379,7 @@ const struct headerSprintfExtension_s rp
|
||||
{ HEADER_EXT_FORMAT, "base64", { base64Format } },
|
||||
{ HEADER_EXT_FORMAT, "pgpsig", { pgpsigFormat } },
|
||||
{ HEADER_EXT_FORMAT, "depflags", { depflagsFormat } },
|
||||
|
Reference in New Issue
Block a user