From 487ecb4822ffbf06d95c897e3819df2157864795 Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Sep 09 2004 05:45:53 +0000
Subject: auto-import changelog data from gnutls-1.0.20-2.src.rpm

Tue Sep 07 2004 Jeff Johnson <jbj@redhat.com> 1.0.20-2
- patent tainted SRP code removed.
Sun Sep 05 2004 Jeff Johnson <jbj@redhat.com> 1.0.20-1
- update to 1.0.20.
- add --with-included-opencdk --with-included-libtasn1
- add --with-included-libcfg --with-included-lzo
- add --disable-srp-authentication.
- do "make check" after build.
Fri Mar 21 2003 Jeff Johnson <jbj@redhat.com> 0.9.2-1
- upgrade to 0.9.2

---

diff --git a/.cvsignore b/.cvsignore
index 071ae3e..8be08f4 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnutls-0.4.4.tar.gz
+gnutls-1.0.20-nosrp.tar.gz
diff --git a/gnutls.spec b/gnutls.spec
index 6e01dca..c8404c4 100644
--- a/gnutls.spec
+++ b/gnutls.spec
@@ -1,13 +1,19 @@
+Summary: A TLS implementation.
 Name: gnutls
-Version: 0.4.4
-Release: 1
-Source: ftp://ftp.gnutls.org/pub/%{name}-%{version}.tar.gz
+Version: 1.0.20
+Release: 2
 License: LGPL
-Summary: A TLS implementation.
 Group: System Environment/Libraries
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildPrereq: libgcrypt-devel
+#BuildPrereq: libtasn1-devel
+#BuildPrereq: opencdk-devel
 URL: http://www.gnutls.org/
+#Source0: ftp://ftp.gnutls.org/pub/gnutls/devel/%{name}-%{version}.tar.gz
+#Source1: ftp://ftp.gnutls.org/pub/gnutls/devel/%{name}-%{version}.tar.gz.sig
+# XXX patent tainted SRP code removed.
+Source0: %{name}-%{version}-nosrp.tar.gz
+Patch0: gnutls-1.0.20-nosrp.patch
+BuildRoot: %{_tmppath}/%{name}-root
 
 %package devel
 Summary: Development files for the %{name} package.
@@ -24,22 +30,21 @@ this description.
 
 %prep
 %setup -q
+%patch0 -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 libextra/$i
+done
 
 %build
-%configure --disable-openpgp-authentication --disable-libopencdktest
+%configure --with-included-opencdk --with-included-libtasn1 --with-included-libcfg --with-included-lzo --disable-srp-authentication
 make
 
 %install
 rm -fr $RPM_BUILD_ROOT
 %makeinstall
 
-# XXX until %%configure is figgered
-for bin in $RPM_BUILD_ROOT/%{_bindir}/* ; do
-	newname=`echo ${bin} | sed 's,%{_target_platform}-,,g'`
-	if test "$bin" != "$newname" ; then
-		mv "$bin" "$newname"
-	fi
-done
+%check
+make check
 
 %clean
 rm -fr $RPM_BUILD_ROOT
@@ -59,9 +64,23 @@ rm -fr $RPM_BUILD_ROOT
 %{_libdir}/*.a
 %{_libdir}/*.la
 %{_libdir}/*.so
+%{_mandir}/man1/*
 %{_datadir}/aclocal/*
 
 %changelog
+* Tue Sep  7 2004 Jeff Johnson <jbj@redhat.com> 1.0.20-2
+- patent tainted SRP code removed.
+
+* Sun Sep  5 2004 Jeff Johnson <jbj@redhat.com> 1.0.20-1
+- update to 1.0.20.
+- add --with-included-opencdk --with-included-libtasn1
+- add --with-included-libcfg --with-included-lzo
+- add --disable-srp-authentication.
+- do "make check" after build.
+
+* Fri Mar 21 2003 Jeff Johnson <jbj@redhat.com> 0.9.2-1
+- upgrade to 0.9.2
+
 * Tue Jun 25 2002 Jeff Johnson <jbj@redhat.com> 0.4.4-1
 - update to 0.4.4.
 
diff --git a/sources b/sources
index 8b8b53e..70889c9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3f62d627950256f826c5902af6440509  gnutls-0.4.4.tar.gz
+3183117e114d5570924f43d28c1697b3  gnutls-1.0.20-nosrp.tar.gz