From 5dc16ab32e191fe11700ccd16916a04465d1af2c Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Fri, 22 Feb 2013 12:54:51 +0000 Subject: [PATCH] Update to 0.5.2 release --- gtk-vnc.spec | 81 ++++++++++++---------------------------------------- sources | 2 +- 2 files changed, 20 insertions(+), 63 deletions(-) diff --git a/gtk-vnc.spec b/gtk-vnc.spec index 78f0c25..5794bc9 100644 --- a/gtk-vnc.spec +++ b/gtk-vnc.spec @@ -1,30 +1,26 @@ # -*- rpm-spec -*- -# Plugin isn't ready for real world use yet - it needs -# a security audit at very least -%define with_plugin 0 - -%define with_gir 0 +%global with_gir 0 %if 0%{?fedora} >= 12 || 0%{?rhel} >= 7 -%define with_gir 1 +%global with_gir 1 %endif -%define with_gtk3 0 +%global with_gtk3 0 %if 0%{?fedora} >= 15 || 0%{?rhel} >= 7 -%define with_gtk3 1 +%global with_gtk3 1 %endif -%define with_vala 0 +%global with_vala 0 %if 0%{with_gtk3} -%define with_vala 1 +%global with_vala 1 %endif -%define with_pulse 1 +%global with_pulse 1 Summary: A GTK2 widget for VNC clients Name: gtk-vnc -Version: 0.5.1 -Release: 7%{?dist}%{?extra_release} +Version: 0.5.2 +Release: 1%{?dist}%{?extra_release} License: LGPLv2+ Group: Development/Libraries Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.5/%{name}-%{version}.tar.xz @@ -40,13 +36,6 @@ BuildRequires: gobject-introspection-devel BuildRequires: gir-repository-devel %endif %endif -%if %{with_plugin} -%if 0%{?fedora} > 8 -BuildRequires: xulrunner-devel -%else -BuildRequires: firefox-devel -%endif -%endif %if %{with_gtk3} BuildRequires: gtk3-devel %endif @@ -56,11 +45,7 @@ BuildRequires: vala-tools %if %{with_pulse} BuildRequires: pulseaudio-libs-devel %endif -BuildRequires: perl-podlators - -Patch0: gtk-vnc-0.5.1-bigendian.patch -# Fix send_key introspection bindings -Patch1: 0001-Add-introspection-annotation-for-vnc_display_send_ke.patch +BuildRequires: /usr/bin/pod2man %description gtk-vnc is a VNC viewer widget for GTK2. It is built using coroutines @@ -90,20 +75,6 @@ allowing it to be completely asynchronous while remaining single threaded. A module allowing use of the GTK-VNC widget from python -%if %{with_plugin} -%package plugin -Summary: Mozilla plugin for the gtk-vnc library -Group: Development/Libraries -Requires: %{name} = %{version} - -%description plugin -gtk-vnc is a VNC viewer widget for GTK2. It is built using coroutines -allowing it to be completely asynchronous while remaining single threaded. - -This package provides a web browser plugin for Mozilla compatible -browsers. -%endif - %package -n gvnc Summary: A GObject for VNC connections @@ -164,7 +135,7 @@ Group: Applications/Internet Requires: gvnc = %{version}-%{release} %description -n gtk-vnc2 -gtk-vnc is a VNC viewer widget for GTK2. It is built using coroutines +gtk-vnc is a VNC viewer widget for GTK3. It is built using coroutines allowing it to be completely asynchronous while remaining single threaded. %package -n gtk-vnc2-devel @@ -183,10 +154,6 @@ Libraries, includes, etc. to compile with the gtk-vnc library %prep %setup -q -n gtk-vnc-%{version} -c -pushd gtk-vnc-%{version} -%patch0 -p1 -b .bigendian -%patch1 -p1 -popd %if %{with_gtk3} cp -a gtk-vnc-%{version} gtk-vnc2-%{version} %endif @@ -198,14 +165,8 @@ cp -a gtk-vnc-%{version} gtk-vnc2-%{version} %define gir_arg --enable-introspection=no %endif -%if %{with_plugin} -%define plugin_arg --enable-plugin=yes -%else -%define plugin_arg --enable-plugin=no -%endif - cd gtk-vnc-%{version} -%configure --with-gtk=2.0 %{plugin_arg} %{gir_arg} +%configure --with-gtk=2.0 %{gir_arg} %__make %{?_smp_mflags} V=1 cd .. @@ -232,10 +193,6 @@ rm -f %{buildroot}%{_libdir}/*.a rm -f %{buildroot}%{_libdir}/*.la rm -f %{buildroot}%{_libdir}/python*/site-packages/*.a rm -f %{buildroot}%{_libdir}/python*/site-packages/*.la -%if %{with_plugin} -rm -f %{buildroot}%{_libdir}/mozilla/plugins/%{name}-plugin.a -rm -f %{buildroot}%{_libdir}/mozilla/plugins/%{name}-plugin.la -%endif %find_lang %{name} @@ -270,6 +227,8 @@ rm -fr %{buildroot} %doc gtk-vnc-%{version}/examples/gvncviewer.c %if %{with_gir} %doc gtk-vnc-%{version}/examples/gvncviewer.js +%doc gtk-vnc-%{version}/examples/gvncviewer.pl +%doc gtk-vnc-%{version}/examples/gvncviewer-introspection.py %endif %{_libdir}/libgtk-vnc-1.0.so %dir %{_includedir}/%{name}-1.0/ @@ -281,15 +240,9 @@ rm -fr %{buildroot} %files python %defattr(-, root, root) -%doc gtk-vnc-%{version}/examples/gvncviewer.py +%doc gtk-vnc-%{version}/examples/gvncviewer-bindings.py %{_libdir}/python*/site-packages/gtkvnc.so -%if %{with_plugin} -%files plugin -%defattr(-, root, root) -%{_libdir}/mozilla/plugins/%{name}-plugin.so -%endif - %files -n gvnc -f %{name}.lang %defattr(-, root, root) %{_libdir}/libgvnc-1.0.so.* @@ -371,6 +324,10 @@ rm -fr %{buildroot} %endif %changelog +* Fri Feb 22 2013 Daniel P. Berrange - 0.5.2-1 +- Update to 0.5.2 release +- Fix auth credential type (rhbz #697067) + * Sat Feb 16 2013 Cole Robinson - 0.5.1-7 - Fix send_key introspection bindings diff --git a/sources b/sources index 42fe9a5..d7b1d50 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -626f919138b8362ba82faa969fa371f3 gtk-vnc-0.5.1.tar.xz +591f5c0efff931336cba5b56e0c64e0d gtk-vnc-0.5.2.tar.xz