From d71fcd955dc9c767e4278303e0efd732c95bb8d2 Mon Sep 17 00:00:00 2001 From: Jiri Kastner Date: Jun 13 2016 09:16:17 +0000 Subject: rebase to 0.7.5 (rhbz#1339412) --- diff --git a/.gitignore b/.gitignore index 5d00236..49cb28d 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ mod_gnutls-0.5.5.tar.bz2 /mod_gnutls-0.6.tar.gz /mod_gnutls-0.7.tar.bz2 /mod_gnutls-0.7.3.tar.bz2 +/mod_gnutls-0.7.5.tar.bz2 diff --git a/mod_gnutls.spec b/mod_gnutls.spec index 3fc982a..b72585a 100644 --- a/mod_gnutls.spec +++ b/mod_gnutls.spec @@ -1,6 +1,6 @@ %{!?_httpd_mmn: %{expand: %%global _httpd_mmn %%(cat %{_includedir}/httpd/.mmn || echo 0-0)}} Name: mod_gnutls -Version: 0.7.3 +Version: 0.7.5 Release: 1%{?dist} Summary: GnuTLS module for the Apache HTTP server Group: System Environment/Daemons @@ -8,9 +8,6 @@ License: ASL 2.0 URL: http://mod.gnutls.org/ Source0: https://mod.gnutls.org/downloads/%{name}-%{version}.tar.bz2 Source1: mod_gnutls.conf -# Patch0: mod_gnutls_apr_memcache_m4_dirty.patch -# Patch1: mod_gnutls-0.5.10-httpd24.patch -# Patch2: mod_gnutls-0.5.10-no-extra.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: gnutls-devel, gnutls-utils, httpd-devel, apr-util-devel >= 1.3, libtool, autoconf, automake Requires: apr-util >= 1.3, gnutls-utils, httpd-mmn = %{_httpd_mmn} @@ -36,9 +33,6 @@ Features %prep %setup -q -# %patch0 -p1 -# %patch1 -p1 -b .httpd24 -# %patch2 -p1 -b .no-extra cp %{SOURCE1} . %build @@ -58,7 +52,7 @@ rm -rf autom4te.cache %install rm -rf %{buildroot} -%{__install} -m 755 -D src/.libs/libmod_gnutls.so %{buildroot}%{_libdir}/httpd/modules/mod_gnutls.so +%{__install} -m 755 -D src/.libs/mod_gnutls.so %{buildroot}%{_libdir}/httpd/modules/mod_gnutls.so %{__install} -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/mod_gnutls.conf %clean @@ -74,6 +68,9 @@ rm -fr %{_localstatedir}/cache/mod_gnutls %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_gnutls.conf %changelog +* Mon Jun 13 2016 Jiri Kastner - 0.7.5-1 +- rebase to 0.7.5 (rhbz#1339412) + * Sun Feb 14 2016 Jiri Kastner - 0.7.3-1 - rebase to 0.7.3 diff --git a/sources b/sources index d5713bb..9af939b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -62b86eb4c4761d0d3411c8d6575d9520 mod_gnutls-0.7.3.tar.bz2 +6129006fa689d241fceeae6fd4dcf9d6 mod_gnutls-0.7.5.tar.bz2