Commit eca6ef75 authored by Geoff Simmons's avatar Geoff Simmons

Set version 1.10.0, and update RPM packaging.

parent 7d8c5430
AC_PREREQ([2.68]) AC_PREREQ([2.68])
AC_INIT([libvmod-re2], [trunk], [varnish-support@uplex.de], [vmod-re2]) AC_INIT([libvmod-re2], [1.10.0], [varnish-support@uplex.de], [vmod-re2])
AC_COPYRIGHT([Copyright 2016-2017 UPLEX - Nils Goroll Systemoptimierung]) AC_COPYRIGHT([Copyright 2016-2017 UPLEX - Nils Goroll Systemoptimierung])
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_AUX_DIR([build-aux])
......
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
# - this script (named pkg) # - this script (named pkg)
# - VMOD re2 tarball (vmod-re2-$VERSION.tar.gz) # - VMOD re2 tarball (vmod-re2-$VERSION.tar.gz)
# - RPM spec file (vmod-re2.spec) # - RPM spec file (vmod-re2.spec)
# - yum repo config for varnish61@packagecloud (varnishcache_varnish61.repo) # - yum repo config for varnish65@packagecloud (varnishcache_varnish65.repo)
# (see https://packagecloud.io/varnishcache/varnish61/install#manual-rpm) # (see https://packagecloud.io/varnishcache/varnish65/install#manual-rpm)
# So this is a sample docker invocation: # So this is a sample docker invocation:
# #
...@@ -45,9 +45,9 @@ sudo yum install -y -q \ ...@@ -45,9 +45,9 @@ sudo yum install -y -q \
https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
# set up varnish repo # set up varnish repo
sudo cp /srv/varnishcache_varnish61.repo /etc/yum.repos.d/ sudo cp /srv/varnishcache_varnish65.repo /etc/yum.repos.d/
sudo yum -q makecache -y --disablerepo='*' --enablerepo='varnishcache_varnish61' sudo yum -q makecache -y --disablerepo='*' --enablerepo='varnishcache_varnish65'
# build requirements # build requirements
sudo yum install -y -q \ sudo yum install -y -q \
......
[varnishcache_varnish5]
name=varnishcache_varnish5
baseurl=https://packagecloud.io/varnishcache/varnish5/el/7/$basearch
repo_gpgcheck=1
gpgcheck=0
enabled=1
gpgkey=https://packagecloud.io/varnishcache/varnish5/gpgkey
sslverify=1
sslcacert=/etc/pki/tls/certs/ca-bundle.crt
metadata_expire=300
[varnishcache_varnish5-source]
name=varnishcache_varnish5-source
baseurl=https://packagecloud.io/varnishcache/varnish5/el/7/SRPMS
repo_gpgcheck=1
gpgcheck=0
enabled=1
gpgkey=https://packagecloud.io/varnishcache/varnish5/gpgkey
sslverify=1
sslcacert=/etc/pki/tls/certs/ca-bundle.crt
metadata_expire=300
[varnishcache_varnish61] [varnishcache_varnish65]
name=varnishcache_varnish61 name=varnishcache_varnish65
baseurl=https://packagecloud.io/varnishcache/varnish61/el/7/$basearch baseurl=https://packagecloud.io/varnishcache/varnish65/el/7/$basearch
repo_gpgcheck=1 repo_gpgcheck=1
gpgcheck=0 gpgcheck=0
enabled=1 enabled=1
gpgkey=https://packagecloud.io/varnishcache/varnish61/gpgkey gpgkey=https://packagecloud.io/varnishcache/varnish65/gpgkey
sslverify=1 sslverify=1
sslcacert=/etc/pki/tls/certs/ca-bundle.crt sslcacert=/etc/pki/tls/certs/ca-bundle.crt
metadata_expire=300 metadata_expire=300
[varnishcache_varnish61-source] [varnishcache_varnish65-source]
name=varnishcache_varnish61-source name=varnishcache_varnish65-source
baseurl=https://packagecloud.io/varnishcache/varnish61/el/7/SRPMS baseurl=https://packagecloud.io/varnishcache/varnish65/el/7/SRPMS
repo_gpgcheck=1 repo_gpgcheck=1
gpgcheck=0 gpgcheck=0
enabled=1 enabled=1
gpgkey=https://packagecloud.io/varnishcache/varnish61/gpgkey gpgkey=https://packagecloud.io/varnishcache/varnish65/gpgkey
sslverify=1 sslverify=1
sslcacert=/etc/pki/tls/certs/ca-bundle.crt sslcacert=/etc/pki/tls/certs/ca-bundle.crt
metadata_expire=300 metadata_expire=300
...@@ -11,10 +11,10 @@ Source0: %{name}-%{version}.tar.gz ...@@ -11,10 +11,10 @@ Source0: %{name}-%{version}.tar.gz
# varnish from varnish61 at packagecloud # varnish from varnish61 at packagecloud
# This is the Requires for VMOD ABI compatibility with VRT >= 8.0. # This is the Requires for VMOD ABI compatibility with VRT >= 8.0.
Requires: varnishd(vrt)%{?_isa} >= 8 Requires: varnishd(vrt)%{?_isa} >= 12
Requires: re2 >= 20150501 Requires: re2 >= 20150501
BuildRequires: varnish-devel >= 6.1.0 BuildRequires: varnish-devel >= 6.5.1
BuildRequires: re2-devel >= 20150501 BuildRequires: re2-devel >= 20150501
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: make BuildRequires: make
...@@ -69,13 +69,28 @@ rm -rf %{buildroot} ...@@ -69,13 +69,28 @@ rm -rf %{buildroot}
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_libdir}/varnish*/vmods/ %{_libdir}/varnish*/vmods/
%{_mandir}/man3/*.3* %{_mandir}/man3/*.3*
%doc README.rst COPYING LICENSE %doc README.md COPYING LICENSE
%post %post
/sbin/ldconfig /sbin/ldconfig
%changelog %changelog
* Mon Dec 3 2018 Geoff Simmons <geoff@uplex.de> - 1.6.1 * Wed Dec 30 2020 Geoff Simmons <geoff@uplex.de> - %{_version}-%{_release}
- Require VRT 12.0, compatible with Varnish 6.5
* Tue Oct 8 2019 Geoff Simmons <geoff@uplex.de> - 1.8.0
- Require VRT 10.0, compatible with Varnish 6.3
* Mon Aug 26 2019 Geoff Simmons <geoff@uplex.de> - 1.6.1-2
- Add integers associated with set elements, for Varnish 6.1
* Fri Aug 23 2019 Geoff Simmons <geoff@uplex.de> - 1.7.0-1
- Add integers associated with set elements.
* Mon Apr 15 2019 Geoff Simmons <geoff@uplex.de> - 1.6.2
- Dependency is VRT 9.0, compatible with Varnish 6.2
* Mon Dec 3 2018 Geoff Simmons <geoff@uplex.de> - 1.6.1-1
- True dependency on VRT 8.0, compatible with Varnish 6.1, libvarnishapi.so.2 - True dependency on VRT 8.0, compatible with Varnish 6.1, libvarnishapi.so.2
* Fri Nov 30 2018 Geoff Simmons <geoff@uplex.de> - 1.5.2 * Fri Nov 30 2018 Geoff Simmons <geoff@uplex.de> - 1.5.2
......
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