@@ -1,4 +1,4 @@
|
|
1
|
-
From
|
1
|
+
From 6739797e1c4a1c24f691568956597adcaece788e Mon Sep 17 00:00:00 2001
|
2
2
|
From: Florian Festi <ffesti@redhat.com>
|
3
3
|
Date: Tue, 28 Feb 2017 10:57:56 +0100
|
4
4
|
Subject: [PATCH 1/6] Use RPMTAG_*NAME instead of RPMTAG_*FLAGS in
|
@@ -17,10 +17,10 @@ that is also based on NAME tags.
|
|
17
17
|
3 files changed, 30 insertions(+), 45 deletions(-)
|
18
18
|
|
19
19
|
diff --git a/build/parsePreamble.c b/build/parsePreamble.c
|
20
|
-
index
|
20
|
+
index 3bb833cff..bc639e86c 100644
|
21
21
|
--- a/build/parsePreamble.c
|
22
22
|
+++ b/build/parsePreamble.c
|
23
|
-
@@ -
|
23
|
+
@@ -850,8 +850,8 @@ static rpmRC handlePreambleTag(rpmSpec spec, Package pkg, rpmTagVal tag,
|
24
24
|
if (parseNoSource(spec, field, tag))
|
25
25
|
goto exit;
|
26
26
|
break;
|
@@ -31,7 +31,7 @@ index 933f7340f..a9db6f37c 100644
|
|
31
31
|
if (parseBits(lang, installScriptBits, &tagflags)) {
|
32
32
|
rpmlog(RPMLOG_ERR, _("line %d: Bad %s: qualifiers: %s\n"),
|
33
33
|
spec->lineNum, rpmTagGetName(tag), spec->line);
|
34
|
-
@@ -
|
34
|
+
@@ -859,13 +859,13 @@ static rpmRC handlePreambleTag(rpmSpec spec, Package pkg, rpmTagVal tag,
|
35
35
|
}
|
36
36
|
/* fallthrough */
|
37
37
|
case RPMTAG_PREREQ:
|
@@ -52,7 +52,7 @@ index 933f7340f..a9db6f37c 100644
|
|
52
52
|
if (parseRCPOT(spec, pkg, field, tag, 0, tagflags))
|
53
53
|
goto exit;
|
54
54
|
break;
|
55
|
-
@@ -
|
55
|
+
@@ -970,15 +970,15 @@ static struct PreambleRec_s const preambleList[] = {
|
56
56
|
{RPMTAG_EXCLUDEOS, 0, 0, LEN_AND_STR("excludeos")},
|
57
57
|
{RPMTAG_EXCLUSIVEOS, 0, 0, LEN_AND_STR("exclusiveos")},
|
58
58
|
{RPMTAG_ICON, 0, 0, LEN_AND_STR("icon")},
|
@@ -76,7 +76,7 @@ index 933f7340f..a9db6f37c 100644
|
|
76
76
|
{RPMTAG_PREFIXES, 0, 0, LEN_AND_STR("prefixes")},
|
77
77
|
{RPMTAG_PREFIXES, 0, 0, LEN_AND_STR("prefix")},
|
78
78
|
{RPMTAG_BUILDROOT, 0, 0, LEN_AND_STR("buildroot")},
|
79
|
-
@@ -
|
79
|
+
@@ -993,7 +993,7 @@ static struct PreambleRec_s const preambleList[] = {
|
80
80
|
{RPMTAG_DOCDIR, 0, 0, LEN_AND_STR("docdir")},
|
81
81
|
{RPMTAG_DISTTAG, 0, 0, LEN_AND_STR("disttag")},
|
82
82
|
{RPMTAG_BUGURL, 0, 0, LEN_AND_STR("bugurl")},
|
@@ -1,4 +1,4 @@
|
|
1
|
-
From
|
1
|
+
From 01dc6ada3bf33a06ad58d3b1246c287ac148d912 Mon Sep 17 00:00:00 2001
|
2
2
|
From: Florian Festi <ffesti@redhat.com>
|
3
3
|
Date: Tue, 28 Feb 2017 17:42:21 +0100
|
4
4
|
Subject: [PATCH 2/6] Fix check for weak deps in external dependency generator
|
@@ -1,4 +1,4 @@
|
|
1
|
-
From
|
1
|
+
From 950eafdaac08cb618a4b5a8c923f1535985bcdc3 Mon Sep 17 00:00:00 2001
|
2
2
|
From: Florian Festi <ffesti@redhat.com>
|
3
3
|
Date: Thu, 9 Mar 2017 12:12:32 +0100
|
4
4
|
Subject: [PATCH 3/6] Fix check whether to allow rich deps in a given tag
|
@@ -1,4 +1,4 @@
|
|
1
|
-
From
|
1
|
+
From 96772ee932bbfb3f340589fa5cbbe3ec99125cfd Mon Sep 17 00:00:00 2001
|
2
2
|
From: Florian Festi <ffesti@redhat.com>
|
3
3
|
Date: Thu, 9 Mar 2017 14:02:10 +0100
|
4
4
|
Subject: [PATCH 4/6] Re-enable rich dependecies for build requires and
|
@@ -1,4 +1,4 @@
|
|
1
|
-
From
|
1
|
+
From 9ff717b63e94eb6a330050036506f8b78bf1401f Mon Sep 17 00:00:00 2001
|
2
2
|
From: Igor Gnatenko <ignatenko@redhat.com>
|
3
3
|
Date: Sat, 25 Feb 2017 12:28:16 +0100
|
4
4
|
Subject: [PATCH 5/6] add support for rich dependencies from dependency
|
@@ -19,10 +19,10 @@ Signed-off-by: Igor Gnatenko <ignatenko@redhat.com>
|
|
19
19
|
6 files changed, 54 insertions(+), 71 deletions(-)
|
20
20
|
|
21
21
|
diff --git a/build/parsePreamble.c b/build/parsePreamble.c
|
22
|
-
index
|
22
|
+
index bc639e86c..6b3705598 100644
|
23
23
|
--- a/build/parsePreamble.c
|
24
24
|
+++ b/build/parsePreamble.c
|
25
|
-
@@ -
|
25
|
+
@@ -866,13 +866,13 @@ static rpmRC handlePreambleTag(rpmSpec spec, Package pkg, rpmTagVal tag,
|
26
26
|
case RPMTAG_CONFLICTNAME:
|
27
27
|
case RPMTAG_OBSOLETENAME:
|
28
28
|
case RPMTAG_PROVIDENAME:
|
@@ -112,7 +112,7 @@ index 7422db65f..5fa0a1c6b 100644
|
|
112
112
|
{
|
113
113
|
char *reqname = NULL;
|
114
114
|
diff --git a/build/rpmbuild_internal.h b/build/rpmbuild_internal.h
|
115
|
-
index
|
115
|
+
index 7ec05b9c9..1c3332faf 100644
|
116
116
|
--- a/build/rpmbuild_internal.h
|
117
117
|
+++ b/build/rpmbuild_internal.h
|
118
118
|
@@ -283,6 +283,10 @@ int parseScript(rpmSpec spec, int parsePart);
|
@@ -151,7 +151,7 @@ index 7dd577f26..d0442f625 100644
|
|
151
151
|
+ int index);
|
152
152
|
|
153
153
|
/** \ingroup rpmbuild
|
154
|
-
* Add
|
154
|
+
* Add self-provides to package.
|
155
155
|
diff --git a/build/rpmfc.c b/build/rpmfc.c
|
156
156
|
index 921814ad1..7fa8227d0 100644
|
157
157
|
--- a/build/rpmfc.c
|
@@ -1,4 +1,4 @@
|
|
1
|
-
From
|
1
|
+
From 34979267904cec0c53cad1e1361db733f56dcbf8 Mon Sep 17 00:00:00 2001
|
2
2
|
From: Florian Festi <ffesti@redhat.com>
|
3
3
|
Date: Wed, 31 May 2017 10:42:03 +0200
|
4
4
|
Subject: [PATCH 6/6] Pass proper file index when recording generated
|