commit vinagre for openSUSE:Factory
Hello community, here is the log from the commit of package vinagre for openSUSE:Factory checked in at Fri Jul 31 21:00:09 CEST 2009. -------- --- GNOME/vinagre/vinagre.changes 2009-05-19 05:13:59.000000000 +0200 +++ /mounts/work_src_done/STABLE/vinagre/vinagre.changes 2009-07-29 15:18:05.000000000 +0200 @@ -1,0 +2,22 @@ +Wed Jul 29 05:58:11 CEST 2009 - vuntz@novell.com + +- Update to version 2.27.5: + + New plugin system. All protocols should be implemented as a + plugin. Initially we have only VNC plugin. + + Telepathy tubes support. This allows you to access a screen of + an IM contact. + + Lots of minor fixes. + + Updated translations. +- Add gnome-keyring-devel, telepathy-glib-devel BuildRequires. +- Add vinagre-linking-order.patch and vinagre-build-fix.patch to + fix build. +- Add devel package, for development files needed to create + plugins. + +------------------------------------------------------------------- +Mon Jul 20 09:49:04 CEST 2009 - vuntz@novell.com + +- Use libexecdir instead of libdir in the file list to fix build. +- Do not package omf files twice. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- vinagre-2.26.2.tar.bz2 New: ---- vinagre-2.27.5.tar.bz2 vinagre-build-fix.patch vinagre-linking-order.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vinagre.spec ++++++ --- /var/tmp/diff_new_pack.eo84KQ/_old 2009-07-31 20:55:57.000000000 +0200 +++ /var/tmp/diff_new_pack.eo84KQ/_new 2009-07-31 20:55:57.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package vinagre (Version 2.26.2) +# spec file for package vinagre (Version 2.27.5) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,19 +23,27 @@ BuildRequires: gconf2-devel BuildRequires: gdbm-devel BuildRequires: gnome-doc-utils-devel +BuildRequires: gnome-keyring-devel BuildRequires: gnome-panel-devel BuildRequires: gtk-vnc-devel BuildRequires: gtk2-devel BuildRequires: intltool BuildRequires: libavahi-gobject-devel BuildRequires: libglade2-devel +BuildRequires: telepathy-glib-devel BuildRequires: update-desktop-files +# Required for patch +BuildRequires: gnome-common Summary: VNC client for GNOME -Version: 2.26.2 +Version: 2.27.5 Release: 1 License: GPL v2 or later Group: Productivity/Networking/Remote Desktop Source0: %{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM vinagre-linking-order.patch vuntz@novell.com -- Taken from git +Patch0: vinagre-linking-order.patch +# PATCH-FIX-UPSTREAM vinagre-build-fix.patch bgo590140 vuntz@novell.com -- Trivial build fixes +Patch1: vinagre-build-fix.patch Url: http://www.gnome.org/projects/vinagre/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: %{name}-lang = %{version} @@ -46,24 +54,41 @@ machines, browsing for VNC servers via avahi and password storage in gnome-keyring. +%package devel +License: GPL v2 or later +Summary: VNC client for GNOME - Development Files +Group: Productivity/Networking/Remote Desktop +Requires: %{name} = %{version} +%description devel +Vinagre is a VNC client for GNOME that supports connecting to multiple +machines, browsing for VNC servers via avahi and password storage in +gnome-keyring. + +This packages contains the development files to create plugins for vinagre. -Authors: --------- - Jonh Wendell - jwendell at gnome dot org %lang_package %prep %setup -q +%patch0 -p1 +%patch1 -p1 %build +NOCONFIGURE=1 gnome-autogen.sh %configure \ + --disable-static \ --enable-avahi \ --disable-scrollkeeper %__make %{?jobs:-j%jobs} %install %makeinstall +find %{buildroot} -type f -name "*.la" -delete -print +# Temporary workaround for wrong directory. +install -d %{buildroot}%{_datadir}/pixmaps +mv %{buildroot}%{_datadir}/icons/vinagre-plugin.png %{buildroot}%{_datadir}/pixmaps +# end of workaround %suse_update_desktop_file vinagre %suse_update_desktop_file vinagre-file %find_lang %{name} @@ -76,6 +101,7 @@ %pre -f %{name}.schemas_pre %preun -f %{name}.schemas_preun + %posttrans -f %{name}.schemas_posttrans %files -f %{name}.schemas_list @@ -83,14 +109,21 @@ %{_bindir}/* %{_datadir}/applications/* %doc %{_datadir}/doc/vinagre +%{_datadir}/dbus-1/services/org.gnome.Empathy.StreamTubeHandler.x_vnc.service %{_datadir}/icons/hicolor/*/*/* %{_datadir}/mime/packages/* +%{_datadir}/pixmaps/vinagre-plugin.png %{_datadir}/vinagre -%{_datadir}/omf/vinagre %{_libdir}/bonobo/servers/*.server -%{_libdir}/vinagre-applet +%{_libdir}/vinagre-1 +%{_libexecdir}/vinagre-applet %{_mandir}/man1/*.1.gz +%files devel +%defattr(-, root, root) +%{_includedir}/vinagre-1.0 +%{_libdir}/pkgconfig/*.pc + %files lang -f %{name}.lang %changelog ++++++ vinagre-2.26.2.tar.bz2 -> vinagre-2.27.5.tar.bz2 ++++++ ++++ 72193 lines of diff (skipped) ++++++ vinagre-build-fix.patch ++++++ Index: vinagre-2.27.5/vinagre/vinagre-tab.c =================================================================== --- vinagre-2.27.5.orig/vinagre/vinagre-tab.c +++ vinagre-2.27.5/vinagre/vinagre-tab.c @@ -732,7 +732,7 @@ vinagre_tab_get_always_sensitive_actions { g_return_val_if_fail (VINAGRE_IS_TAB (tab), NULL); - VINAGRE_TAB_GET_CLASS (tab)->impl_get_always_sensitive_actions (tab); + return VINAGRE_TAB_GET_CLASS (tab)->impl_get_always_sensitive_actions (tab); } const GSList * @@ -740,7 +740,7 @@ vinagre_tab_get_connected_actions (Vinag { g_return_val_if_fail (VINAGRE_IS_TAB (tab), NULL); - VINAGRE_TAB_GET_CLASS (tab)->impl_get_connected_actions (tab); + return VINAGRE_TAB_GET_CLASS (tab)->impl_get_connected_actions (tab); } const GSList * @@ -748,7 +748,7 @@ vinagre_tab_get_initialized_actions (Vin { g_return_val_if_fail (VINAGRE_IS_TAB (tab), NULL); - VINAGRE_TAB_GET_CLASS (tab)->impl_get_initialized_actions (tab); + return VINAGRE_TAB_GET_CLASS (tab)->impl_get_initialized_actions (tab); } static void ++++++ vinagre-linking-order.patch ++++++
From 5669c7e9988701ea3eda2de86924edaa90711400 Mon Sep 17 00:00:00 2001 From: Robert Ancell
Date: Wed, 29 Jul 2009 01:51:41 +0000 Subject: Fix linking order
--- diff --git a/vinagre/Makefile.am b/vinagre/Makefile.am index 5f7d856..52d4159 100644 --- a/vinagre/Makefile.am +++ b/vinagre/Makefile.am @@ -114,10 +114,10 @@ vinagre_SOURCES = \ vinagre-main.c vinagre_LDADD = \ + libvinagre.la \ $(VINAGRE_LIBS) \ $(AVAHI_LIBS) \ $(GTKVNC_LIBS) \ - libvinagre.la \ $(NULL) vinagre_LDFLAGS = -export-dynamic -no-undefined -export-symbols-regex "^[[^_]].*" @@ -183,10 +183,10 @@ vinagre_applet_SOURCES += vinagre-mdns.h vinagre-mdns.c endif vinagre_applet_LDADD = \ + view/libview.la \ $(APPLET_LIBS) \ $(VINAGRE_LIBS) \ $(AVAHI_LIBS) \ - view/libview.la \ $(NULL) vinagre_applet_LDFLAGS = -export-dynamic -no-undefined -export-symbols-regex "^[[^_]].*" -- cgit v0.8.2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de