diff --git a/varnish-modules.spec b/varnish-modules.spec index 809f66d..a2f3e5b 100644 --- a/varnish-modules.spec +++ b/varnish-modules.spec @@ -1,47 +1,28 @@ -%define abi 6.1 -%if 0%{?fedora} == 27 -%define abi 6.0 -%endif -%if 0%{?fedora} == 26 -%define abi 6.0 -%endif -%if 0%{?fedora} == 25 -%define abi 5.0 -%endif - Name: varnish-modules -Version: 0.12.1 -Release: 7%{?dist} +Version: 0.15.0 +Release: 1%{?dist} Summary: A collection of modules ("vmods") extending Varnish VCL Group: System Environment/Daemons License: BSD URL: https://github.com/varnish/%{name} +Source: https://download.varnish-software.com/varnish-modules/%{name}-%{version}.tar.gz -Source0: https://download.varnish-software.com/varnish-modules/%{name}-%{version}.tar.gz - -# Upstream issue 35, workspace_client is too small on 32bit -#Patch3: varnish-modules-0.9.1-add_workspace_client_for_cookietest_on_32bit.patch - -# Upstream issue 34, upstream commit 29be10d -#Patch4: varnish-modules-0.9.1-fix_build_on_el5_git_29be10d.patch - -BuildRequires: varnish-libs-devel -BuildRequires: varnish -BuildRequires: pkgconfig -BuildRequires: make BuildRequires: gcc -BuildRequires: python-docutils >= 0.6 +BuildRequires: make +BuildRequires: pkgconfig(varnishapi) +BuildRequires: python-docutils +BuildRequires: varnish -Requires: varnishabi-%abi +Requires: varnish +Provides: vmod-bodyaccess = %{version}-%{release} Provides: vmod-cookie = %{version}-%{release} -Provides: vmod-vsthrottle = %{version}-%{release} Provides: vmod-header = %{version}-%{release} Provides: vmod-saintmode = %{version}-%{release} -Provides: vmod-softpurge = %{version}-%{release} Provides: vmod-tcp = %{version}-%{release} Provides: vmod-var = %{version}-%{release} +Provides: vmod-vsthrottle = %{version}-%{release} Provides: vmod-xkey = %{version}-%{release} @@ -52,52 +33,43 @@ capabilities. This collection contains the following vmods (previously kept individually): cookie, vsthrottle, header, saintmode, softpurge, tcp, var, xkey + %prep %setup -q + %build -%configure --disable-static \ - --docdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} -make %{?_smp_mflags} +%configure +%make_build -# Build man pages -pushd docs -for i in vmod*.rst; do - rst2man -v "$i" "$(basename $i .rst).3"; - gzip "$(basename $i .rst).3"; -done -popd - -chmod 644 src/*.h -chmod 644 src/*.c -chmod 644 docs/*rst %install -rm -rf %{buildroot} -make install DESTDIR=%{?buildroot} INSTALL="install -p" +%make_install find %{buildroot}/%{_libdir}/ -name '*.la' -exec rm -f {} ';' -rm %{buildroot}%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}/LICENSE -pushd docs -mkdir -p %{buildroot}%{_mandir}/man3 -install -p -m 0644 *.3.gz %{buildroot}%{_mandir}/man3 -popd + %check -make check +%make_build check VERBOSE=1 %files %doc docs AUTHORS CHANGES.rst COPYING README.rst -%if 0%{?fedora} >= 17 || 0%{?rhel} >= 7 %license LICENSE -%else -%doc LICENSE -%endif %{_libdir}/varnish/vmods/* %{_mandir}/man3/*.3* +%{_pkgdocdir} %changelog +* Tue Jul 17 2018 Dridi Boukelmoune 0.15.0-1 +- Update to 0.15.0 +- Drop EPEL and older Fedora releases support +- Drop broken manual ABI dependency to Varnish +- Drop commented out references to past patches +- Verbose test suite +- Simplified configure step +- Dependencies cleanup + * Sat Jul 14 2018 Fedora Release Engineering - 0.12.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild @@ -140,5 +112,3 @@ make check - First wrap for fedora - Uses some old-style specfile components for el5 compatibility, including the usage of the BuildRoot header and cleaning the buildroot before install - -