summaryrefslogtreecommitdiff
path: root/backport-revert-Permit-building-rpm-from-git-without-pandoc.patch
diff options
context:
space:
mode:
authorCoprDistGit <infra@openeuler.org>2024-09-18 07:05:42 +0000
committerCoprDistGit <infra@openeuler.org>2024-09-18 07:05:42 +0000
commit4ad1d692311b38472d44f5deb9c32634b334ed4d (patch)
tree3e004676c8e07b495fdeda7291033d0fde73d783 /backport-revert-Permit-building-rpm-from-git-without-pandoc.patch
parente248808867f90830a43b5ca5d192bef9dd2edec2 (diff)
automatic import of rpm
Diffstat (limited to 'backport-revert-Permit-building-rpm-from-git-without-pandoc.patch')
-rw-r--r--backport-revert-Permit-building-rpm-from-git-without-pandoc.patch32
1 files changed, 32 insertions, 0 deletions
diff --git a/backport-revert-Permit-building-rpm-from-git-without-pandoc.patch b/backport-revert-Permit-building-rpm-from-git-without-pandoc.patch
new file mode 100644
index 0000000..9874031
--- /dev/null
+++ b/backport-revert-Permit-building-rpm-from-git-without-pandoc.patch
@@ -0,0 +1,32 @@
+From 9841eed905b9433dc5d89583d34e4590842aa582 Mon Sep 17 00:00:00 2001
+From: Panu Matilainen <pmatilai@redhat.com>
+Date: Wed, 5 Oct 2022 09:21:09 +0300
+Subject: [PATCH] Permit building rpm from git without pandoc
+
+Pandoc is only required for converting .md to man pages, which is not
+terribly interesting unless you're creating a dist tarball. We already
+have an automake conditional for pandoc, might as well use it.
+"make dist" will still fail without pandoc, but that's exactly how we
+want it.
+
+(cherry picked from commit 1b8f7a182fe917ed5af5086d715cae529540a4d3)
+---
+ docs/Makefile.am | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/docs/Makefile.am b/docs/Makefile.am
+index 89b92e3..a93b669 100644
+--- a/docs/Makefile.am
++++ b/docs/Makefile.am
+@@ -1,8 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+
+-if PANDOC
+ SUBDIRS = man
+-endif
+
+ EXTRA_DIST =
+
+--
+2.27.0
+