X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=gnutls%2Fmingw-gnutls.spec;h=b478cdba3ee4631174760ad95e1dbf585c941d1e;hb=867e3216a67af076107dc2eee37f384db1638544;hp=385e5f7898f393cb66c22738b3c109e4e5ed1ad4;hpb=7fe983350dc40e9b62fb035b2783f95d9f452030;p=fedora-mingw.git

diff --git a/gnutls/mingw-gnutls.spec b/gnutls/mingw-gnutls.spec
index 385e5f7..b478cdb 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:        6%{?dist}
 Summary:        MinGW Windows GnuTLS TLS/SSL encryption library
 
 License:        LGPLv2+
@@ -11,13 +15,18 @@ 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)
 
-BuildRequires:  mingw-filesystem >= 19
+BuildArch:      noarch
+
+Patch0:         gnutls-certtool-build.patch
+
+BuildRequires:  mingw-filesystem >= 23
 BuildRequires:  mingw-gcc
 BuildRequires:  mingw-binutils
 BuildRequires:  mingw-libgpg-error
 BuildRequires:  mingw-libgcrypt
 BuildRequires:  mingw-iconv
 BuildRequires:  mingw-gettext
+BuildRequires:  mingw-zlib
 
 
 %description
@@ -26,9 +35,11 @@ MinGW Windows GnuTLS TLS/SSL encryption library.
 
 %prep
 %setup -q -n gnutls-%{version}
+%patch0 -p1
 
 
 %build
+autoreconf
 %{_mingw_configure} --with-included-libtasn1 --disable-cxx
 make
 
@@ -37,6 +48,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
@@ -59,13 +75,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
@@ -82,9 +95,18 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw_mandir}/man1/psktool.1*
 %{_mingw_mandir}/man1/srptool.1*
 %{_mingw_mandir}/man3/gnutls_*.3*
+%{_mingw_datadir}/locale/*/LC_MESSAGES/gnutls.mo
 
 
 %changelog
+* 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.
 - Depends on mingw-iconv, mingw-gettext.