Commit d17d63ba authored by Geoff Simmons's avatar Geoff Simmons

Set version maxwait-6.6.0, and package RPMs for compatibility.

parent 689b3f0f
AC_PREREQ([2.68])
AC_INIT([libvmod-re2], [1.11.0], [varnish-support@uplex.de], [vmod-re2])
AC_INIT([libvmod-re2], [maxwait-6.6.0], [varnish-support@uplex.de], [vmod-re2])
AC_COPYRIGHT([Copyright 2016-2017 UPLEX - Nils Goroll Systemoptimierung])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_AUX_DIR([build-aux])
......
......@@ -38,20 +38,24 @@ rm /home/builder/.rpmmacros
cd /home/builder
mkdir -p rpmbuild/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS}
cp /srv/vmod-re2.spec rpmbuild/SPECS
cp /srv/vmod-re2-${VERSION}.tar.gz rpmbuild/SOURCES
cp /srv/vmod-re2-maxwait-${VERSION}.tar.gz rpmbuild/SOURCES
# update the build env
set +e
sudo yum check-update -y -q
set -e
sudo yum upgrade -y -q
# set uplex repo for varnish-maxwait and VMOD re
sudo yum-config-manager --add-repo https://pkg.uplex.de/rpm/7/uplex-varnish/x86_64/
# install epel7 repo
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_varnish66.repo /etc/yum.repos.d/
sudo yum -q makecache -y --disablerepo='*' --enablerepo='varnishcache_varnish66'
# build requirements
sudo yum install -y -q \
varnish-devel re2-devel pkgconfig make gcc gcc-c++ python-docutils
sudo yum install --nogpgcheck -y -q varnish-maxwait-devel
sudo yum install -y -q re2-devel pkgconfig make gcc gcc-c++ python-docutils
# build RPMs
rpmbuild -ba -D "dist .${DIST}" \
......
[varnishcache_varnish66]
name=varnishcache_varnish66
baseurl=https://packagecloud.io/varnishcache/varnish66/el/7/$basearch
repo_gpgcheck=1
gpgcheck=0
enabled=1
gpgkey=https://packagecloud.io/varnishcache/varnish66/gpgkey
sslverify=1
sslcacert=/etc/pki/tls/certs/ca-bundle.crt
metadata_expire=300
[varnishcache_varnish66-source]
name=varnishcache_varnish66-source
baseurl=https://packagecloud.io/varnishcache/varnish66/el/7/SRPMS
repo_gpgcheck=1
gpgcheck=0
enabled=1
gpgkey=https://packagecloud.io/varnishcache/varnish66/gpgkey
sslverify=1
sslcacert=/etc/pki/tls/certs/ca-bundle.crt
metadata_expire=300
# -D MUST pass in _version and _release, and SHOULD pass in dist.
Summary: Google RE2 regular expression module for Varnish Cache
Name: vmod-re2
Name: vmod-re2-maxwait
Version: %{_version}
Release: %{_release}%{?dist}
License: BSD
......@@ -9,12 +9,10 @@ Group: System Environment/Daemons
URL: https://code.uplex.de/uplex-varnish/libvmod-re2
Source0: %{name}-%{version}.tar.gz
# varnish from varnish61 at packagecloud
# This is the Requires for VMOD ABI compatibility with VRT >= 13.0.
Requires: varnishd(vrt)%{?_isa} >= 13
Requires: varnish-maxwait = 6.6.0
Requires: re2 >= 20150501
BuildRequires: varnish-devel >= 6.6.0
BuildRequires: varnish-maxwait-devel >= 6.6.0
BuildRequires: re2-devel >= 20150501
BuildRequires: pkgconfig
BuildRequires: make
......@@ -29,7 +27,7 @@ BuildRequires: python-docutils >= 0.6
#BuildRequires: libtool
#BuildRequires: python-docutils >= 0.6
Provides: vmod-re2, vmod-re2-debuginfo
Provides: vmod-re2-maxwait, vmod-re2-maxwait-debuginfo
%description
Varnish Module (VMOD) for access to the Google RE2 regular expression
......@@ -75,7 +73,10 @@ rm -rf %{buildroot}
/sbin/ldconfig
%changelog
* Wed Apr 21 2021 Geoff Simmons <geoff@uplex.de> - %{_version}-%{_release}
* Fri May 21 2021 Geoff Simmons <geoff@uplex.de> - %{_version}-%{_release}
- Compatibility with varnish-maxwait (6.6.0)
* Wed Apr 21 2021 Geoff Simmons <geoff@uplex.de> - 1.11.0-1
- Require VRT 13.0, compatible with Varnish 6.6
* Wed Dec 30 2020 Geoff Simmons <geoff@uplex.de> - 1.10.0
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment