[mod_gnutls] rebase to 0.6 (rhbz#1109115)

[jkastner]

commit 98cff61789a716f3197455bc789730f3cf2e8228
Author: Jiri Kastner <jkastner at redhat.com>
Date:   Tue Oct 7 22:59:07 2014 +0200

    rebase to 0.6 (rhbz#1109115)

 .gitignore      |    1 +
 mod_gnutls.spec |   28 ++++++++++++++++------------
 sources         |    2 +-
 3 files changed, 18 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 01acbe0..c5893ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 mod_gnutls-0.5.5.tar.bz2
 /mod_gnutls-0.5.10.tar.bz2
+/mod_gnutls-0.6.tar.gz
diff --git a/mod_gnutls.spec b/mod_gnutls.spec
index 3c1e300..e4de978 100644
--- a/mod_gnutls.spec
+++ b/mod_gnutls.spec
@@ -1,16 +1,16 @@
 %{!?_httpd_mmn: %{expand: %%global _httpd_mmn %%(cat %{_includedir}/httpd/.mmn || echo 0-0)}}
 Name:      mod_gnutls
-Version:   0.5.10
-Release:   14%{?dist}
+Version:   0.6
+Release:   1%{?dist}
 Summary:   GnuTLS module for the Apache HTTP server
 Group:     System Environment/Daemons
 License:   ASL 2.0
-URL:       http://modgnutls.sourceforge.net/
-Source0:   http://modgnutls.sourceforge.net/downloads/%{name}-%{version}.tar.bz2
+URL:       http://mod.gnutls.org/
+Source0:   https://mod.gnutls.org/downloads/%{name}-%{version}.tar.gz
 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
+# 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,8 +37,8 @@ Features
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1 -b .httpd24
-%patch2 -p1 -b .no-extra
+# %patch1 -p1 -b .httpd24
+# %patch2 -p1 -b .no-extra
 cp %{SOURCE1} .
 
 %build
@@ -53,14 +53,15 @@ rm -rf autom4te.cache
 %{__make} %{?_smp_mflags}
 
 %check
-%{__make} check
+# missing dependencies for running test
+# %{__make} check
 
 %install
 rm -rf %{buildroot}
 %{__install} -m 755 -D src/.libs/libmod_gnutls.so %{buildroot}%{_libdir}/httpd/modules/mod_gnutls.so
 %{__install} -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/mod_gnutls.conf
 %if 0%{?fedora} >= 21
-echo "GnuTLSPriorities \"@SYSTEM\"" >> %{buildroot}%{_sysconfdir}/httpd/conf.d/mod_gnutls.conf
+echo "GnuTLSPriorities @SYSTEM" >> %{buildroot}%{_sysconfdir}/httpd/conf.d/mod_gnutls.conf
 %endif
 
 %clean
@@ -71,11 +72,14 @@ rm -fr %{_localstatedir}/cache/mod_gnutls
 
 %files
 %defattr(-,root,root,-)
-%doc README NEWS NOTICE LICENSE README.ENV
+%doc README NOTICE LICENSE 
 %{_libdir}/httpd/modules/*.so
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_gnutls.conf
 
 %changelog
+* Tue Oct  7 2014 Jiri Kastner <jkastner at redhat.com> - 0.6-1
+- rebase to 0.6 (rhbz#1109115)
+
 * Fri Oct  3 2014 Jiri Kastner <jkastner at redhat.com> - 0.5.10-14
 - fix change to use system policy (rhbz#1109115) only on newer fedoras
 
@@ -115,7 +119,7 @@ rm -fr %{_localstatedir}/cache/mod_gnutls
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.10-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
-* Wed Oct 27 2011 Jiri Kastner <jkastner at redhat.com> - 0.5.10-1
+* Thu Oct 27 2011 Jiri Kastner <jkastner at redhat.com> - 0.5.10-1
 - apr_memcache.m4 modified for correct cheking of apr_memcache in apr-util
 - removed /var/cache/mod_gnutls from 'files' and 'install' stanzas
 - added 'pre' stanza for removal of old cache
diff --git a/sources b/sources
index 68c686a..10e3271 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-53fd571080b16333d3a4550b8477bf3c  mod_gnutls-0.5.10.tar.bz2
+f1498a0b2f1c27356882af91778ac1fd  mod_gnutls-0.6.tar.gz