[gtk-vnc] Resync RPM specfiles based on latest Fedora devel

[Daniel P. Berrange <dberrange src gnome org>]

commit 8922e0e6d6f470d1450267ccd014b262a1b3c73a
Author: Daniel P. Berrange <dan berrange com>
Date:   Wed Jul 14 11:27:25 2010 +0100

    Resync RPM specfiles based on latest Fedora devel

 gtk-vnc.spec.in         |   15 ++++++-------
 mingw32-gtk-vnc.spec.in |   51 ++++++++++++++++++++++++----------------------
 2 files changed, 34 insertions(+), 32 deletions(-)
---
diff --git a/gtk-vnc.spec.in b/gtk-vnc.spec.in
index dc37a1e..8fa8275 100644
--- a/gtk-vnc.spec.in
+++ b/gtk-vnc.spec.in
@@ -16,17 +16,20 @@ Version: @VERSION@
 Release: 1%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
-Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.3/%{name}-%{version}.tar.gz
+Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.4/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://live.gnome.org/gtk-vnc
 BuildRequires: gtk2-devel >= 2.14
 BuildRequires: pygtk2-devel python-devel zlib-devel
 BuildRequires: gnutls-devel cyrus-sasl-devel intltool
 %if %{with_gir}
-BuildRequires: gobject-introspection-devel gir-repository-devel
+BuildRequires: gobject-introspection-devel
+%if 0%{?fedora} < 14
+BuildRequires: gir-repository-devel
+%endif
 %endif
 %if %{with_plugin}
-%if 0%{fedora} > 8
+%if 0%{?fedora} > 8
 BuildRequires: xulrunner-devel
 %else
 BuildRequires: firefox-devel
@@ -42,7 +45,7 @@ Summary: Libraries, includes, etc. to compile with the gtk-vnc library
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
-Requires: pygtk2-devel gtk2-devel
+Requires: gtk2-devel gnutls-devel
 
 %description devel
 gtk-vnc is a VNC viewer widget for GTK. It is built using coroutines
@@ -137,10 +140,6 @@ rm -f %{buildroot}%{_libdir}/mozilla/plugins/%{name}-plugin.la
 %endif
 %find_lang %{name}
 
-
-%check
-make check
-
 %clean
 rm -fr %{buildroot}
 
diff --git a/mingw32-gtk-vnc.spec.in b/mingw32-gtk-vnc.spec.in
index 5437e01..edce574 100644
--- a/mingw32-gtk-vnc.spec.in
+++ b/mingw32-gtk-vnc.spec.in
@@ -4,30 +4,33 @@
 %define __find_requires %{_mingw32_findrequires}
 %define __find_provides %{_mingw32_findprovides}
 
-%define _default_patch_fuzz 2
-
-Name:           mingw32-gtk-vnc
-Version:        @VERSION@
-Release:        1%{?dist}%{?extra_release}
-Summary:        MinGW Windows port of VNC client GTK widget
-
-License:        LGPLv2+
-Group:          Development/Libraries
-URL:            http://gtk-vnc.sf.net/
-Source0:        http://downloads.sourceforge.net/gtk-vnc/gtk-vnc-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildArch:      noarch
-
-BuildRequires:  mingw32-filesystem >= 30
-BuildRequires:  mingw32-gcc
-BuildRequires:  mingw32-binutils
-BuildRequires:  mingw32-gtk2 >= 2.14
-BuildRequires:  mingw32-gnutls
-BuildRequires:  autoconf
-BuildRequires:  automake
-BuildRequires:  libtool
-BuildRequires:  pkgconfig
+Name: mingw32-gtk-vnc
+Version: @VERSION@
+Release: 1%{?dist}%{?extra_release}
+Summary: MinGW Windows port of VNC client GTK widget
+
+License: LGPLv2+
+Group: Development/Libraries
+Source: http://ftp.gnome.org/pub/GNOME/sources/gtk-vnc/0.4/gtk-vnc-%{version}.tar.gz
+URL: http://live.gnome.org/gtk-vnc
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildArch: noarch
+
+BuildRequires: mingw32-filesystem >= 40
+BuildRequires: mingw32-gcc
+BuildRequires: mingw32-binutils
+
+BuildRequires: mingw32-cairo
+BuildRequires: mingw32-dlfcn
+BuildRequires: mingw32-gettext
+BuildRequires: mingw32-iconv
+BuildRequires: mingw32-gnutls
+BuildRequires: mingw32-gtk2
+BuildRequires: pkgconfig
+BuildRequires: intltool
+
+Requires: pkgconfig
 
 %package -n mingw32-gvnc
 Summary: MinGW Windows port of VNC GObject