From 773aa61f6622f52696434d883bb82c7d25125fd8 Mon Sep 17 00:00:00 2001
From: baude <bbaude@redhat.com>
Date: Fri, 9 Feb 2018 12:31:47 -0600
Subject: [PATCH] Revert to md2man master

Upstream md2man is working again.  We can revert to using it instead
of a specific commit id.

Also, add make integration.CentOS for testing

Signed-off-by: baude <bbaude@redhat.com>

Closes: #320
Approved by: rhatdan
---
 .papr_prepare.sh                          | 2 +-
 Dockerfile.CentOSDev => Dockerfile.CentOS | 0
 Makefile                                  | 9 +++++----
 3 files changed, 6 insertions(+), 5 deletions(-)
 rename Dockerfile.CentOSDev => Dockerfile.CentOS (100%)

diff --git a/.papr_prepare.sh b/.papr_prepare.sh
index 730cd65408..b30abfc667 100644
--- a/.papr_prepare.sh
+++ b/.papr_prepare.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -xeuo pipefail
 
-DIST=$(cat /etc/redhat-release  | awk '{print $1}')
+DIST=${DIST:=Fedora}
 IMAGE=fedorapodmanbuild
 PYTHON=python3
 if [[ ${DIST} != "Fedora" ]]; then
diff --git a/Dockerfile.CentOSDev b/Dockerfile.CentOS
similarity index 100%
rename from Dockerfile.CentOSDev
rename to Dockerfile.CentOS
diff --git a/Makefile b/Makefile
index bb5779d25a..3e337a431b 100644
--- a/Makefile
+++ b/Makefile
@@ -112,6 +112,10 @@ integration: libpodimage
 
 integration.fedora:
 	DIST=Fedora sh .papr_prepare.sh
+
+integration.centos:
+	DIST=CentOS sh .papr_prepare.sh
+
 testunit:
 	$(GO) test -tags "$(BUILDTAGS)" -cover $(PACKAGES)
 
@@ -193,10 +197,7 @@ install.tools: .install.gitvalidation .install.gometalinter .install.md2man
 
 .install.md2man: .gopathok
 	if [ ! -x "$(GOPATH)/bin/go-md2man" ]; then \
-		   go get -d github.com/cpuguy83/go-md2man; \
-		   cd $(GOPATH)/src/github.com/cpuguy83/go-md2man; \
-		   git checkout 20f5889cbdc3c73dbd2862796665e7c465ade7d1; \
-		   go install github.com/cpuguy83/go-md2man; \
+		   go get -u github.com/cpuguy83/go-md2man; \
 	fi
 
 .install.ostree: .gopathok