[mingw-gtk-vnc: 14/22] Update to 0.4.4 release

[epienbro]

commit 253657554b3d91e2627cc5767de9d52097234d4a
Author: Daniel P. Berrange <berrange at redhat.com>
Date:   Thu Nov 10 16:45:51 2011 +0000

    Update to 0.4.4 release

 .gitignore           |    4 ++-
 mingw32-gtk-vnc.spec |   89 ++++++++++++++++++++++++++++++++++++++++++++-----
 sources              |    2 +-
 3 files changed, 84 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3a5166f..cee5c8a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 .build*.log
 *.src.rpm
-gtk-vnc-0.4.1.tar.bz2
+*.bz2
+*.gz
+noarch
diff --git a/mingw32-gtk-vnc.spec b/mingw32-gtk-vnc.spec
index d93a73c..9e24aa5 100644
--- a/mingw32-gtk-vnc.spec
+++ b/mingw32-gtk-vnc.spec
@@ -4,17 +4,20 @@
 %define __find_requires %{_mingw32_findrequires}
 %define __find_provides %{_mingw32_findprovides}
 
+%define with_gtk3 0
+%if 0%{?fedora} >= 15
+%define with_gtk3 1
+%endif
+
 Name: mingw32-gtk-vnc
-Version: 0.4.1
-Release: 4%{?dist}
+Version: 0.4.4
+Release: 1%{?dist}
 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.bz2
 URL: http://live.gnome.org/gtk-vnc
-# XXX need to add the SASL patches too, but this is
-# blocking on a mingw32-cyrus-sasl port or equiv
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
@@ -31,12 +34,27 @@ BuildRequires: mingw32-gnutls
 BuildRequires: mingw32-gtk2
 BuildRequires: pkgconfig
 BuildRequires: intltool
+%if %{with_gtk3}
+BuildRequires: mingw32-gtk3
+%endif
 
 Requires: pkgconfig
 
 %package -n mingw32-gvnc
 Summary: MinGW Windows port of VNC GObject
 
+%package -n mingw32-gvnc-tools
+Summary: Command line VNC tools
+Group: Applications/Internet
+
+%if %{with_gtk3}
+%package -n mingw32-gtk-vnc2
+Summary: A GTK3 widget for VNC clients
+Group: Development/Libraries
+
+Requires: pkgconfig
+%endif
+
 %description
 gtk-vnc is a VNC viewer widget for GTK. It is built using coroutines
 allowing it to be completely asynchronous while remaining single threaded.
@@ -46,19 +64,52 @@ gvnc is a GObject for managing a VNC connection. It provides all the
 infrastructure required to build a VNC client without having to deal
 with the raw protocol itself.
 
+%description -n mingw32-gvnc-tools
+Provides useful command line utilities for interacting with
+VNC servers. Includes the gvnccapture program for capturing
+screenshots of a VNC desktop
+
+%if %{with_gtk3}
+%description -n mingw32-gtk-vnc2
+gtk-vnc is a VNC viewer widget for GTK. It is built using coroutines
+allowing it to be completely asynchronous while remaining single threaded.
+%endif
+
 %prep
-%setup -q -n gtk-vnc-%{version}
+%setup -q -n gtk-vnc-%{version} -c
+%if %{with_gtk3}
+cp -a gtk-vnc-%{version} gtk-vnc2-%{version}
+%endif
 
 %build
-%{_mingw32_configure} --without-python --disable-static --without-sasl
-make %{?_smp_mflags}
+cd gtk-vnc-%{version}
+%{_mingw32_configure} --without-python --with-examples --without-sasl --with-gtk=2.0
+%__make %{?_smp_mflags} V=1
+cd ..
+
+%if %{with_gtk3}
+cd gtk-vnc2-%{version}
+%{_mingw32_configure} --without-python --without-examples --without-sasl --with-gtk=3.0
+%__make %{?_smp_mflags} V=1
+cd ..
+%endif
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
+cd gtk-vnc-%{version}
+make DESTDIR=$RPM_BUILD_ROOT install
+cd ..
+%if %{with_gtk3}
+cd gtk-vnc2-%{version}
 make DESTDIR=$RPM_BUILD_ROOT install
+cd ..
+%endif
 
-rm -f $RPM_BUILD_ROOT%{_mingw32_bindir}/gvnccapture.exe
+# Remove static libraries but DON'T remove *.dll.a files.
+rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/libgtk-vnc-1.0.a
+rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/libgtk-vnc-2.0.a
+rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/libgvnc-1.0.a
 rm -f $RPM_BUILD_ROOT%{_mingw32_mandir}/man1/gvnccapture.1*
 
 %find_lang gtk-vnc
@@ -69,7 +120,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f gtk-vnc.lang
 %defattr(-,root,root)
-%doc COPYING.LIB
+%{_mingw32_bindir}/gvncviewer.exe
 %{_mingw32_bindir}/libgtk-vnc-1.0-0.dll
 %{_mingw32_libdir}/libgtk-vnc-1.0.dll.a
 %{_mingw32_libdir}/libgtk-vnc-1.0.la
@@ -78,13 +129,33 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n mingw32-gvnc
 %defattr(-,root,root)
+%doc gtk-vnc-%{version}/AUTHORS
+%doc gtk-vnc-%{version}/ChangeLog
+%doc gtk-vnc-%{version}/ChangeLog-old
+%doc gtk-vnc-%{version}/NEWS
+%doc gtk-vnc-%{version}/README
+%doc gtk-vnc-%{version}/COPYING.LIB
 %{_mingw32_bindir}/libgvnc-1.0-0.dll
 %{_mingw32_libdir}/libgvnc-1.0.dll.a
 %{_mingw32_libdir}/libgvnc-1.0.la
 %{_mingw32_libdir}/pkgconfig/gvnc-1.0.pc
 %{_mingw32_includedir}/gvnc-1.0
 
+%files -n mingw32-gtk-vnc2
+%{_mingw32_bindir}/libgtk-vnc-2.0-0.dll
+%{_mingw32_libdir}/libgtk-vnc-2.0.dll.a
+%{_mingw32_libdir}/libgtk-vnc-2.0.la
+%{_mingw32_libdir}/pkgconfig/gtk-vnc-2.0.pc
+%{_mingw32_includedir}/gtk-vnc-2.0
+
+%files -n mingw32-gvnc-tools
+%defattr(-,root,root)
+%{_mingw32_bindir}/gvnccapture.exe
+
 %changelog
+* Thu Nov 10 2011 Daniel P. Berrange <berrange at redhat.com> - 0.4.4-1
+- Update to 0.4.4 release
+
 * Thu Jul 07 2011 Kalev Lember <kalevlember at gmail.com> - 0.4.1-4
 - Rebuilt against win-iconv
 
diff --git a/sources b/sources
index 4bdeea3..c7dc3c6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-61033a0b0130e1e04a8bc2546567ed8c  gtk-vnc-0.4.1.tar.bz2
+0c51bcbdf1530c4856f49ace7c8f709a  gtk-vnc-0.4.4.tar.bz2