Hello community, here is the log from the commit of package net6 for openSUSE:Factory checked in at Fri Sep 9 11:47:25 CEST 2011. -------- --- GNOME/net6/net6.changes 2011-04-26 21:59:08.000000000 +0200 +++ /mounts/work_src_done/STABLE/net6/net6.changes 2011-09-05 19:21:24.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Sep 5 17:16:36 UTC 2011 - vuntz@opensuse.org + +- Add net6-gnutls-3.0.patch: fix build with gnutls 3.0. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- net6-gnutls-3.0.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ net6.spec ++++++ --- /var/tmp/diff_new_pack.7O2naS/_old 2011-09-09 11:47:22.000000000 +0200 +++ /var/tmp/diff_new_pack.7O2naS/_new 2011-09-09 11:47:22.000000000 +0200 @@ -27,12 +27,13 @@ BuildRequires: pkg-config License: LGPLv2.1+ Group: Development/Libraries/GNOME -AutoReqProv: on Version: 1.3.13 -Release: 1 +Release: 3 Summary: Network access framework for IPv4/IPv6 -Source: %{name}-%{version}.tar.bz2 Url: http://gobby.0x539.de/ +Source: %{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM net6-gnutls-3.0.patch vuntz@opensuse.org -- Fix an incompatibility with gnutls 3.0, due to new #define breaking things using the gnutls namespace in the code. Sent upstream by mail. +Patch0: net6-gnutls-3.0.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: %{name}-lang = %{version} @@ -55,10 +56,9 @@ %lang_package %prep %setup -q +%patch0 -p1 %build -# FIXME: Cannot autoreconf: Bad AM_GNU_GETTEXT_VERSION check -#ACLOCAL="aclocal -I m4" autoreconf -f -i %configure --disable-static --with-pic make %{?jobs:-j%jobs} ++++++ net6-gnutls-3.0.patch ++++++ Index: net6-1.3.13/inc/encrypt.hpp =================================================================== --- net6-1.3.13.orig/inc/encrypt.hpp +++ net6-1.3.13/inc/encrypt.hpp @@ -34,7 +34,6 @@ typedef gnutls_anon_client_credentials g typedef gnutls_anon_server_credentials gnutls_anon_server_credentials_t; typedef gnutls_transport_ptr gnutls_transport_ptr_t; typedef gnutls_dh_params gnutls_dh_params_t; -typedef gnutls_connection_end gnutls_connection_end_t; class dh_params: private net6::non_copyable { Index: net6-1.3.13/src/encrypt.cpp =================================================================== --- net6-1.3.13.orig/src/encrypt.cpp +++ net6-1.3.13/src/encrypt.cpp @@ -25,7 +25,7 @@ namespace { const unsigned int DH_BITS = 1024; - net6::gnutls_session_t create_session(net6::gnutls_connection_end_t end) + net6::gnutls_session_t create_session(gnutls_connection_end_t end) { net6::gnutls_session_t session; gnutls_init(&session, end); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org