From 66a6cf60b7eb82d2b4fe72e86e00e47b6b78d6cd Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Aug 01 2017 03:37:11 +0000 Subject: import vino-3.22.0-3.el7 --- diff --git a/.gitignore b/.gitignore index edb707f..a01770f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/vino-3.14.2.tar.xz +SOURCES/vino-3.22.0.tar.xz diff --git a/.vino.metadata b/.vino.metadata index 4c0e35d..71f1364 100644 --- a/.vino.metadata +++ b/.vino.metadata @@ -1 +1 @@ -a462d9cd099e61ce2eade7bd19fbb982e9340c2a SOURCES/vino-3.14.2.tar.xz +e2c0fa2fd7f74da66f5aec5033fd6541a8e5c485 SOURCES/vino-3.22.0.tar.xz diff --git a/SOURCES/revert-gsettings-conversion-file.patch b/SOURCES/revert-gsettings-conversion-file.patch new file mode 100644 index 0000000..b8143e9 --- /dev/null +++ b/SOURCES/revert-gsettings-conversion-file.patch @@ -0,0 +1,36 @@ +diff --git a/Makefile.am b/Makefile.am +index c354d16..78c9c6c 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -257,6 +257,9 @@ gsettings_SCHEMAS = common/org.gnome.Vino.gschema.xml + + @GSETTINGS_RULES@ + ++convertdir = $(datadir)/GConf/gsettings ++dist_convert_DATA = common/org.gnome.Vino.convert ++ + if MAINTAINER_MODE + dist-hook: dist-changelog + else +diff --git a/common/org.gnome.Vino.convert b/common/org.gnome.Vino.convert +new file mode 100644 +index 0000000..84d2b16 +--- /dev/null ++++ b/common/org.gnome.Vino.convert +@@ -0,0 +1,15 @@ ++[org.gnome.Vino] ++prompt-enabled = /desktop/gnome/remote_access/prompt_enabled ++view-only = /desktop/gnome/remote_access/view_only ++network-interface = /desktop/gnome/remote_access/network_interface ++use-alternative-port = /desktop/gnome/remote_access/use_alternative_port ++alternative-port = /desktop/gnome/remote_access/alternative_port ++require-encryption = /desktop/gnome/remote_access/require_encryption ++authentication-methods = /desktop/gnome/remote_access/authentication_methods ++vnc-password = /desktop/gnome/remote_access/vnc_password ++mailto = /desktop/gnome/remote_access/mailto ++lock-screen-on-disconnect = /desktop/gnome/remote_access/lock_screen_on_disconnect ++icon-visibility = /desktop/gnome/remote_access/icon_visibility ++disable-background = /desktop/gnome/remote_access/disable_background ++use-upnp = /desktop/gnome/remote_access/use_upnp ++disable-xdamage = /desktop/gnome/remote_access/disable_xdamage + diff --git a/SPECS/vino.spec b/SPECS/vino.spec index e6cd276..83065f4 100644 --- a/SPECS/vino.spec +++ b/SPECS/vino.spec @@ -1,34 +1,38 @@ -%define libgcrypt_version 1.2.0 -%define libnotify_version 0.7.0 -%define telepathy_glib_version 0.11.6 - +Name: vino +Version: 3.22.0 +Release: 3%{?dist} Summary: A remote desktop system for GNOME -Name: vino -Version: 3.14.2 -Release: 1%{?dist} -URL: http://www.gnome.org -#VCS: git:git://git.gnome.org/vino -Source0: http://download.gnome.org/sources/vino/3.14/%{name}-%{version}.tar.xz License: GPLv2+ - -BuildRequires: gnutls-devel -BuildRequires: gtk3-devel -BuildRequires: libgcrypt-devel >= %{libgcrypt_version} -BuildRequires: libnotify-devel >= %{libnotify_version} -BuildRequires: telepathy-glib-devel >= %{telepathy_glib_version} +URL: https://wiki.gnome.org/Projects/Vino +#VCS: git:git://git.gnome.org/vino +Source0: https://download.gnome.org/sources/%{name}/3.22/%{name}-%{version}.tar.xz + +# https://bugzilla.redhat.com/show_bug.cgi?id=1380620 +Patch0: revert-gsettings-conversion-file.patch + +BuildRequires: pkgconfig(avahi-client) +BuildRequires: pkgconfig(avahi-glib) +BuildRequires: pkgconfig(gnutls) +BuildRequires: pkgconfig(gtk+-x11-3.0) +BuildRequires: pkgconfig(ice) +BuildRequires: pkgconfig(libnotify) +BuildRequires: pkgconfig(libsecret-1) +BuildRequires: pkgconfig(sm) +BuildRequires: pkgconfig(telepathy-glib) +BuildRequires: libgcrypt-devel BuildRequires: libXt-devel, libXtst-devel, libXdamage-devel -BuildRequires: pkgconfig(avahi-client) pkgconfig(avahi-glib) BuildRequires: intltool BuildRequires: gettext -BuildRequires: libsecret-devel -BuildRequires: libsoup-devel -BuildRequires: NetworkManager-devel -BuildRequires: libSM-devel -# BuildRequires: autoconf automake libtool -BuildRequires: gnome-common BuildRequires: desktop-file-utils +# For user unit. +BuildRequires: systemd +%{?systemd_requires} + +# Needed for autoreconf +BuildRequires: gnome-common + # Following requires are for directory ownership Requires: telepathy-filesystem Requires: dbus @@ -37,37 +41,42 @@ Requires: dbus Vino is a VNC server for GNOME. It allows remote users to connect to a running GNOME session using VNC. + %prep %setup -q +%patch0 -p1 -b .revert-gsettings-conversion-file -# autoreconf -i -f -# intltoolize --force +# Needed for revert-gsettings-conversion-file.patch +autoreconf -fi %build %configure \ --disable-silent-rules \ --with-avahi \ - --with-network-manager \ --with-secret \ --with-telepathy \ --with-gnutls \ -# drop unneeded direct library deps with --as-needed -# libtool doesn't make this easy, so we do it the hard way -sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool - make %{?_smp_mflags} + %install -make install DESTDIR=$RPM_BUILD_ROOT +make install DESTDIR=%{buildroot} INSTALL="install -p" +%find_lang %{name} -desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/vino-server.desktop +%check +desktop-file-validate %{buildroot}%{_datadir}/applications/vino-server.desktop -%find_lang %{name} %post touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : +%systemd_user_post + + +%preun +%systemd_user_preun + %postun if [ $1 -eq 0 ]; then @@ -75,6 +84,8 @@ if [ $1 -eq 0 ]; then gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : fi +%systemd_user_postun + %posttrans gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : @@ -82,7 +93,8 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %files -f %{name}.lang -%doc AUTHORS COPYING NEWS README docs/TODO docs/remote-desktop.txt +%doc AUTHORS NEWS README docs/TODO docs/remote-desktop.txt +%license COPYING %{_datadir}/dbus-1/services/org.freedesktop.Telepathy.Client.Vino.service %{_datadir}/telepathy/clients/Vino.client %{_libexecdir}/* @@ -90,8 +102,22 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %{_datadir}/glib-2.0/schemas/org.gnome.Vino.enums.xml %{_datadir}/glib-2.0/schemas/org.gnome.Vino.gschema.xml %{_datadir}/GConf/gsettings/org.gnome.Vino.convert +%{_userunitdir}/vino-server.service + %changelog +* Thu Mar 2 2017 Ondrej Holy - 3.22.0-3 +- Revert GSettings conversion file +- Resolves: #1380620 + +* Thu Feb 23 2017 Ondrej Holy - 3.22.0-2 +- Revert icon cache scriplets +- Resolves: #1387055 + +* Thu Feb 16 2017 Ondrej Holy - 3.22.0-1 +- Update to 3.22.0 +- Resolves: #1387055, #1380620 + * Mon Mar 23 2015 Richard Hughes - 3.14.2-1 - Update to 3.14.2 - Resolves: #1174570, #1192548