From cc299af3f19fc7038b601f17164aa0d060a9a7f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Mr=C3=A1z?= <tmraz@fedoraproject.org>
Date: Wed, 3 Jun 2009 18:56:13 +0000
Subject: [PATCH] - upgrade to a new upstream version

---
 .cvsignore               |  2 +-
 gnutls-2.6.2-nosrp.patch | 20 --------------------
 gnutls.spec              | 13 +++++++------
 sources                  |  2 +-
 4 files changed, 9 insertions(+), 28 deletions(-)
 delete mode 100644 gnutls-2.6.2-nosrp.patch

diff --git a/.cvsignore b/.cvsignore
index 2ac0c2a..176bc91 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnutls-2.6.6-nosrp.tar.bz2
+gnutls-2.8.0-nosrp.tar.bz2
diff --git a/gnutls-2.6.2-nosrp.patch b/gnutls-2.6.2-nosrp.patch
deleted file mode 100644
index 9bcdfeb..0000000
--- a/gnutls-2.6.2-nosrp.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -up gnutls-2.6.2/lib/gnutlsxx.cpp.nosrp gnutls-2.6.2/lib/gnutlsxx.cpp
---- gnutls-2.6.2/lib/gnutlsxx.cpp.nosrp	2008-11-12 10:56:28.000000000 +0100
-+++ gnutls-2.6.2/lib/gnutlsxx.cpp	2008-12-04 14:34:10.000000000 +0100
-@@ -396,12 +396,14 @@ void session::set_credentials( credentia
-     RETWRAP(gnutls_credentials_set( s, cred.get_type(), cred.ptr()));
- }
- 
--#ifdef ENABLE_SRP
- const char* server_session::get_srp_username() const
- {
-+#ifdef ENABLE_SRP
-     return gnutls_srp_server_get_username( s);
--}
-+#else
-+    return NULL;
- #endif
-+}
- 
- const char* server_session::get_psk_username() const
- {
diff --git a/gnutls.spec b/gnutls.spec
index 349928a..ef07960 100644
--- a/gnutls.spec
+++ b/gnutls.spec
@@ -1,6 +1,6 @@
 Summary: A TLS protocol implementation
 Name: gnutls
-Version: 2.6.6
+Version: 2.8.0
 Release: 1%{?dist}
 # The libgnutls library is LGPLv2+, utilities and remaining libraries are GPLv3+
 License: GPLv3+ and LGPLv2+
@@ -15,7 +15,6 @@ URL: http://www.gnutls.org/
 # XXX patent tainted SRP code removed.
 Source0: %{name}-%{version}-nosrp.tar.bz2
 Source1: libgnutls-config
-Patch1: gnutls-2.6.2-nosrp.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: libgcrypt >= 1.2.2
@@ -67,7 +66,6 @@ This package contains Guile bindings for the library.
 
 %prep
 %setup -q
-%patch1 -p1 -b .nosrp
 
 for i in auth_srp_rsa.c auth_srp_sb64.c auth_srp_passwd.c auth_srp.c gnutls_srp.c ext_srp.c; do
     touch lib/$i
@@ -79,6 +77,7 @@ autoreconf
            --with-included-libcfg \
            --disable-srp-authentication
 make
+cp lib/COPYING COPYING.LIB
 
 %install
 rm -fr $RPM_BUILD_ROOT
@@ -92,7 +91,7 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*srp*
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/libguile*.a
-%find_lang %{name}
+%find_lang libgnutls
 
 %check
 make check
@@ -118,7 +117,7 @@ fi
 
 %postun guile -p /sbin/ldconfig
 
-%files -f %{name}.lang
+%files -f libgnutls.lang
 %defattr(-,root,root,-)
 %{_libdir}/libgnutls*.so.*
 %doc COPYING COPYING.LIB README AUTHORS
@@ -129,7 +128,6 @@ fi
 %{_includedir}/*
 %{_libdir}/libgnutls*.a
 %{_libdir}/libgnutls*.so
-%{_datadir}/aclocal/*
 %{_libdir}/pkgconfig/*.pc
 %{_mandir}/man3/*
 %{_infodir}/gnutls*
@@ -149,6 +147,9 @@ fi
 %{_datadir}/guile/site/gnutls.scm
 
 %changelog
+* Wed Jun  3 2009 Tomas Mraz <tmraz@redhat.com> 2.8.0-1
+- upgrade to a new upstream version
+
 * Mon May  4 2009 Tomas Mraz <tmraz@redhat.com> 2.6.6-1
 - upgrade to a new upstream version - security fixes
 
diff --git a/sources b/sources
index 621e112..e76222d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-32bbbd459d3572dc97b9a93399fae3fe  gnutls-2.6.6-nosrp.tar.bz2
+c13e4da8e1e65b30505093f9e66d7714  gnutls-2.8.0-nosrp.tar.bz2