Minor and preferential RPM spec changes

Author: Totktonada

.travis.yml

@@ -27,11 +27,12 @@ script:
   - git describe --long
   - |
     if [ -n "${OS}" ]; then
-        git clone https://github.com/packpack/packpack.git
-        packpack/packpack
+        git submodule update --recursive --init
+        ./3rd_party/packpack/packpack
     else
         ./tools/ubuntu.trusty.test.sh
-    fi;
+    fi
+
 before_deploy:
   - ls -l build/
 

README.md

@@ -374,18 +374,19 @@ make test
 * For use:
   * tarantool,
   * lulpeg,
-  * >=tarantool/avro-schema-2.0-71-gfea0ead,
-  * >=tarantool/shard-1.1-91-gfa88bf8 (but < 2.0) or
-    >=tarantool/shard-2.1-0-g0a7d98f (optional),
+  * \>=tarantool/avro-schema-2.0-71-gfea0ead,
+  * \>=tarantool/shard-1.1-91-gfa88bf8 (but < 2.0) or
+    \>=tarantool/shard-2.1-0-g0a7d98f (optional),
   * lrexlib-pcre2 or lrexlib-pcre (optional),
   * tarantool/http (optional, for GraphiQL).
 * For test (additionally to 'for use'):
   * python 2.7,
   * virtualenv,
   * luacheck,
-  * >=tarantool/avro-schema-2.2.2-4-g1145e3e,
-  * >=tarantool/shard-1.1-92-gec1a27e (but < 2.0) or
-    >=tarantool/shard-2.1-0-g0a7d98f,
+  * \>=tarantool/avro-schema-2.2.2-4-g1145e3e,
+  * \>=tarantool/shard-1.1-92-gec1a27e (but < 2.0) or
+    \>=tarantool/shard-2.1-0-g0a7d98f,
+  * lrexlib-pcre2 or lrexlib-pcre,
   * tarantool/http.
 * For building apidoc (additionally to 'for use'):
   * ldoc.

rpm/prebuild-el-6.sh

@@ -3,5 +3,4 @@
 set -exu  # Strict shell (w/o -o pipefail)
 
 sudo yum -y install https://centos6.iuscommunity.org/ius-release.rpm
-sudo yum -y install python27
-sudo yum -y install python27-devel
+sudo yum -y install python27 python27-devel

rpm/tarantool-graphql.spec

@@ -13,26 +13,27 @@ Source0: https://github.com/tarantool/graphql/archive/%{version}/graphql-%{versi
 BuildArch: noarch
 
 # Dependencies for `make test`
-BuildRequires: tarantool >= 1.9.0.0
-BuildRequires: tarantool-avro-schema >= 2.2.2.4
-BuildRequires: tarantool-shard >= 2.1.0
-BuildRequires: tarantool-http
 BuildRequires: python-virtualenv
 BuildRequires: tarantool-luacheck
+BuildRequires: tarantool >= 1.9.0.0
 BuildRequires: tarantool-lulpeg
+BuildRequires: tarantool-avro-schema >= 2.2.2.4
+BuildRequires: tarantool-shard >= 1.1.92
 BuildRequires: tarantool-lrexlib-pcre2
+BuildRequires: tarantool-http
+
+# Weak references are not supported in RHEL / CentOS.
+#
+# https://fedoraproject.org/wiki/Packaging:WeakDependencies
+# https://bugzilla.redhat.com/show_bug.cgi?id=91458
+# https://bugzilla.redhat.com/show_bug.cgi?id=1427674
 
 # Dependencies for a user
 Requires: tarantool >= 1.9.0.0
-Requires: tarantool-avro-schema >= 2.0.71
 Requires: tarantool-lulpeg
-# Dependencies below are not mandatory, they extend tarantool-graphql
-# functionality. Currently we build packages for distros which do not have
-# package manager versions which supports Suggests tag. We left section
-# below commented till all actual distros will have necessary package manager
-# versions.
+Requires: tarantool-avro-schema >= 2.0.71
+#Suggests: tarantool-shard >= 1.1.91
 #Suggests: tarantool-lrexlib-pcre2
-#Suggests: tarantool-shard >= 2.1.0
 #Suggests: tarantool-http
 
 %description

tools/ubuntu.trusty.test.sh

@@ -1,6 +1,6 @@
-#!/usr/bin/env bash
+#!/bin/sh
 
-set -euxo pipefail  # Strict shell
+set -exu  # Strict shell (w/o -o pipefail)
 
 sudo apt-get -qq update
 curl http://download.tarantool.org/tarantool/1.9/gpgkey | \
@@ -18,14 +18,16 @@ echo "deb-src http://download.tarantool.org/tarantool/1.9/ubuntu/ ${release} mai
     sudo tee -a /etc/apt/sources.list.d/tarantool_1_9.list
 
 sudo apt-get update
-sudo apt-get -y install tarantool tarantool-dev libmsgpuck-dev
-git submodule update --recursive --init
+sudo apt-get -y install tarantool tarantool-dev libmsgpuck-dev luarocks
+
 tarantoolctl rocks install lulpeg
 tarantoolctl rocks install lrexlib-pcre
 tarantoolctl rocks install http
 tarantoolctl rocks install shard "${SHARD_VERSION}"
 tarantoolctl rocks install avro-schema "${AVRO_SCHEMA}"
-sudo apt-get install luarocks
+
 sudo luarocks install luacheck
 sudo pip install virtualenv
+
+git submodule update --recursive --init
 make test