Accepting request 96284 from home:coolo:branches:openSUSE:Factory
- add libtool as explicit buildrequire - do not hardcode brp check list, but call everything below /usr/lib/rpm/brp-suse.d - and move our own brp scripts to brp-check-suse OBS-URL: https://build.opensuse.org/request/show/96284 OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=161
This commit is contained in:
committed by
Git OBS Bridge
parent
7477caae91
commit
41c257a762
@@ -1,9 +1,11 @@
|
||||
Add support for supplements to the internal dependency
|
||||
generator.
|
||||
|
||||
--- build/rpmfc.c.orig 2011-05-13 16:54:26.000000000 +0000
|
||||
+++ build/rpmfc.c 2011-05-13 17:11:20.000000000 +0000
|
||||
@@ -54,6 +54,7 @@ struct rpmfc_s {
|
||||
Index: build/rpmfc.c
|
||||
===================================================================
|
||||
--- build/rpmfc.c.orig 2011-12-09 14:46:56.296892644 +0100
|
||||
+++ build/rpmfc.c 2011-12-09 14:47:08.510313829 +0100
|
||||
@@ -57,6 +57,7 @@ struct rpmfc_s {
|
||||
|
||||
rpmds provides; /*!< (no. provides) package provides */
|
||||
rpmds requires; /*!< (no. requires) package requires */
|
||||
@@ -11,7 +13,7 @@ generator.
|
||||
};
|
||||
|
||||
struct rpmfcTokens_s {
|
||||
@@ -481,6 +482,14 @@ static int rpmfcHelper(rpmfc fc, unsigne
|
||||
@@ -504,6 +505,14 @@ static int rpmfcHelper(rpmfc fc, unsigne
|
||||
dsContext = RPMSENSE_FIND_REQUIRES;
|
||||
tagN = RPMTAG_REQUIRENAME;
|
||||
break;
|
||||
@@ -26,7 +28,7 @@ generator.
|
||||
}
|
||||
|
||||
/* If the entire path is filtered out, there's nothing more to do */
|
||||
@@ -752,6 +761,7 @@ rpmfc rpmfcFree(rpmfc fc)
|
||||
@@ -779,6 +788,7 @@ rpmfc rpmfcFree(rpmfc fc)
|
||||
|
||||
fc->provides = rpmdsFree(fc->provides);
|
||||
fc->requires = rpmdsFree(fc->requires);
|
||||
@@ -34,7 +36,7 @@ generator.
|
||||
}
|
||||
fc = _free(fc);
|
||||
return NULL;
|
||||
@@ -804,6 +814,7 @@ rpmRC rpmfcApply(rpmfc fc)
|
||||
@@ -831,6 +841,7 @@ rpmRC rpmfcApply(rpmfc fc)
|
||||
for (ARGV_t fattr = fc->fattrs[fc->ix]; fattr && *fattr; fattr++) {
|
||||
xx += rpmfcHelper(fc, 'P', *fattr);
|
||||
xx += rpmfcHelper(fc, 'R', *fattr);
|
||||
@@ -42,7 +44,7 @@ generator.
|
||||
}
|
||||
}
|
||||
|
||||
@@ -846,6 +857,11 @@ rpmRC rpmfcApply(rpmfc fc)
|
||||
@@ -873,6 +884,11 @@ rpmRC rpmfcApply(rpmfc fc)
|
||||
dix = rpmdsFind(fc->requires, ds);
|
||||
ds = rpmdsFree(ds);
|
||||
break;
|
||||
@@ -54,7 +56,7 @@ generator.
|
||||
}
|
||||
|
||||
/* XXX assertion incorrect while generating -debuginfo deps. */
|
||||
@@ -1357,6 +1373,18 @@ rpmRC rpmfcGenerateDepends(const rpmSpec
|
||||
@@ -1384,6 +1400,18 @@ rpmRC rpmfcGenerateDepends(const rpmSpec
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user