From 1062d600b4d96340a1f9bc7bbf95ff9348e8ea57 Mon Sep 17 00:00:00 2001
From: Ilya Shipitsin <chipitsine@gmail.com>
Date: Thu, 16 Aug 2018 15:26:17 +0500
Subject: [PATCH 1/2] gitlab-ci: install dpkg-dev for better dependency
 management, move 3.12.1 to variable

---
 .gitlab-ci.yml | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 58c292f8..a41cf4f7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,9 +1,11 @@
 .ubuntu: &ubuntu_def
+  variables:
+    CMAKE_VERSION: 3.12.1
   before_script:
     - REPOSITORY="$PWD" && cd ..
-    - apt-get update && apt-get install -y wget g++ gcc libncurses5-dev libreadline-dev libssl-dev make zlib1g-dev git file
-    - wget https://cmake.org/files/v3.12/cmake-3.12.1.tar.gz && tar -xzvf cmake-3.12.1.tar.gz
-    - cd cmake-3.12.1 && ./bootstrap && make install
+    - apt-get update && apt-get install -y dpkg-dev wget g++ gcc libncurses5-dev libreadline-dev libssl-dev make zlib1g-dev git file
+    - wget https://cmake.org/files/v${CMAKE_VERSION%.*}/cmake-${CMAKE_VERSION}.tar.gz && tar -xzf cmake-${CMAKE_VERSION}.tar.gz
+    - cd cmake-${CMAKE_VERSION} && ./bootstrap && make install
     - cd "$REPOSITORY" && git submodule update --init --recursive
   script:
     - ./configure
@@ -12,21 +14,14 @@
 bionic: 
   <<: *ubuntu_def
   image: ubuntu:bionic
-  variables:     
-    CMAKE: cmake
 
 xenial:     
   <<: *ubuntu_def
   image: ubuntu:xenial
-  variables:     
-    CMAKE: cmake
 
 trusty:      
   <<: *ubuntu_def
   image: ubuntu:trusty
-  variables:     
-    CMAKE: cmake3
-
 
 #
 # there's no cmake3 for 12.04
@@ -35,6 +30,4 @@ trusty:
 #precise:
 #  <<: *ubuntu_def
 #  image: ubuntu:precise
-#  variables:
-#    CMAKE: cmake3
 

From a5c63a8ed78042e655441bf60bfab9dc86d3e515 Mon Sep 17 00:00:00 2001
From: Ilya Shipitsin <chipitsine@gmail.com>
Date: Sat, 18 Aug 2018 00:48:27 +0500
Subject: [PATCH 2/2] configure: detect "rpm" instead of "rpmbuild"

---
 configure | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure b/configure
index 752e4195..d43691a0 100755
--- a/configure
+++ b/configure
@@ -35,11 +35,11 @@ if [ -z ${OPENSSL_ROOT_DIR} ]; then
 	fi
 fi
 
-if [ -x "$(command -v rpmbuild)" ]; then
-	echo "'rpmbuild' executable found, CPack will generate RPM packages."
+if [ -x "$(command -v rpm)" ]; then
+	echo "'rpm' executable found, CPack will generate RPM packages."
 	CMAKE_FLAGS="-DCPACK_GENERATOR='RPM' ${CMAKE_FLAGS}"
 else
-	echo "'rpmbuild' executable not found, CPack will generate DEB packages."
+	echo "'rpm' executable not found, CPack will generate DEB packages."
 	CMAKE_FLAGS="-DCPACK_GENERATOR='DEB' ${CMAKE_FLAGS}"
 fi