ossp-uuid is not required by rpm.org

[packages/rpm.git] / noexpand.patch

diff --git a/noexpand.patch b/noexpand.patch
index 5de7900c84ffc1651661a27aec41c8093caeda9c..e75a513f9a191351fc86f445dd4ceb965b9a11d9 100644 (file)
--- a/noexpand.patch
+++ b/noexpand.patch
@@ -10,18 +10,6 @@ diff -ur rpm-4.16.0/build/parseChangelog.c rpm-4.16.0-noexpand/build/parseChange
        goto exit;
  
      if (sb && addChangelog(spec->packages->header, sb)) {
-diff -ur rpm-4.16.0/build/parseDescription.c rpm-4.16.0-noexpand/build/parseDescription.c
---- rpm-4.16.0/build/parseDescription.c        2020-05-28 12:04:25.002136494 +0200
-+++ rpm-4.16.0-noexpand/build/parseDescription.c       2020-12-18 20:02:38.770619734 +0100
-@@ -64,7 +64,7 @@
-     if (lookupPackage(spec, name, flag, &pkg))
-       goto exit;
- 
--    if ((nextPart = parseLines(spec, (STRIP_TRAILINGSPACE |STRIP_COMMENTS),
-+    if ((nextPart = parseLines(spec, (STRIP_TRAILINGSPACE |STRIP_COMMENTS | STRIP_NOEXPAND),
-                               NULL, &sb)) == PART_ERROR) {
-       goto exit;
-     }
 diff -ur rpm-4.16.0/build/parseSpec.c rpm-4.16.0-noexpand/build/parseSpec.c
 --- rpm-4.16.0/build/parseSpec.c       2020-05-28 12:04:25.007136522 +0200
 +++ rpm-4.16.0-noexpand/build/parseSpec.c      2020-12-18 20:08:13.791373996 +0100
@@ -35,6 +23,15 @@ diff -ur rpm-4.16.0/build/parseSpec.c rpm-4.16.0-noexpand/build/parseSpec.c
  
      if (specExpand(spec, ofi->lineNum, spec->lbuf, &lbuf))
        return 1;
+@@ -476,7 +476,7 @@
+     lineType = copyNextLineFinish(spec, strip);
+     s = spec->line;
+     SKIPSPACE(s);
+-    if (!lineType)
++    if (!lineType || (strip & STRIP_NOEXPAND))
+       goto after_classification;
+ 
+     /* check ordering of the conditional */
 diff -ur rpm-4.16.0/build/rpmbuild_internal.h rpm-4.16.0-noexpand/build/rpmbuild_internal.h
 --- rpm-4.16.0/build/rpmbuild_internal.h       2020-12-18 20:09:28.354868788 +0100
 +++ rpm-4.16.0-noexpand/build/rpmbuild_internal.h      2020-12-18 20:09:09.054827168 +0100