From: Richard W.M. Jones <rjones@redhat.com> <"Richard W.M. Jones <rjones@redhat.com>">
Date: Fri, 5 Sep 2008 08:29:20 +0000 (+0100)
Subject: * Fri Sep  5 2008 Richard W.M. Jones <rjones@redhat.com> - 2.4.1-4
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=da0226632b757361bd08a88b7f4bcb8b5e305f60;p=fedora-mingw.git

* Fri Sep  5 2008 Richard W.M. Jones <rjones@redhat.com> - 2.4.1-4
- Build conflicts with mingw-zlib.
- Add patch to build certtool.exe because of missing dep of gnulib on intl.
---

diff --git a/gnutls/gnutls-certtool-build.patch b/gnutls/gnutls-certtool-build.patch
new file mode 100644
index 0000000..9857260
--- /dev/null
+++ b/gnutls/gnutls-certtool-build.patch
@@ -0,0 +1,11 @@
+--- gnutls-2.4.1.orig/src/Makefile.am	2008-06-19 11:00:10.000000000 +0100
++++ gnutls-2.4.1/src/Makefile.am	2008-09-05 09:11:59.000000000 +0100
+@@ -65,7 +65,7 @@
+ certtool_SOURCES = certtool.gaa certtool-gaa.h certtool-cfg.h	\
+ 	certtool-gaa.c certtool.c prime.c certtool-cfg.c
+ certtool_LDADD = ../lib/libgnutls.la $(LIBGCRYPT_LIBS) \
+-	$(LIBTASN1_LIBS) ../gl/libgnu.la @LTLIBREADLINE@
++	$(LIBTASN1_LIBS) ../gl/libgnu.la @LTLIBREADLINE@ -lintl
+ if HAVE_LIBCFG
+ certtool_LDADD += -lcfg+
+ else
diff --git a/gnutls/mingw-gnutls.spec b/gnutls/mingw-gnutls.spec
index 385e5f7..abc60b0 100644
--- a/gnutls/mingw-gnutls.spec
+++ b/gnutls/mingw-gnutls.spec
@@ -11,6 +11,8 @@ 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)
 
+Patch0:         gnutls-certtool-build.patch
+
 BuildRequires:  mingw-filesystem >= 19
 BuildRequires:  mingw-gcc
 BuildRequires:  mingw-binutils
@@ -19,6 +21,8 @@ BuildRequires:  mingw-libgcrypt
 BuildRequires:  mingw-iconv
 BuildRequires:  mingw-gettext
 
+BuildConflicts: mingw-zlib
+
 
 %description
 MinGW Windows GnuTLS TLS/SSL encryption library.
@@ -26,6 +30,7 @@ MinGW Windows GnuTLS TLS/SSL encryption library.
 
 %prep
 %setup -q -n gnutls-%{version}
+%patch0 -p1
 
 
 %build
@@ -82,9 +87,14 @@ 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
+* Fri Sep  5 2008 Richard W.M. Jones <rjones@redhat.com> - 2.4.1-4
+- Build conflicts with mingw-zlib.
+- Add patch to build certtool.exe because of missing dep of gnulib on intl.
+
 * 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.