[packages/rpm/rpm.org] - missing doc really terminate build

[baggins]

commit c7562413171a4792aa5282c37b39be9e348a180a
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Dec 18 19:54:57 2020 +0100

    - missing doc really terminate build

 missing-doc-terminate-build.patch | 21 +++++++++++++++++++++
 rpm.spec                          |  4 +++-
 2 files changed, 24 insertions(+), 1 deletion(-)
---
diff --git a/rpm.spec b/rpm.spec
index 9244714..c54caf8 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -26,7 +26,7 @@ Summary(ru.UTF-8):	Менеджер пакетов от RPM
 Summary(uk.UTF-8):	Менеджер пакетів від RPM
 Name:		rpm
 Version:	4.16.0
-Release:	0.11
+Release:	0.12
 Epoch:		1
 License:	GPL v2 / LGPL v2.1
 Group:		Base
@@ -81,6 +81,7 @@ Patch27:	no-exeonly-for-elf-reqprov.patch
 Patch28:	default-patch-flags.patch
 Patch29:	%{name}-noarch_py_prov.patch
 Patch30:	missing-ghost-terminate-build.patch
+Patch31:	missing-doc-terminate-build.patch
 URL:		https://rpm.org/
 BuildRequires:	acl-devel
 BuildRequires:	db-devel >= %{db_ver}
@@ -577,6 +578,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch28 -p1
 %patch29 -p1
 %patch30 -p1
+%patch31 -p1
 
 install %{SOURCE15} scripts/perl.prov.in
 
diff --git a/missing-doc-terminate-build.patch b/missing-doc-terminate-build.patch
new file mode 100644
index 0000000..6cc7732
--- /dev/null
+++ b/missing-doc-terminate-build.patch
@@ -0,0 +1,21 @@
+--- rpm-4.16.0/build/files.c.orig	2020-12-18 19:36:49.000000000 +0100
++++ rpm-4.16.0/build/files.c	2020-12-18 19:48:35.711529643 +0100
+@@ -2394,14 +2394,16 @@
+ 	appendStringBuf(docScript, efn);
+ 	appendStringBuf(docScript, " $");
+ 	appendStringBuf(docScript, sdenv);
+-	appendLineStringBuf(docScript, " ||:");
+ 	free(efn);
+     }
+ 
+     if (install) {
++	int _missing_doc_files_terminate_build =
++	    rpmExpandNumeric("%{?_missing_doc_files_terminate_build}");
+ 	if (doScript(spec, RPMBUILD_STRINGBUF, sdname,
+ 			    getStringBuf(docScript), test, NULL)) {
+-	    fl->processingFailed = 1;
++	    if (_missing_doc_files_terminate_build)
++		fl->processingFailed = 1;
+ 	}
+     }
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/c7562413171a4792aa5282c37b39be9e348a180a