- Rebase to native Fedora version 2.6.3.

- Enable C++ library.
- Use find_lang macro.
- Don't build static library.
- Rebase MinGW patch to 2.6.3.
- +BR mingw32-dlfcn.
- +BR mingw32-readline.

diff --git a/gnutls/gnutls-certtool-build.patch b/gnutls/gnutls-certtool-build.patch
deleted file mode 100644 (file)
index 9857260..0000000
--- a/gnutls/gnutls-certtool-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/mingw32-gnutls-2.6.3-certtool-build.patch b/gnutls/mingw32-gnutls-2.6.3-certtool-build.patch
new file mode 100644 (file)
index 0000000..9398771
--- /dev/null
+++ b/gnutls/mingw32-gnutls-2.6.3-certtool-build.patch
@@ -0,0 +1,58 @@
+--- gnutls-2.6.3.orig/src/Makefile.am  2008-12-12 18:45:34.000000000 +0000
++++ gnutls-2.6.3/src/Makefile.am       2009-01-23 14:30:16.000000000 +0000
+@@ -37,35 +37,35 @@
+ gnutls_serv_SOURCES = serv.gaa serv-gaa.h serv-gaa.c list.h serv.c    \
+       common.h common.c select.c
+ gnutls_serv_LDADD = ../lib/libgnutls.la ../libextra/libgnutls-extra.la \
+-      $(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS) ../gl/libgnu.la
++      $(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS) ../gl/libgnu.la -lintl
+ 
+ if ENABLE_SRP
+ srptool_SOURCES = crypt.gaa crypt-gaa.h crypt-gaa.c crypt.c
+ srptool_LDADD = ../lib/libgnutls.la \
+       $(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS)                              \
+-      ../gl/libgnu.la ../lgl/liblgnu.la
++      ../gl/libgnu.la ../lgl/liblgnu.la -lintl
+ endif
+ 
+ psktool_SOURCES = psk.gaa psk-gaa.h psk-gaa.c psk.c
+ psktool_LDADD = ../lib/libgnutls.la \
+       $(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS)                              \
+-      ../gl/libgnu.la ../lgl/liblgnu.la
++      ../gl/libgnu.la ../lgl/liblgnu.la -lintl
+ 
+ gnutls_cli_SOURCES = cli.gaa cli-gaa.h cli-gaa.c cli.c common.h       \
+       common.c select.c
+ gnutls_cli_LDADD = ../lib/libgnutls.la ../libextra/libgnutls-extra.la \
+-      $(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS) ../gl/libgnu.la
++      $(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS) ../gl/libgnu.la -lintl
+ 
+ gnutls_cli_debug_SOURCES = tls_test.gaa tls_test-gaa.h tls_test-gaa.c \
+       tls_test.c tests.h tests.c common.h common.c
+ gnutls_cli_debug_LDADD = ../lib/libgnutls.la                  \
+       $(LIBGCRYPT_LIBS)       \
+-      $(LIBTASN1_LIBS) ../gl/libgnu.la
++      $(LIBTASN1_LIBS) ../gl/libgnu.la -lintl
+ 
+ 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 ../libextra/libgnutls-extra.la \
+-      $(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS) ../gl/libgnu.la @LTLIBREADLINE@
++      $(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS) ../gl/libgnu.la @LTLIBREADLINE@ -lintl
+ if HAVE_LIBCFG
+ certtool_LDADD += -lcfg+
+ else
+@@ -78,11 +78,11 @@
+ noinst_PROGRAMS = errcodes printlist
+ errcodes_SOURCES = errcodes.c
+ errcodes_LDADD = ../lib/libgnutls.la $(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS) \
+-      ../gl/libgnu.la ../lgl/liblgnu.la
++      ../gl/libgnu.la ../lgl/liblgnu.la -lintl
+ 
+ printlist_SOURCES = printlist.c
+ printlist_LDADD = ../lib/libgnutls.la \
+-      $(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS) ../gl/libgnu.la
++      $(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS) ../gl/libgnu.la -lintl
+ 
+ 
+ psk-gaa.c: $(srcdir)/psk.gaa

diff --git a/gnutls/mingw32-gnutls.spec b/gnutls/mingw32-gnutls.spec
index ec269bc..044bdab 100644 (file)
--- a/gnutls/mingw32-gnutls.spec
+++ b/gnutls/mingw32-gnutls.spec
@@ -22,15 +22,16 @@ BuildArch:      noarch
 Patch1:         gnutls-2.6.2-nosrp.patch
 
 # MinGW-specific patches.
-Patch1000:      gnutls-certtool-build.patch
+Patch1000:      mingw32-gnutls-2.6.3-certtool-build.patch
 
 BuildRequires:  mingw32-filesystem >= 25
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-binutils
+BuildRequires:  mingw32-dlfcn
 BuildRequires:  mingw32-libgpg-error
 BuildRequires:  mingw32-libgcrypt >= 1.2.2
 BuildRequires:  mingw32-iconv
-BuildRequires:  mingw32-gettext
+BuildRequires:  mingw32-readline
 BuildRequires:  mingw32-zlib
 BuildRequires:  autoconf automake libtool
 
@@ -59,7 +60,8 @@ PATH="%{_mingw32_bindir}:$PATH" \
   --with-included-libtasn1 \
   --disable-srp-authentication \
   --disable-static
-make %{?_smp_mflags}
+# %{?_smp_mflags} doesn't build correctly.
+make
 
 
 %install
@@ -112,9 +114,11 @@ rm -rf $RPM_BUILD_ROOT
 * Fri Jan 23 2009 Richard W.M. Jones <rjones@redhat.com> - 2.6.3-1
 - Rebase to native Fedora version 2.6.3.
 - Enable C++ library.
-- Use _smp_mflags.
 - Use find_lang macro.
 - Don't build static library.
+- Rebase MinGW patch to 2.6.3.
+- +BR mingw32-dlfcn.
+- +BR mingw32-readline.
 
 * Tue Jan 13 2009 Richard W.M. Jones <rjones@redhat.com> - 2.4.2-4
 - Requires pkgconfig.