From 34e0e8c813fecb2ddd2c1cd3aab0fd44922e50d5 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Jun 28 2017 10:37:07 +0000 Subject: rebase patches Signed-off-by: Igor Gnatenko --- diff --git a/0001-Use-RPMTAG_-NAME-instead-of-RPMTAG_-FLAGS-in-parsePr.patch b/0001-Use-RPMTAG_-NAME-instead-of-RPMTAG_-FLAGS-in-parsePr.patch index 9ab11c7..b44247a 100644 --- a/0001-Use-RPMTAG_-NAME-instead-of-RPMTAG_-FLAGS-in-parsePr.patch +++ b/0001-Use-RPMTAG_-NAME-instead-of-RPMTAG_-FLAGS-in-parsePr.patch @@ -1,4 +1,4 @@ -From 170ba73806c6f2cea258373bd98bf7d754fec995 Mon Sep 17 00:00:00 2001 +From 6739797e1c4a1c24f691568956597adcaece788e Mon Sep 17 00:00:00 2001 From: Florian Festi Date: Tue, 28 Feb 2017 10:57:56 +0100 Subject: [PATCH 1/6] Use RPMTAG_*NAME instead of RPMTAG_*FLAGS in @@ -17,10 +17,10 @@ that is also based on NAME tags. 3 files changed, 30 insertions(+), 45 deletions(-) diff --git a/build/parsePreamble.c b/build/parsePreamble.c -index 933f7340f..a9db6f37c 100644 +index 3bb833cff..bc639e86c 100644 --- a/build/parsePreamble.c +++ b/build/parsePreamble.c -@@ -843,8 +843,8 @@ static rpmRC handlePreambleTag(rpmSpec spec, Package pkg, rpmTagVal tag, +@@ -850,8 +850,8 @@ static rpmRC handlePreambleTag(rpmSpec spec, Package pkg, rpmTagVal tag, if (parseNoSource(spec, field, tag)) goto exit; break; @@ -31,7 +31,7 @@ index 933f7340f..a9db6f37c 100644 if (parseBits(lang, installScriptBits, &tagflags)) { rpmlog(RPMLOG_ERR, _("line %d: Bad %s: qualifiers: %s\n"), spec->lineNum, rpmTagGetName(tag), spec->line); -@@ -852,13 +852,13 @@ static rpmRC handlePreambleTag(rpmSpec spec, Package pkg, rpmTagVal tag, +@@ -859,13 +859,13 @@ static rpmRC handlePreambleTag(rpmSpec spec, Package pkg, rpmTagVal tag, } /* fallthrough */ case RPMTAG_PREREQ: @@ -52,7 +52,7 @@ index 933f7340f..a9db6f37c 100644 if (parseRCPOT(spec, pkg, field, tag, 0, tagflags)) goto exit; break; -@@ -954,15 +954,15 @@ static struct PreambleRec_s const preambleList[] = { +@@ -970,15 +970,15 @@ static struct PreambleRec_s const preambleList[] = { {RPMTAG_EXCLUDEOS, 0, 0, LEN_AND_STR("excludeos")}, {RPMTAG_EXCLUSIVEOS, 0, 0, LEN_AND_STR("exclusiveos")}, {RPMTAG_ICON, 0, 0, LEN_AND_STR("icon")}, @@ -76,7 +76,7 @@ index 933f7340f..a9db6f37c 100644 {RPMTAG_PREFIXES, 0, 0, LEN_AND_STR("prefixes")}, {RPMTAG_PREFIXES, 0, 0, LEN_AND_STR("prefix")}, {RPMTAG_BUILDROOT, 0, 0, LEN_AND_STR("buildroot")}, -@@ -977,7 +977,7 @@ static struct PreambleRec_s const preambleList[] = { +@@ -993,7 +993,7 @@ static struct PreambleRec_s const preambleList[] = { {RPMTAG_DOCDIR, 0, 0, LEN_AND_STR("docdir")}, {RPMTAG_DISTTAG, 0, 0, LEN_AND_STR("disttag")}, {RPMTAG_BUGURL, 0, 0, LEN_AND_STR("bugurl")}, diff --git a/0002-Fix-check-for-weak-deps-in-external-dependency-gener.patch b/0002-Fix-check-for-weak-deps-in-external-dependency-gener.patch index 62ffd3b..1bc5774 100644 --- a/0002-Fix-check-for-weak-deps-in-external-dependency-gener.patch +++ b/0002-Fix-check-for-weak-deps-in-external-dependency-gener.patch @@ -1,4 +1,4 @@ -From b9e173d80b5374161f0b12d111e7b3f3acc3d3d3 Mon Sep 17 00:00:00 2001 +From 01dc6ada3bf33a06ad58d3b1246c287ac148d912 Mon Sep 17 00:00:00 2001 From: Florian Festi Date: Tue, 28 Feb 2017 17:42:21 +0100 Subject: [PATCH 2/6] Fix check for weak deps in external dependency generator diff --git a/0003-Fix-check-whether-to-allow-rich-deps-in-a-given-tag.patch b/0003-Fix-check-whether-to-allow-rich-deps-in-a-given-tag.patch index 6b31232..cb5b200 100644 --- a/0003-Fix-check-whether-to-allow-rich-deps-in-a-given-tag.patch +++ b/0003-Fix-check-whether-to-allow-rich-deps-in-a-given-tag.patch @@ -1,4 +1,4 @@ -From ccb3a59bbbccbcf4003117e182d4ae7446e53d07 Mon Sep 17 00:00:00 2001 +From 950eafdaac08cb618a4b5a8c923f1535985bcdc3 Mon Sep 17 00:00:00 2001 From: Florian Festi Date: Thu, 9 Mar 2017 12:12:32 +0100 Subject: [PATCH 3/6] Fix check whether to allow rich deps in a given tag diff --git a/0004-Re-enable-rich-dependecies-for-build-requires-and-co.patch b/0004-Re-enable-rich-dependecies-for-build-requires-and-co.patch index 033ca57..9e88f86 100644 --- a/0004-Re-enable-rich-dependecies-for-build-requires-and-co.patch +++ b/0004-Re-enable-rich-dependecies-for-build-requires-and-co.patch @@ -1,4 +1,4 @@ -From 2d3a50d2eb43e373dfb4a0cd0ded79d7e8b3b36c Mon Sep 17 00:00:00 2001 +From 96772ee932bbfb3f340589fa5cbbe3ec99125cfd Mon Sep 17 00:00:00 2001 From: Florian Festi Date: Thu, 9 Mar 2017 14:02:10 +0100 Subject: [PATCH 4/6] Re-enable rich dependecies for build requires and diff --git a/0005-add-support-for-rich-dependencies-from-dependency-ge.patch b/0005-add-support-for-rich-dependencies-from-dependency-ge.patch index 2698f25..fe4b513 100644 --- a/0005-add-support-for-rich-dependencies-from-dependency-ge.patch +++ b/0005-add-support-for-rich-dependencies-from-dependency-ge.patch @@ -1,4 +1,4 @@ -From aa4f0da27f1a18f35784f0f148a41f58ba581c78 Mon Sep 17 00:00:00 2001 +From 9ff717b63e94eb6a330050036506f8b78bf1401f Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sat, 25 Feb 2017 12:28:16 +0100 Subject: [PATCH 5/6] add support for rich dependencies from dependency @@ -19,10 +19,10 @@ Signed-off-by: Igor Gnatenko 6 files changed, 54 insertions(+), 71 deletions(-) diff --git a/build/parsePreamble.c b/build/parsePreamble.c -index a9db6f37c..a9d2f8e23 100644 +index bc639e86c..6b3705598 100644 --- a/build/parsePreamble.c +++ b/build/parsePreamble.c -@@ -859,13 +859,13 @@ static rpmRC handlePreambleTag(rpmSpec spec, Package pkg, rpmTagVal tag, +@@ -866,13 +866,13 @@ static rpmRC handlePreambleTag(rpmSpec spec, Package pkg, rpmTagVal tag, case RPMTAG_CONFLICTNAME: case RPMTAG_OBSOLETENAME: case RPMTAG_PROVIDENAME: @@ -112,7 +112,7 @@ index 7422db65f..5fa0a1c6b 100644 { char *reqname = NULL; diff --git a/build/rpmbuild_internal.h b/build/rpmbuild_internal.h -index 7dd577f26..d0442f625 100644 +index 7ec05b9c9..1c3332faf 100644 --- a/build/rpmbuild_internal.h +++ b/build/rpmbuild_internal.h @@ -283,6 +283,10 @@ int parseScript(rpmSpec spec, int parsePart); @@ -151,7 +151,7 @@ index 7dd577f26..d0442f625 100644 + int index); /** \ingroup rpmbuild - * Add rpmlib feature dependency. + * Add self-provides to package. diff --git a/build/rpmfc.c b/build/rpmfc.c index 921814ad1..7fa8227d0 100644 --- a/build/rpmfc.c diff --git a/0006-Pass-proper-file-index-when-recording-generated-depe.patch b/0006-Pass-proper-file-index-when-recording-generated-depe.patch index c8bf89a..7907672 100644 --- a/0006-Pass-proper-file-index-when-recording-generated-depe.patch +++ b/0006-Pass-proper-file-index-when-recording-generated-depe.patch @@ -1,4 +1,4 @@ -From 25e4f138ec11e5b0f757a8ab610e43fe08f18cf0 Mon Sep 17 00:00:00 2001 +From 34979267904cec0c53cad1e1361db733f56dcbf8 Mon Sep 17 00:00:00 2001 From: Florian Festi Date: Wed, 31 May 2017 10:42:03 +0200 Subject: [PATCH 6/6] Pass proper file index when recording generated