X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=gnutls%2Fmingw-gnutls.spec;h=74544c855e511b21d18ffb3f17eccc4198de6eaa;hb=1eb03aa41e8de77677dc7ea0b8e66d06001c901b;hp=6db69453c2ad37eccc79ec95b012958d9b41d15c;hpb=2e1b8617ce0ac4fe1574cb5caedd2296cd481ef5;p=fedora-mingw.git

diff --git a/gnutls/mingw-gnutls.spec b/gnutls/mingw-gnutls.spec
index 6db6945..74544c8 100644
--- a/gnutls/mingw-gnutls.spec
+++ b/gnutls/mingw-gnutls.spec
@@ -1,8 +1,12 @@
-%include /usr/lib/rpm/mingw-defs
+%define __strip %{_mingw_strip}
+%define __objdump %{_mingw_objdump}
+%define _use_internal_dependency_generator 0
+%define __find_requires %{_mingw_findrequires}
+%define __find_provides %{_mingw_findprovides}
 
 Name:           mingw-gnutls
 Version:        2.4.1
-Release:        5%{?dist}
+Release:        7%{?dist}
 Summary:        MinGW Windows GnuTLS TLS/SSL encryption library
 
 License:        LGPLv2+
@@ -15,7 +19,7 @@ BuildArch:      noarch
 
 Patch0:         gnutls-certtool-build.patch
 
-BuildRequires:  mingw-filesystem >= 19
+BuildRequires:  mingw-filesystem >= 23
 BuildRequires:  mingw-gcc
 BuildRequires:  mingw-binutils
 BuildRequires:  mingw-libgpg-error
@@ -23,7 +27,7 @@ BuildRequires:  mingw-libgcrypt
 BuildRequires:  mingw-iconv
 BuildRequires:  mingw-gettext
 BuildRequires:  mingw-zlib
-
+BuildRequires:  autoconf automake libtool
 
 %description
 MinGW Windows GnuTLS TLS/SSL encryption library.
@@ -35,6 +39,8 @@ MinGW Windows GnuTLS TLS/SSL encryption library.
 
 
 %build
+autoreconf
+PATH="%{_mingw_bindir}:$PATH" \
 %{_mingw_configure} --with-included-libtasn1 --disable-cxx
 make
 
@@ -45,6 +51,11 @@ rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 rm -f $RPM_BUILD_ROOT%{_mingw_datadir}/info/dir
 
+rm $RPM_BUILD_ROOT%{_mingw_libdir}/libgnutls-extra.a
+rm $RPM_BUILD_ROOT%{_mingw_libdir}/libgnutls-openssl.a
+rm $RPM_BUILD_ROOT%{_mingw_libdir}/libgnutls.a
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -65,13 +76,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw_bindir}/libgnutls-openssl-26.dll
 %{_mingw_bindir}/psktool.exe
 %{_mingw_bindir}/srptool.exe
-%{_mingw_libdir}/libgnutls-extra.a
 %{_mingw_libdir}/libgnutls-extra.dll.a
 %{_mingw_libdir}/libgnutls-extra.la
-%{_mingw_libdir}/libgnutls-openssl.a
 %{_mingw_libdir}/libgnutls-openssl.dll.a
 %{_mingw_libdir}/libgnutls-openssl.la
-%{_mingw_libdir}/libgnutls.a
 %{_mingw_libdir}/libgnutls.dll.a
 %{_mingw_libdir}/libgnutls.la
 %{_mingw_libdir}/pkgconfig/gnutls-extra.pc
@@ -92,6 +100,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* 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.
+
 * Fri Sep  5 2008 Richard W.M. Jones <rjones@redhat.com> - 2.4.1-5
 - Add patch to build certtool.exe because of missing dep of gnulib on intl.
 - BuildArch is noarch.