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

diff --git a/gnutls/mingw32-gnutls.spec b/gnutls/mingw32-gnutls.spec
index ec269bc..3ea3380 100644
--- a/gnutls/mingw32-gnutls.spec
+++ b/gnutls/mingw32-gnutls.spec
@@ -22,17 +22,28 @@ 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-gcc
 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
 
@@ -52,14 +63,18 @@ 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
+libtoolize --force --copy
 autoreconf
+
+
+%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 +87,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
 
 
@@ -112,9 +126,12 @@ rm -rf $RPM_BUILD_ROOT
 * Fri Jan 23 2009 Richard W.M. Jones <rjones@redhat.com> - 2.6.3-1
 - 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.