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

diff --git a/gnutls/mingw-gnutls.spec b/gnutls/mingw-gnutls.spec
index 1d22975..b478cdb 100644
--- a/gnutls/mingw-gnutls.spec
+++ b/gnutls/mingw-gnutls.spec
@@ -1,8 +1,12 @@
-%define __os_install_post /usr/lib/rpm/brp-compress %{nil}
+%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:        1%{?dist}
+Release:        6%{?dist}
 Summary:        MinGW Windows GnuTLS TLS/SSL encryption library
 
 License:        LGPLv2+
@@ -11,14 +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 >= 23
 BuildRequires:  mingw-gcc
 BuildRequires:  mingw-binutils
 BuildRequires:  mingw-libgpg-error
 BuildRequires:  mingw-libgcrypt
+BuildRequires:  mingw-iconv
+BuildRequires:  mingw-gettext
+BuildRequires:  mingw-zlib
 
-Requires:       mingw-runtime
-Requires:       mingw-libgpg-error
-Requires:       mingw-libgcrypt
 
 %description
 MinGW Windows GnuTLS TLS/SSL encryption library.
@@ -26,17 +35,12 @@ MinGW Windows GnuTLS TLS/SSL encryption library.
 
 %prep
 %setup -q -n gnutls-%{version}
+%patch0 -p1
 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS -fno-stack-protector" \
-./configure \
-  --build=%_build \
-  --host=i686-pc-mingw32 \
-  --prefix=%{_prefix}/i686-pc-mingw32/sys-root/mingw \
-  --disable-cxx
-# Disable C++ package until we have a C++ compiler (see mingw-gcc).
-
+autoreconf
+%{_mingw_configure} --with-included-libtasn1 --disable-cxx
 make
 
 
@@ -44,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
@@ -52,15 +61,58 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/bin/*
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/*
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/include/*
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/aclocal/*
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/info/*
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/man/man1/*
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/man/man3/*
+%{_mingw_bindir}/certtool.exe
+%{_mingw_bindir}/gnutls-cli-debug.exe
+%{_mingw_bindir}/gnutls-cli.exe
+%{_mingw_bindir}/gnutls-serv.exe
+%{_mingw_bindir}/libgnutls-26.def
+%{_mingw_bindir}/libgnutls-26.dll
+%{_mingw_bindir}/libgnutls-config
+%{_mingw_bindir}/libgnutls-extra-26.def
+%{_mingw_bindir}/libgnutls-extra-26.dll
+%{_mingw_bindir}/libgnutls-extra-config
+%{_mingw_bindir}/libgnutls-openssl-26.def
+%{_mingw_bindir}/libgnutls-openssl-26.dll
+%{_mingw_bindir}/psktool.exe
+%{_mingw_bindir}/srptool.exe
+%{_mingw_libdir}/libgnutls-extra.dll.a
+%{_mingw_libdir}/libgnutls-extra.la
+%{_mingw_libdir}/libgnutls-openssl.dll.a
+%{_mingw_libdir}/libgnutls-openssl.la
+%{_mingw_libdir}/libgnutls.dll.a
+%{_mingw_libdir}/libgnutls.la
+%{_mingw_libdir}/pkgconfig/gnutls-extra.pc
+%{_mingw_libdir}/pkgconfig/gnutls.pc
+%{_mingw_includedir}/gnutls/
+%{_mingw_datadir}/aclocal/libgnutls-extra.m4
+%{_mingw_datadir}/aclocal/libgnutls.m4
+%{_mingw_datadir}/info/gnutls-*.png
+%{_mingw_datadir}/info/gnutls.info*
+%{_mingw_mandir}/man1/certtool.1*
+%{_mingw_mandir}/man1/gnutls-cli-debug.1*
+%{_mingw_mandir}/man1/gnutls-cli.1*
+%{_mingw_mandir}/man1/gnutls-serv.1*
+%{_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.
+
+* Tue Sep  2 2008 Daniel P. Berrange <berrange@redhat.com> - 2.4.1-2
+- List files explicitly and use custom CFLAGS
+
 * Mon Jul  7 2008 Richard W.M. Jones <rjones@redhat.com> - 2.4.1-1
 - Initial RPM release, largely based on earlier work from several sources.