From 49d2835f89c99b8177b1aff24a7cb978bd520f9e Mon Sep 17 00:00:00 2001
From: Tru Huynh <tru@pasteur.fr>
Date: Fri, 23 Feb 2018 20:37:00 +0100
Subject: [PATCH 1/4] adding some buildrequires for Centos-{6,7}

---
 dist/rpm/barrier.spec.in | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/dist/rpm/barrier.spec.in b/dist/rpm/barrier.spec.in
index b175ded8..7e4f778f 100644
--- a/dist/rpm/barrier.spec.in
+++ b/dist/rpm/barrier.spec.in
@@ -9,6 +9,20 @@ Packager: Debauchee <todo@mail.com>
 License: GPLv2
 Release: @BARRIER_BUILD_NUMBER@@BARRIER_SNAPSHOT_INFO@%{?dist}
 
+# bonjour headers: dns_sd.h at least for CentOS-7 and CentOS-6
+BuildRequires: avahi-compat-libdns_sd-devel
+
+# possible issue here for cmake: on CentOS-7, cmake is cmake 2.x and barrier needs cmake 3.x
+# which is available from EPEL as cmake3, that might not be the case for other RPMS based distro
+%if 0%{?rhel} == 7
+BuildRequires: cmake3 
+%endif
+
+# EPEL also provide cmake3 for CentOS-6, but I have tried to build barrier on CentOS-6 yet
+%if 0%{?rhel} == 6
+BuildRequires: cmake3 
+%endif
+
 %description
 Barrier allows you to share one mouse and keyboard between multiple computers.
 Work seamlessly across Windows, macOS and Linux.

From b20f53f52ffd9228b901b4d83ed6dbe0a90d23a6 Mon Sep 17 00:00:00 2001
From: Tru Huynh <tru@pasteur.fr>
Date: Fri, 23 Feb 2018 22:12:59 +0100
Subject: [PATCH 2/4] initial commit

docker build -t barrier-c6 .
---
 docker/CentOS-6/Dockerfile | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 docker/CentOS-6/Dockerfile

diff --git a/docker/CentOS-6/Dockerfile b/docker/CentOS-6/Dockerfile
new file mode 100644
index 00000000..6a7eee89
--- /dev/null
+++ b/docker/CentOS-6/Dockerfile
@@ -0,0 +1,16 @@
+FROM centos:centos6
+
+RUN yum -y update && yum -y upgrade
+RUN yum -y install epel-release
+RUN yum -y install git cmake3 make qt5-qtbase-devel gcc \
+ avahi-compat-libdns_sd-devel gcc-c++ curl-devel \
+ openssl-devel \
+ libXtst-devel libXinerama-devel libICE-devel libXrandr-devel
+
+# c6 g++ is not CXX14
+RUN yum -y install centos-release-scl-rh
+# devtoolset-3 is enough but one can use devtoolset-N
+RUN yum -y install devtoolset-3-gcc-c++.x86_64
+
+RUN git clone https://github.com/debauchee/barrier/
+RUN cd barrier && scl enable devtoolset-3 ./clean_build.sh | tee clean_build.log && tar czvf build.tgz build clean_build.log

From f3cc7481a55314787bff9510369398dd7bc0dc3c Mon Sep 17 00:00:00 2001
From: Tru Huynh <tru@pasteur.fr>
Date: Fri, 23 Feb 2018 22:14:31 +0100
Subject: [PATCH 3/4] initial commit

build with: docker build -t barrier-c7  .
---
 docker/CentOS-7/Dockerfile | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 docker/CentOS-7/Dockerfile

diff --git a/docker/CentOS-7/Dockerfile b/docker/CentOS-7/Dockerfile
new file mode 100644
index 00000000..0fc2191a
--- /dev/null
+++ b/docker/CentOS-7/Dockerfile
@@ -0,0 +1,14 @@
+FROM centos:centos7
+
+RUN yum -y update && yum -y upgrade
+RUN yum -y install epel-release
+RUN yum -y install git cmake3 make qt5-qtbase-devel gcc \
+ avahi-compat-libdns_sd-devel gcc-c++ curl-devel \
+ openssl-devel \
+ libXtst-devel libXinerama-devel libICE-devel libXrandr-devel
+
+RUN git clone https://github.com/debauchee/barrier/
+# pending a PR since which is not installed by default on the CentOS-7 docker image
+# `type cmake3 >> /dev/null` && B_CMAKE=`type cmake3 | cut -d ' ' -f 3` instead of B_CMAKE=`which cmake3 2>/dev/null`
+RUN yum -y install which 
+RUN cd barrier && ./clean_build.sh | tee clean_build.log && tar czvf build.tgz build clean_build.log

From 8f92deabe5598df9470d0b984c23ff5531af396a Mon Sep 17 00:00:00 2001
From: "Tru Huynh (pasteur.fr)" <tru@pasteur.fr>
Date: Fri, 9 Mar 2018 10:42:48 +0100
Subject: [PATCH 4/4] removed workaround

---
 docker/CentOS-7/Dockerfile | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/docker/CentOS-7/Dockerfile b/docker/CentOS-7/Dockerfile
index 0fc2191a..f916030d 100644
--- a/docker/CentOS-7/Dockerfile
+++ b/docker/CentOS-7/Dockerfile
@@ -8,7 +8,4 @@ RUN yum -y install git cmake3 make qt5-qtbase-devel gcc \
  libXtst-devel libXinerama-devel libICE-devel libXrandr-devel
 
 RUN git clone https://github.com/debauchee/barrier/
-# pending a PR since which is not installed by default on the CentOS-7 docker image
-# `type cmake3 >> /dev/null` && B_CMAKE=`type cmake3 | cut -d ' ' -f 3` instead of B_CMAKE=`which cmake3 2>/dev/null`
-RUN yum -y install which 
 RUN cd barrier && ./clean_build.sh | tee clean_build.log && tar czvf build.tgz build clean_build.log