%define __find_provides %{_mingw_findprovides}
Name: mingw-gnutls
-Version: 2.4.1
-Release: 6%{?dist}
+Version: 2.4.2
+Release: 1%{?dist}
Summary: MinGW Windows GnuTLS TLS/SSL encryption library
-License: LGPLv2+
+License: GPLv3+ and LGPLv2+
Group: Development/Libraries
-URL: http://www.gnu.org/software/gnutls/
-Source0: ftp://ftp.gnutls.org/pub/gnutls/gnutls-%{version}.tar.bz2
+URL: http://www.gnutls.org/
+#Source0: ftp://ftp.gnutls.org/pub/gnutls/gnutls-%{version}.tar.bz2
+# XXX patent tainted SRP code removed.
+Source0: gnutls-%{version}-nosrp.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
Patch0: gnutls-certtool-build.patch
+Patch1: gnutls-2.4.0-nosrp.patch
-BuildRequires: mingw-filesystem >= 23
+BuildRequires: mingw-filesystem >= 25
BuildRequires: mingw-gcc
BuildRequires: mingw-binutils
BuildRequires: mingw-libgpg-error
BuildRequires: mingw-iconv
BuildRequires: mingw-gettext
BuildRequires: mingw-zlib
-
+BuildRequires: autoconf automake libtool
%description
MinGW Windows GnuTLS TLS/SSL encryption library.
%prep
%setup -q -n gnutls-%{version}
%patch0 -p1
+%patch1 -p1
+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
+done
%build
autoreconf
-%{_mingw_configure} --with-included-libtasn1 --disable-cxx
+PATH="%{_mingw_bindir}:$PATH" \
+%{_mingw_configure} --with-included-libtasn1 --disable-cxx \
+ --disable-srp-authentication
make
rm $RPM_BUILD_ROOT%{_mingw_libdir}/libgnutls-openssl.a
rm $RPM_BUILD_ROOT%{_mingw_libdir}/libgnutls.a
+# Remove info and man pages which duplicate stuff in Fedora already.
+rm -rf $RPM_BUILD_ROOT%{_mingw_infodir}
+rm -rf $RPM_BUILD_ROOT%{_mingw_mandir}
+
%clean
rm -rf $RPM_BUILD_ROOT
%{_mingw_bindir}/libgnutls-openssl-26.def
%{_mingw_bindir}/libgnutls-openssl-26.dll
%{_mingw_bindir}/psktool.exe
-%{_mingw_bindir}/srptool.exe
%{_mingw_libdir}/libgnutls-extra.dll.a
%{_mingw_libdir}/libgnutls-extra.la
%{_mingw_libdir}/libgnutls-openssl.dll.a
%{_mingw_includedir}/gnutls/
%{_mingw_datadir}/aclocal/libgnutls-extra.m4
%{_mingw_datadir}/aclocal/libgnutls.m4
-%{_mingw_datadir}/info/gnutls-*.png
-%{_mingw_datadir}/info/gnutls.info*
-%{_mingw_mandir}/man1/certtool.1*
-%{_mingw_mandir}/man1/gnutls-cli-debug.1*
-%{_mingw_mandir}/man1/gnutls-cli.1*
-%{_mingw_mandir}/man1/gnutls-serv.1*
-%{_mingw_mandir}/man1/psktool.1*
-%{_mingw_mandir}/man1/srptool.1*
-%{_mingw_mandir}/man3/gnutls_*.3*
%{_mingw_datadir}/locale/*/LC_MESSAGES/gnutls.mo
%changelog
+* Wed Sep 24 2008 Daniel P. Berrange <berrange@redhat.com> - 2.4.2-1
+- New native version.
+
+* Mon Sep 22 2008 Daniel P. Berrange <berrange@redhat.com> - 2.4.1-9
+- Switch to source tar.bz2 with SRP stuff removed
+
+* Sun Sep 21 2008 Richard W.M. Jones <rjones@redhat.com> - 2.4.1-8
+- Remove duplicate manpages and info files.
+
+* Thu Sep 11 2008 Daniel P. Berrange <berrange@redhat.com> - 2.4.1-7
+- Add BR on autoconf, automake and libtool
+
* Wed Sep 10 2008 Richard W.M. Jones <rjones@redhat.com> - 2.4.1-6
- Need to run autoreconf after patching src/Makefile.am.
- Remove static libs.