%define __find_provides %{_mingw32_findprovides}
Name: mingw32-gnutls
-Version: 2.4.2
-Release: 3%{?dist}
-Summary: MinGW Windows GnuTLS TLS/SSL encryption library
+Version: 2.6.4
+Release: 1%{?dist}
+Summary: MinGW GnuTLS TLS/SSL encryption library
License: GPLv3+ and LGPLv2+
Group: Development/Libraries
URL: http://www.gnutls.org/
#Source0: ftp://ftp.gnutls.org/pub/gnutls/gnutls-%{version}.tar.bz2
-# XXX patent tainted SRP code removed.
+# We use the same source tarball as Fedora native package, which
+# has the patent tainted SRP code removed.
Source0: gnutls-%{version}-nosrp.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-Patch1: gnutls-2.4.0-nosrp.patch
-Patch5: gnutls-1.4.1-cve-2008-4989.patch
+Patch1: gnutls-2.6.2-nosrp.patch
# MinGW-specific patches.
-Patch1000: gnutls-certtool-build.patch
+Patch1000: mingw32-gnutls-2.6.3-certtool-build.patch
-BuildRequires: mingw32-filesystem >= 25
+BuildRequires: mingw32-filesystem >= 40
BuildRequires: mingw32-gcc
+BuildRequires: mingw32-gcc-c++
BuildRequires: mingw32-binutils
+BuildRequires: mingw32-dlfcn
BuildRequires: mingw32-libgpg-error
-BuildRequires: mingw32-libgcrypt
-BuildRequires: mingw32-iconv
+BuildRequires: mingw32-libgcrypt >= 1.2.2
BuildRequires: mingw32-gettext
+BuildRequires: mingw32-iconv
+BuildRequires: mingw32-readline
BuildRequires: mingw32-zlib
-BuildRequires: autoconf automake libtool
+
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: libtool
+
+# Yes, really ...
+BuildRequires: pkgconfig
+
+# For native /usr/bin/msgfmt etc.
+BuildRequires: gettext
+
+Requires: pkgconfig
+
%description
-MinGW Windows GnuTLS TLS/SSL encryption library.
+GnuTLS TLS/SSL encryption library. This library is cross-compiled
+for MinGW.
%prep
%setup -q -n gnutls-%{version}
%patch1 -p1 -b .nosrp
-%patch5 -p1 -b .chain-verify
%patch1000 -p1 -b .mingw32
touch lib/$i
done
-%build
+%if 0%{?fedora} > 10
+libtoolize --force --copy
+aclocal
autoreconf
+%endif
+
+
+%build
PATH="%{_mingw32_bindir}:$PATH" \
-%{_mingw32_configure} --with-included-libtasn1 --disable-cxx \
- --disable-srp-authentication
+%{_mingw32_configure} \
+ --with-included-libtasn1 \
+ --disable-srp-authentication \
+ --disable-static
+# %{?_smp_mflags} doesn't build correctly.
make
make DESTDIR=$RPM_BUILD_ROOT install
rm -f $RPM_BUILD_ROOT%{_mingw32_datadir}/info/dir
-rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libgnutls-extra.a
-rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libgnutls-openssl.a
-rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libgnutls.a
-
# Remove info and man pages which duplicate stuff in Fedora already.
rm -rf $RPM_BUILD_ROOT%{_mingw32_infodir}
rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}
+%find_lang gnutls
+
%clean
rm -rf $RPM_BUILD_ROOT
-%files
+%files -f gnutls.lang
%defattr(-,root,root)
+%doc COPYING COPYING.LIB
%{_mingw32_bindir}/certtool.exe
%{_mingw32_bindir}/gnutls-cli-debug.exe
%{_mingw32_bindir}/gnutls-cli.exe
%{_mingw32_includedir}/gnutls/
%{_mingw32_datadir}/aclocal/libgnutls-extra.m4
%{_mingw32_datadir}/aclocal/libgnutls.m4
-%{_mingw32_datadir}/locale/*/LC_MESSAGES/gnutls.mo
%changelog
+* Mon Mar 9 2009 Richard W.M. Jones <rjones@redhat.com> - 2.6.4-1
+- New Fedora native version 2.6.4.
+
+* Fri Feb 20 2009 Richard W.M. Jones <rjones@redhat.com> - 2.6.3-5
+- Rebuild for mingw32-gcc 4.4
+
+* Thu Feb 19 2009 Richard W.M. Jones <rjones@redhat.com> - 2.6.3-4
+- +BR mingw32-gcc-c++
+
+* Fri Feb 6 2009 Richard W.M. Jones <rjones@redhat.com> - 2.6.3-3
+- Include license.
+
+* Fri Jan 23 2009 Richard W.M. Jones <rjones@redhat.com> - 2.6.3-2
+- Rebase to native Fedora version 2.6.3.
+- Enable C++ library.
+- Use find_lang macro.
+- Don't build static library.
+- Rebase MinGW patch to 2.6.3.
+- +BR mingw32-dlfcn.
+- +BR mingw32-readline.
+- Force rebuild of libtool.
+
+* Tue Jan 13 2009 Richard W.M. Jones <rjones@redhat.com> - 2.4.2-4
+- Requires pkgconfig.
+
* Thu Nov 13 2008 Richard W.M. Jones <rjones@redhat.com> - 2.4.2-3
- fix chain verification issue CVE-2008-4989 (#470079)
- separate out the MinGW-specific patch from the others