X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=gnutls%2Fmingw32-gnutls.spec;h=367c220a4299cab0ec006729568792263ff6a7cb;hb=7e5dca9cddc70940dd5cd0a721c19f5184d6a9ce;hp=80f217ffe79cfa6e308f93ed6c43b86f0a4eec4f;hpb=4e12cf3752f8d51c9df07ea13cdcbc8014454506;p=fedora-mingw.git

diff --git a/gnutls/mingw32-gnutls.spec b/gnutls/mingw32-gnutls.spec
index 80f217f..367c220 100644
--- a/gnutls/mingw32-gnutls.spec
+++ b/gnutls/mingw32-gnutls.spec
@@ -6,7 +6,7 @@
 
 Name:           mingw32-gnutls
 Version:        2.6.3
-Release:        1%{?dist}
+Release:        5%{?dist}
 Summary:        MinGW Windows GnuTLS TLS/SSL encryption library
 
 License:        GPLv3+ and LGPLv2+
@@ -24,8 +24,9 @@ Patch1:         gnutls-2.6.2-nosrp.patch
 # MinGW-specific patches.
 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
@@ -34,7 +35,16 @@ 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
 
@@ -54,8 +64,14 @@ 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 \
@@ -75,7 +91,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
 
 
@@ -85,6 +100,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
@@ -112,7 +128,16 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Fri Jan 23 2009 Richard W.M. Jones <rjones@redhat.com> - 2.6.3-1
+* 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.
@@ -120,6 +145,7 @@ rm -rf $RPM_BUILD_ROOT
 - 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.