From: hawk <hawk@pld-linux.org>
Date: Sat, 8 Aug 2009 19:12:03 +0000 (+0000)
Subject: - fix building with gnutls 2.8.x
X-Git-Tag: auto/ti/vino-2_26_2-3
X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;h=cbe2c35acec06633c73e559ebd0d044e6115ba01;p=packages%2Fvino.git

- fix building with gnutls 2.8.x

Changed files:
    vino-gnutls-2_8-fix.patch -> 1.1
    vino.spec -> 1.49
---

diff --git a/vino-gnutls-2_8-fix.patch b/vino-gnutls-2_8-fix.patch
new file mode 100644
index 0000000..7390cab
--- /dev/null
+++ b/vino-gnutls-2_8-fix.patch
@@ -0,0 +1,20 @@
+--- configure.in.orig	2009-05-18 17:59:03.000000000 +0200
++++ configure.in	2009-08-08 21:03:32.132933870 +0200
+@@ -171,13 +171,13 @@
+ 	      [  --disable-gnutls=[no/yes] don't build VNC over SSL support [default=no]],,
+ 	      enable_gnutls=yes)
+ if test "$enable_gnutls" = "yes"; then
+-  AM_PATH_LIBGNUTLS(1.0.0,
+-	            [AC_DEFINE(HAVE_GNUTLS, 1, [Defined if the GNU TLS library is present])],
+-                    AC_MSG_WARN([[
++  if ! $PKG_CONFIG --exists gnutls ; then
++    AC_MSG_ERROR([
+ ***
+ *** libgnutls was not found. You may want to get it from
+ *** ftp://ftp.gnutls.org/pub/gnutls/
+-]]))
++    ])
++  fi
+ fi
+ 
+ #
diff --git a/vino.spec b/vino.spec
index 38566ae..fb4ad7c 100644
--- a/vino.spec
+++ b/vino.spec
@@ -2,11 +2,12 @@ Summary:	A remote desktop system for GNOME
 Summary(pl.UTF-8):	System zdalnego pulpitu dla GNOME
 Name:		vino
 Version:	2.26.2
-Release:	2
+Release:	3
 License:	GPL v2+
 Group:		X11/Applications/Networking
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/vino/2.26/%{name}-%{version}.tar.bz2
 # Source0-md5:	580a8f79130273f03cb57c32bba59120
+Patch0:		%{name}-gnutls-2_8-fix.patch
 URL:		http://www.gnome.org/
 BuildRequires:	GConf2-devel >= 2.26.0
 BuildRequires:	NetworkManager-devel >= 0.7
@@ -52,6 +53,7 @@ się z działającą sesją GNOME przy użyciu VNC.
 
 %prep
 %setup -q
+%patch0 -p0
 
 %build
 %{__intltoolize}