Update RPM install for Varnish 6.0.0.

INSTALL.rst

@@ -23,9 +23,9 @@ You will also need these additional repositories:
 
   * ``yum install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm``
 
-* Official Varnish packages from packagecloud (since version 5.2.0)
+* Official Varnish packages from packagecloud (since version 6.0.0)
 
-  * Follow the instructions at: https://packagecloud.io/varnishcache/varnish52/install#manual-rpm
+  * Follow the instructions at: https://packagecloud.io/varnishcache/varnish60/install#manual-rpm
 
 If you have problems or questions concerning the RPMs, post an issue
 to one of the source repository web sites, or contact

pkg/rpm/pkg

@@ -10,8 +10,13 @@
 # - this script (named pkg)
 # - VMOD re tarball (libvmod-re-v$VERSION.tar.gz)
 # - RPM spec file (vmod-re.spec)
-# - yum repo config for varnish5@packagecloud (varnishcache_varnish5.repo)
-#   (see https://packagecloud.io/varnishcache/varnish5/install#manual-rpm)
+# - yum repo config for varnish60@packagecloud (varnishcache_varnish60.repo)
+#   (see https://packagecloud.io/varnishcache/varnish60/install#manual-rpm)
+
+# So this is a sample docker invocation:
+#
+# $ docker run -t -v $PWD:/srv -e VERSION=1.2.3 -e RELEASE=4711 \
+#	rpmbuild/centos7 /srv/pkg
 
 # At the end of the run, binary, source and debuginfo RPMs are in the
 # directory mounted to /srv.
@@ -40,9 +45,9 @@ sudo yum install -y -q \
      https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
 
 # set up varnish repo
-sudo cp /srv/varnishcache_varnish5.repo /etc/yum.repos.d/
+sudo cp /srv/varnishcache_varnish60.repo /etc/yum.repos.d/
 
-sudo yum -q makecache -y --disablerepo='*' --enablerepo='varnishcache_varnish5'
+sudo yum -q makecache -y --disablerepo='*' --enablerepo='varnishcache_varnish60'
 
 # build requirements
 sudo yum install -y -q varnish-devel pkgconfig make gcc python-docutils

pkg/rpm/varnishcache_varnish60.repo

+[varnishcache_varnish60]
+name=varnishcache_varnish60
+baseurl=https://packagecloud.io/varnishcache/varnish60/el/7/$basearch
+repo_gpgcheck=1
+gpgcheck=0
+enabled=1
+gpgkey=https://packagecloud.io/varnishcache/varnish60/gpgkey
+sslverify=1
+sslcacert=/etc/pki/tls/certs/ca-bundle.crt
+metadata_expire=300
+
+[varnishcache_varnish60-source]
+name=varnishcache_varnish60-source
+baseurl=https://packagecloud.io/varnishcache/varnish60/el/7/SRPMS
+repo_gpgcheck=1
+gpgcheck=0
+enabled=1
+gpgkey=https://packagecloud.io/varnishcache/varnish60/gpgkey
+sslverify=1
+sslcacert=/etc/pki/tls/certs/ca-bundle.crt
+metadata_expire=300

pkg/rpm/vmod-re.spec

@@ -9,10 +9,10 @@ Group: System Environment/Daemons
 URL: https://code.uplex.de/uplex-varnish/libvmod-re
 Source0: lib%{name}-v%{version}.tar.gz
 
-# varnish from varnish5 at packagecloud
-Requires: varnish >= 5.2.0
+# varnish from varnish60 at packagecloud
+Requires: varnish >= 6.0.0
 
-BuildRequires: varnish-devel >= 5.2.0
+BuildRequires: varnish-devel >= 6.0.0
 BuildRequires: pkgconfig
 BuildRequires: make
 BuildRequires: gcc