[mod_gnutls] fix build with new GnuTLS

[Tomáš Mráz]

commit dc5c23e6753d65692842d2fcff08e09fb9088111
Author: Tomas Mraz <tmraz at fedoraproject.org>
Date:   Thu Mar 7 09:14:01 2013 +0100

    fix build with new GnuTLS

 mod_gnutls-0.5.10-no-extra.patch |   11 +++++++++++
 mod_gnutls.spec                  |    6 ++++--
 2 files changed, 15 insertions(+), 2 deletions(-)
---
diff --git a/mod_gnutls-0.5.10-no-extra.patch b/mod_gnutls-0.5.10-no-extra.patch
new file mode 100644
index 0000000..c629f6b
--- /dev/null
+++ b/mod_gnutls-0.5.10-no-extra.patch
@@ -0,0 +1,11 @@
+diff -up mod_gnutls-0.5.10/include/mod_gnutls.h.in.no-extra mod_gnutls-0.5.10/include/mod_gnutls.h.in
+--- mod_gnutls-0.5.10/include/mod_gnutls.h.in.no-extra	2011-07-08 23:29:46.000000000 +0200
++++ mod_gnutls-0.5.10/include/mod_gnutls.h.in	2013-03-07 09:08:49.833348848 +0100
+@@ -28,7 +28,6 @@
+ #include "ap_release.h"
+ 
+ #include <gnutls/gnutls.h>
+-#include <gnutls/extra.h>
+ #include <gnutls/openpgp.h>
+ #include <gnutls/x509.h>
+ 
diff --git a/mod_gnutls.spec b/mod_gnutls.spec
index b147408..09d16e0 100644
--- a/mod_gnutls.spec
+++ b/mod_gnutls.spec
@@ -10,6 +10,7 @@ Source0:   http://modgnutls.sourceforge.net/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}
@@ -37,6 +38,7 @@ Features
 %setup -q
 %patch0 -p1
 %patch1 -p1 -b .httpd24
+%patch2 -p1 -b .no-extra
 cp %{SOURCE1} .
 
 %build
@@ -71,8 +73,8 @@ rm -fr %{_localstatedir}/cache/mod_gnutls
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_gnutls.conf
 
 %changelog
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.10-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+* Thu Mar  7 2013 Tomáš Mráz <tmraz at redhat.com> - 0.5.10-8
+- fix build with new GnuTLS
 
 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.10-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild