X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=gnutls%2Fmingw32-gnutls.spec;h=107f7b330a97c846fe34e51fd14143b5722afcb3;hb=e3e47afc4b3fd9505c83bff0710a5f907bfc0a3d;hp=ec269bc7fc03c9d143fc0a82c3d0a8297233cdc4;hpb=351b3781823a3b7c8eeace40c1a0dc236241b369;p=fedora-mingw.git

diff --git a/gnutls/mingw32-gnutls.spec b/gnutls/mingw32-gnutls.spec
index ec269bc..107f7b3 100644
--- a/gnutls/mingw32-gnutls.spec
+++ b/gnutls/mingw32-gnutls.spec
@@ -5,15 +5,16 @@
 %define __find_provides %{_mingw32_findprovides}
 
 Name:           mingw32-gnutls
-Version:        2.6.3
+Version:        2.6.4
 Release:        1%{?dist}
-Summary:        MinGW Windows GnuTLS TLS/SSL encryption library
+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)
 
@@ -22,23 +23,36 @@ BuildArch:      noarch
 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 >= 1.2.2
-BuildRequires:  mingw32-iconv
 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
@@ -52,14 +66,21 @@ for i in auth_srp_rsa.c auth_srp_sb64.c auth_srp_passwd.c auth_srp.c gnutls_srp.
     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-srp-authentication \
   --disable-static
-make %{?_smp_mflags}
+# %{?_smp_mflags} doesn't build correctly.
+make
 
 
 %install
@@ -72,7 +93,6 @@ rm -f $RPM_BUILD_ROOT%{_mingw32_datadir}/info/dir
 rm -rf $RPM_BUILD_ROOT%{_mingw32_infodir}
 rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}
 
-
 %find_lang gnutls
 
 
@@ -82,6 +102,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %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
@@ -109,12 +130,27 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Fri Jan 23 2009 Richard W.M. Jones <rjones@redhat.com> - 2.6.3-1
+* 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 _smp_mflags.
 - 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.