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

diff --git a/gnutls/mingw-gnutls.spec b/gnutls/mingw-gnutls.spec
index abc60b0..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:        4%{?dist}
+Release:        7%{?dist}
 Summary:        MinGW Windows GnuTLS TLS/SSL encryption library
 
 License:        LGPLv2+
@@ -11,18 +15,19 @@ URL:            http://www.gnu.org/software/gnutls/
 Source0:        ftp://ftp.gnutls.org/pub/gnutls/gnutls-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+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
 BuildRequires:  mingw-libgcrypt
 BuildRequires:  mingw-iconv
 BuildRequires:  mingw-gettext
-
-BuildConflicts: mingw-zlib
-
+BuildRequires:  mingw-zlib
+BuildRequires:  autoconf automake libtool
 
 %description
 MinGW Windows GnuTLS TLS/SSL encryption library.
@@ -34,6 +39,8 @@ MinGW Windows GnuTLS TLS/SSL encryption library.
 
 
 %build
+autoreconf
+PATH="%{_mingw_bindir}:$PATH" \
 %{_mingw_configure} --with-included-libtasn1 --disable-cxx
 make
 
@@ -42,6 +49,11 @@ make
 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
@@ -64,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
@@ -91,9 +100,16 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Fri Sep  5 2008 Richard W.M. Jones <rjones@redhat.com> - 2.4.1-4
-- Build conflicts with mingw-zlib.
+* 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.
 
 * Thu Sep  4 2008 Richard W.M. Jones <rjones@redhat.com> - 2.4.1-3
 - Use mingw-filesystem RPM macros.