From 9baaf7f0201ce3aaef2822aae5fa62886d589eb9 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 9 Aug 2018 06:40:17 +0200
Subject: v4.0.11 from Fedora

* Thu Aug 09 2018 Nathan Scott <nathans@redhat.com> - 4.0.11-1
- Drop the pandoc build dependency, install only markdown.
- Upstream 4.0.11 release.
---
 redis.spec | 25 +++++--------------------
 1 file changed, 5 insertions(+), 20 deletions(-)

diff --git a/redis.spec b/redis.spec
index d354bad..49222e2 100644
--- a/redis.spec
+++ b/redis.spec
@@ -16,12 +16,6 @@
 %global with_redistrib 0
 %endif
 
-%if 0%{?fedora} >= 15 || 0%{?rhel} >= 6
-%global with_pandoc 1
-%else
-%global with_pandoc 0
-%endif
-
 %if 0%{?fedora} >= 19 || 0%{?rhel} >= 7
 %global with_systemd 1
 %else
@@ -48,7 +42,7 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:              redis
-Version:           4.0.10
+Version:           4.0.11
 Release:           1%{?dist}
 Summary:           A persistent key-value database
 Group:             Applications/Databases
@@ -89,9 +83,6 @@ BuildRequires:     jemalloc-devel
 BuildRequires:     procps-ng
 BuildRequires:     tcl
 %endif
-%if 0%{?with_pandoc}
-BuildRequires:     pandoc
-%endif
 %if 0%{?with_systemd}
 BuildRequires:     systemd
 %endif
@@ -205,13 +196,6 @@ if test "$api" != "%{redis_modules_abi}"; then
    exit 1
 fi
 
-%if 0%{?with_pandoc}
-docs=`find doc -name \*.md | sed -e 's|.md$||g'`
-for doc in $docs; do
-    pandoc --standalone --from markdown --to html --output $doc.html $doc.md
-done
-%endif
-
 %if 0%{?with_perftools}
 %global malloc_flags	MALLOC=tcmalloc
 %else
@@ -283,9 +267,6 @@ done
 for page in $(find doc -name \*.md | sed -e 's|.md$||g'); do
     base=$(echo $page | sed -e 's|doc/||g')
     install -Dpm644 $page.md $doc/$base.md
-%if 0%{?with_pandoc}
-    install -Dpm644 $page.html $doc/$base.html
-%endif
 done
 
 # Install rpm macros for redis modules
@@ -398,6 +379,10 @@ fi
 
 
 %changelog
+* Thu Aug 09 2018 Nathan Scott <nathans@redhat.com> - 4.0.11-1
+- Drop the pandoc build dependency, install only markdown.
+- Upstream 4.0.11 release.
+
 * Thu Jun 14 2018 Remi Collet <remi@remirepo.net> - 4.0.10-1
 - Update to 4.0.10 - Released Wed Jun 13 12:49:13 CEST 2018
 - Upgrade urgency CRITICAL: This release fixes important security issues.
-- 
cgit