From eb8e6556a0c3033e637c26153da1f7e9da8ffcb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Wed, 1 Aug 2018 17:30:20 +0100 Subject: [PATCH] Update to 0.8.0 release MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel P. Berrangé --- gtk-vnc.spec | 62 ++++++++++++++++++---------------------------------- sources | 2 +- 2 files changed, 22 insertions(+), 42 deletions(-) diff --git a/gtk-vnc.spec b/gtk-vnc.spec index 2b6f74e..b0687a7 100644 --- a/gtk-vnc.spec +++ b/gtk-vnc.spec @@ -8,6 +8,11 @@ %global with_gir 1 %endif +%global with_gtk2 1 +%if 0%{?rhel} >= 8 +%global with_gtk2 0 +%endif + %global with_gtk3 0 %if 0%{?fedora} || 0%{?rhel} >= 7 %global with_gtk3 1 @@ -18,11 +23,6 @@ %global with_vala 1 %endif -%global with_python 1 -%if 0%{?fedora} || 0%{?rhel} >= 8 -%global with_python 0 -%endif - %if 0%{?fedora} || 0%{?rhel} >= 8 %global tls_priority "@LIBVIRT,SYSTEM" %else @@ -31,16 +31,16 @@ Summary: A GTK2 widget for VNC clients Name: gtk-vnc -Version: 0.7.2 -Release: 2%{?dist}%{?extra_release} +Version: 0.8.0 +Release: 1%{?dist}%{?extra_release} License: LGPLv2+ Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.5/%{name}-%{version}.tar.xz URL: https://wiki.gnome.org/Projects/gtk-vnc Requires: gvnc = %{version}-%{release} +%if %{with_gtk2} BuildRequires: gtk2-devel >= 2.14 -%if %{with_python} -BuildRequires: pygtk2-devel python2-devel %endif +BuildRequires: python3 BuildRequires: gnutls-devel libgcrypt-devel cyrus-sasl-devel zlib-devel intltool %if %{with_gir} BuildRequires: gobject-introspection-devel @@ -58,6 +58,7 @@ BuildRequires: /usr/bin/pod2man gtk-vnc is a VNC viewer widget for GTK2. It is built using coroutines allowing it to be completely asynchronous while remaining single threaded. +%if %{with_gtk2} %package devel Summary: Development files to build GTK2 applications with gtk-vnc Requires: %{name} = %{version}-%{release} @@ -69,22 +70,6 @@ gtk-vnc is a VNC viewer widget for GTK2. It is built using coroutines allowing it to be completely asynchronous while remaining single threaded. Libraries, includes, etc. to compile with the gtk-vnc library - -%if %{with_python} -%package -n python2-gtk-vnc -%{?python_provide:%python_provide python2-gtk-vnc} -# Remove before F30 -Provides: %{name}-python = %{version}-%{release} -Provides: %{name}-python%{?_isa} = %{version}-%{release} -Obsoletes: %{name}-python < %{version}-%{release} -Summary: Python bindings for the gtk-vnc library -Requires: %{name} = %{version}-%{release} - -%description -n python2-gtk-vnc -gtk-vnc is a VNC viewer widget for GTK2. It is built using coroutines -allowing it to be completely asynchronous while remaining single threaded. - -A module allowing use of the GTK-VNC widget from python %endif %package -n gvnc @@ -172,23 +157,19 @@ cp -a gtk-vnc-%{version} gtk-vnc2-%{version} %define gir_arg --enable-introspection=no %endif -%if %{with_python} -%define py_arg --with-python -%else -%define py_arg --without-python -%endif - +%if %{with_gtk2} cd gtk-vnc-%{version} -%configure --with-gtk=2.0 %{gir_arg} %{py_arg} \ +%configure --with-gtk=2.0 %{gir_arg} \ --with-tls-priority=%{tls_priority} %__make %{?_smp_mflags} V=1 chmod -x examples/*.pl examples/*.js examples/*.py cd .. +%endif %if %{with_gtk3} cd gtk-vnc2-%{version} -%configure --with-gtk=3.0 %{gir_arg} %{py_arg} \ +%configure --with-gtk=3.0 %{gir_arg} \ --with-tls-priority=%{tls_priority} %__make %{?_smp_mflags} V=1 chmod -x examples/*.pl examples/*.js examples/*.py @@ -197,9 +178,11 @@ cd .. %install rm -fr %{buildroot} +%if %{with_gtk2} cd gtk-vnc-%{version} %__make install DESTDIR=%{buildroot} cd .. +%endif %if %{with_gtk3} cd gtk-vnc2-%{version} @@ -209,8 +192,6 @@ cd .. 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 %find_lang %{name} @@ -232,6 +213,7 @@ rm -f %{buildroot}%{_libdir}/python*/site-packages/*.la %postun -n gtk-vnc2 -p /sbin/ldconfig %endif +%if %{with_gtk2} %files %{_libdir}/libgtk-vnc-1.0.so.* %if %{with_gir} @@ -247,11 +229,6 @@ rm -f %{buildroot}%{_libdir}/python*/site-packages/*.la %if %{with_gir} %{_datadir}/gir-1.0/GtkVnc-1.0.gir %endif - -%if %{with_python} -%files -n python2-gtk-vnc -%doc gtk-vnc-%{version}/examples/gvncviewer-bindings.py -%{_libdir}/python*/site-packages/gtkvnc.so %endif %files -n gvnc -f %{name}.lang @@ -318,7 +295,7 @@ rm -f %{buildroot}%{_libdir}/python*/site-packages/*.la %if %{with_gir} %doc gtk-vnc2-%{version}/examples/gvncviewer.js %doc gtk-vnc2-%{version}/examples/gvncviewer.pl -%doc gtk-vnc2-%{version}/examples/gvncviewer-introspection.py +%doc gtk-vnc2-%{version}/examples/gvncviewer.py %endif %{_libdir}/libgtk-vnc-2.0.so %dir %{_includedir}/%{name}-2.0/ @@ -330,6 +307,9 @@ rm -f %{buildroot}%{_libdir}/python*/site-packages/*.la %endif %changelog +* Wed Aug 1 2018 Daniel P. Berrangé - 0.8.0-1 +- Update to 0.8.0 release + * Fri Jul 13 2018 Fedora Release Engineering - 0.7.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 9d9122e..8746944 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gtk-vnc-0.7.2.tar.xz) = b95b1da6ff512c466feaa6efc831e9c36c5a77390b518c647c60fddda9dd850eea8658174682ae135b95bfca7bf2b4e85a5e5ac9adb43e3ddd7aa690288655ce +SHA512 (gtk-vnc-0.8.0.tar.xz) = 9b66e4028e56b01af8d0ded5b833fc6c0ba752ac72cd664293b0009868bbec0bc8750b619ece9786eddc06155e390ecccc4c5bc84717c49ac4bd866e6febd8e3