5 files changed, 17 insertions, 23 deletions
diff --git a/linux-build-farm/centos-6/x64/Dockerfile b/linux-build-farm/centos-6/x64/Dockerfile
index 3b6cd850..4080b88f 100644
--- a/linux-build-farm/centos-6/x64/Dockerfile
+++ b/linux-build-farm/centos-6/x64/Dockerfile
@@ -3,11 +3,7 @@ MAINTAINER Adam Ierymenko <adam.ierymenko@zerotier.com>
 
 RUN yum update -y
 RUN yum install -y epel-release
-RUN yum install -y make development-tools rpmdevtools http-parser-devel lz4-devel libnatpmp-devel
-RUN yum install -y clang
-RUN yum install -y gcc-c++
-RUN yum install -y tar
-
+RUN yum install -y make development-tools rpmdevtools clang gcc-c++ tar
 RUN yum install -y nodejs npm
 
 ADD zt1-src.tar.gz /
diff --git a/linux-build-farm/centos-6/x86/Dockerfile b/linux-build-farm/centos-6/x86/Dockerfile
index 37b83956..61aa4060 100644
--- a/linux-build-farm/centos-6/x86/Dockerfile
+++ b/linux-build-farm/centos-6/x86/Dockerfile
@@ -3,10 +3,7 @@ MAINTAINER Adam Ierymenko <adam.ierymenko@zerotier.com>
 
 RUN yum update -y
 RUN yum install -y epel-release
-RUN yum install -y make development-tools rpmdevtools http-parser-devel lz4-devel libnatpmp-devel
-RUN yum install -y clang
-RUN yum install -y gcc-c++
-RUN yum install -y tar
+RUN yum install -y make development-tools rpmdevtools clang gcc-c++ tar
 
 RUN yum install -y nodejs npm
 
diff --git a/linux-build-farm/centos-7/x64/Dockerfile b/linux-build-farm/centos-7/x64/Dockerfile
index a8e7335a..10b58402 100644
--- a/linux-build-farm/centos-7/x64/Dockerfile
+++ b/linux-build-farm/centos-7/x64/Dockerfile
@@ -3,11 +3,8 @@ MAINTAINER Adam Ierymenko <adam.ierymenko@zerotier.com>
 
 RUN yum update -y
 RUN yum install -y epel-release
-RUN yum install -y make development-tools rpmdevtools http-parser-devel lz4-devel libnatpmp-devel
+RUN yum install -y make development-tools rpmdevtools clang gcc-c++ ruby ruby-devel
 
-RUN yum install -y clang gcc-c++
-
-RUN yum install -y ruby ruby-devel
 RUN gem install ronn
 
 ADD zt1-src.tar.gz /
diff --git a/linux-build-farm/centos-7/x86/Dockerfile b/linux-build-farm/centos-7/x86/Dockerfile
index 99e077fd..c5ee8a69 100644
--- a/linux-build-farm/centos-7/x86/Dockerfile
+++ b/linux-build-farm/centos-7/x86/Dockerfile
@@ -17,4 +17,6 @@ MAINTAINER Adam Ierymenko <adam.ierymenko@zerotier.com>
 RUN yum install -y ruby ruby-devel
 RUN gem install ronn
 
+RUN rpm --erase http-parser-devel lz4-devel libnatpmp-devel
+
 ADD zt1-src.tar.gz /
diff --git a/zerotier-one.spec b/zerotier-one.spec
index 48df9a09..f8ef0c3b 100644
--- a/zerotier-one.spec
+++ b/zerotier-one.spec
@@ -7,23 +7,18 @@ License:        GPLv3
 URL:            https://www.zerotier.com
 Source0:        %{name}-%{version}.tar.gz
 
-BuildRequires:  http-parser-devel
-BuildRequires:  lz4-devel
-BuildRequires:  libnatpmp-devel
-
-%if 0%{?rhel} > 7
-BuildRequires:  libnatpmp-devel
+%if 0%{?rhel} >= 7
 BuildRequires:  systemd
 %endif
 
 %if 0%{?fedora} >= 21
+BuildRequires:  http-parser-devel
+BuildRequires:  lz4-devel
+BuildRequires:  libnatpmp-devel
 BuildRequires:  systemd
 BuildRequires:  json-parser-devel
 %endif
 
-Requires:       http-parser
-Requires:       lz4
-Requires:       libnatpmp
 Requires:       iproute
 
 %if 0%{?rhel} >= 7
@@ -35,13 +30,20 @@ Requires:       chkconfig
 %endif
 
 %if 0%{?fedora} >= 21
+Requires:       http-parser
+Requires:       lz4
+Requires:       libnatpmp
 Requires:       systemd
 Requires:       json-parser
 %endif
 
 Provides:       bundled(miniupnpc) = 2.0
-%if 0%{?rhel}
+
+%if 0%{?rhel} >= 6
 Provides:       bundled(json-parser) = 1.1.0
+Provides:       bundled(lz4) = 1.7.1
+Provides:       bundled(http-parser) = 2.7.0
+Provides:       bundled(libnatpmp) = 20131126
 %endif
 
 %description