Hello community, here is the log from the commit of package vinagre for openSUSE:Factory checked in at Fri Jul 8 15:21:29 CEST 2011.
-------- --- GNOME/vinagre/vinagre.changes 2011-05-27 11:26:37.000000000 +0200 +++ /mounts/work_src_done/STABLE/vinagre/vinagre.changes 2011-07-07 09:43:36.000000000 +0200 @@ -1,0 +2,46 @@ +Thu Jul 7 09:22:25 CEST 2011 - [email protected] + +- Rebuild the vala sources before building the code: + vinagre-fix-missing-header.patch introduces a new file that needs + to be generated. When the proper fix will be upstream, the file + will be in the tarball and we won't need this step anymore. + +------------------------------------------------------------------- +Tue Jul 5 07:48:56 CEST 2011 - [email protected] + +- Update to version 3.1.3: + + Allow the main notebook to expand. + + Convert some code to Vala. + + Avoid NULL dereference if a URI has no hostname. + + Distribute the config VAPI file. + + Code improvements and cleanups. + + Build fixes. + + Updated documentation. + + Updated translations. +- Update vinagre-fix-missing-header.patch with patch suggested by + upstream. +- Add vala BuildRequires, needed for the patch. + +------------------------------------------------------------------- +Fri Jun 17 00:53:10 CEST 2011 - [email protected] + +- Update to version 3.1.2: + + Add static extension support, and convert plugins to this. + + Integrate reverse-vnc plugin directly. + + Remove the bookmarks side panel. + + Remove the im-status plugin. + + Remove libpeas and gobject-introspection support. + + Documentation improvements. + + Code cleanups. + + Build fixes. + + Updated translations. +- Remove now unneeded pkgconfig(libpeas-gtk-1.0) BuildRequires. +- Remove unneeded pkgconfig(libpanelapplet-4.0) BuildRequires: the + applet was removed in 3.1.1. +- Remove devel subpackage, as there is no support for external + plugins anymore, and add Obsoletes for vinagre-devel to main + package for smooth upgrades. +- Add vinagre-fix-missing-header.patch: fix the build by adding the + missing header not generated by vala. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- vinagre-3.1.1.tar.bz2 New: ---- vinagre-3.1.3.tar.bz2 vinagre-fix-missing-header.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vinagre.spec ++++++ --- /var/tmp/diff_new_pack.2THsZ6/_old 2011-07-08 15:19:25.000000000 +0200 +++ /var/tmp/diff_new_pack.2THsZ6/_new 2011-07-08 15:19:25.000000000 +0200 @@ -20,12 +20,15 @@ Name: vinagre Summary: VNC client for GNOME -Version: 3.1.1 +Version: 3.1.3 Release: 1 +# FIXME: when patch0 is dropped, remove the first make that is needed to generate a header; it'll get fixed properly upstream because the missing file will be in the tarball License: GPLv2+ Group: Productivity/Networking/Other Url: http://www.gnome.org/projects/vinagre/ -Source0: %{name}-%{version}.tar.bz2 +Source0: http://download.gnome.org/sources/vinagre/3.1/%{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM vinagre-fix-missing-header.patch bgo#652531 [email protected] -- Fix build because of vala not generating a header; based on https://gitorious.org/vinagre/vinagre-elmarco/commit/0d7727a501e2d9fcf911b9a96fda384e53878af5 +Patch0: vinagre-fix-missing-header.patch BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: gdbm-devel @@ -34,13 +37,12 @@ BuildRequires: intltool BuildRequires: translation-update-upstream BuildRequires: update-desktop-files +BuildRequires: vala BuildRequires: pkgconfig(avahi-gobject) BuildRequires: pkgconfig(avahi-ui-gtk3) BuildRequires: pkgconfig(gnome-keyring-1) BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(gtk-vnc-2.0) -BuildRequires: pkgconfig(libpanelapplet-4.0) -BuildRequires: pkgconfig(libpeas-gtk-1.0) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(telepathy-glib) BuildRequires: pkgconfig(vte-2.90) @@ -48,6 +50,7 @@ Recommends: %{name}-lang # For rdp support Recommends: rdesktop +Obsoletes: %{name}-devel < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %glib2_gsettings_schema_requires @@ -56,31 +59,20 @@ machines, browsing for VNC servers via avahi and password storage in gnome-keyring. -%package devel -License: GPLv2+ -Summary: VNC client for GNOME - Development Files -Group: Development/Libraries/GNOME -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. - - %lang_package %prep %setup -q translation-update-upstream +%patch0 -p1 %build %configure --disable-static \ --disable-scrollkeeper \ --enable-ssh \ --disable-spice -%__make %{?jobs:-j%jobs} V=1 +# patch0 needs some help +make vinagre/vinagre-utils.c +make V=1 %{?_smp_mflags} %install %makeinstall @@ -130,22 +122,13 @@ %{_datadir}/mime/packages/vinagre-mime.xml %{_datadir}/telepathy/clients/Vinagre.client %dir %{_datadir}/vinagre -%{_datadir}/vinagre/GNOME_VinagreApplet.xml %{_datadir}/vinagre/vinagre* - -%{_datadir}/vinagre-3.0/ %{_libdir}/vinagre-3.0/ %{_mandir}/man1/*.1.gz # Own directories that are not owned by anything else %dir %{_datadir}/telepathy %dir %{_datadir}/telepathy/clients -%files devel -%defattr(-, root, root) -%{_includedir}/vinagre-3.0/ -%{_libdir}/pkgconfig/*.pc -%{_datadir}/vinagre/gir-1.0/ - %files lang -f %{name}.lang %changelog ++++++ vinagre-3.1.1.tar.bz2 -> vinagre-3.1.3.tar.bz2 ++++++ ++++ 47710 lines of diff (skipped) ++++++ vinagre-fix-missing-header.patch ++++++ >From 0d7727a501e2d9fcf911b9a96fda384e53878af5 Mon Sep 17 00:00:00 2001 From: =?utf-8?q?Marc-Andr=C3=A9=20Lureau?= <[email protected]> Date: Fri, 3 Jun 2011 03:14:22 +0200 Subject: [PATCH] build: include vinagre-vala.h header to get rid of warnings --- Makefile.am | 1 + vinagre/vinagre-bookmarks-ui.c | 1 + vinagre/vinagre-connect.c | 1 + vinagre/vinagre-prefs.c | 1 + 4 files changed, 4 insertions(+), 0 deletions(-) Index: vinagre-3.1.3/Makefile.am =================================================================== --- vinagre-3.1.3.orig/Makefile.am +++ vinagre-3.1.3/Makefile.am @@ -25,6 +25,7 @@ AM_CPPFLAGS = \ -include config.h AM_VALAFLAGS = \ + -H vinagre/vinagre-vala.h \ --vapidir vinagre/vapi \ --pkg config \ --pkg gtk+-3.0 Index: vinagre-3.1.3/vinagre/vinagre-bookmarks-ui.c =================================================================== --- vinagre-3.1.3.orig/vinagre/vinagre-bookmarks-ui.c +++ vinagre-3.1.3/vinagre/vinagre-bookmarks-ui.c @@ -22,6 +22,7 @@ #include <string.h> #include <glib/gi18n.h> +#include "vinagre-vala.h" #include "vinagre-bookmarks-ui.h" #include "vinagre-bookmarks-tree.h" #include "vinagre-plugins-engine.h" Index: vinagre-3.1.3/vinagre/vinagre-prefs.c =================================================================== --- vinagre-3.1.3.orig/vinagre/vinagre-prefs.c +++ vinagre-3.1.3/vinagre/vinagre-prefs.c @@ -21,6 +21,7 @@ #include <config.h> #include <glib/gi18n.h> #include "vinagre-prefs.h" +#include "vinagre-vala.h" #define VINAGRE_SCHEMA_NAME "org.gnome.Vinagre" #define VM_ALWAYS_SHOW_TABS "always-show-tabs" Index: vinagre-3.1.3/Makefile.in =================================================================== --- vinagre-3.1.3.orig/Makefile.in +++ vinagre-3.1.3/Makefile.in @@ -547,6 +547,7 @@ AM_CPPFLAGS = \ -include config.h AM_VALAFLAGS = \ + -H vinagre/vinagre-vala.h \ --vapidir vinagre/vapi \ --pkg config \ --pkg gtk+-3.0 Index: vinagre-3.1.3/vinagre/vinagre-bookmarks-migration.c =================================================================== --- vinagre-3.1.3.orig/vinagre/vinagre-bookmarks-migration.c +++ vinagre-3.1.3/vinagre/vinagre-bookmarks-migration.c @@ -36,6 +36,7 @@ #include "vinagre-bookmarks-migration.h" #include "vinagre-bookmarks.h" #include "vinagre-plugins-engine.h" +#include "vinagre-vala.h" static void fill_xml (GSList *list, xmlTextWriter *writer) Index: vinagre-3.1.3/vinagre/vinagre-bookmarks.c =================================================================== --- vinagre-3.1.3.orig/vinagre/vinagre-bookmarks.c +++ vinagre-3.1.3/vinagre/vinagre-bookmarks.c @@ -30,6 +30,7 @@ #include "vinagre-bookmarks-migration.h" #include "vinagre-connection.h" #include "vinagre-plugins-engine.h" +#include "vinagre-vala.h" struct _VinagreBookmarksPrivate { Index: vinagre-3.1.3/vinagre/vinagre-cache-prefs.c =================================================================== --- vinagre-3.1.3.orig/vinagre/vinagre-cache-prefs.c +++ vinagre-3.1.3/vinagre/vinagre-cache-prefs.c @@ -21,6 +21,7 @@ #include <config.h> #include <glib/gi18n.h> #include "vinagre-cache-prefs.h" +#include "vinagre-vala.h" static GKeyFile *keyfile = NULL; static char* filename = NULL; Index: vinagre-3.1.3/vinagre/vinagre-connect.c =================================================================== --- vinagre-3.1.3.orig/vinagre/vinagre-connect.c +++ vinagre-3.1.3/vinagre/vinagre-connect.c @@ -36,6 +36,7 @@ #include "vinagre-prefs.h" #include "vinagre-cache-prefs.h" #include "vinagre-plugins-engine.h" +#include "vinagre-vala.h" typedef struct { GtkBuilder *xml; Index: vinagre-3.1.3/vinagre/vinagre-reverse-vnc-listener-dialog.c =================================================================== --- vinagre-3.1.3.orig/vinagre/vinagre-reverse-vnc-listener-dialog.c +++ vinagre-3.1.3/vinagre/vinagre-reverse-vnc-listener-dialog.c @@ -42,6 +42,7 @@ #include "vinagre-prefs.h" #include "vinagre-reverse-vnc-listener-dialog.h" #include "vinagre-reverse-vnc-listener.h" +#include "vinagre-vala.h" typedef struct { Index: vinagre-3.1.3/vinagre/vinagre-window.c =================================================================== --- vinagre-3.1.3.orig/vinagre/vinagre-window.c +++ vinagre-3.1.3/vinagre/vinagre-window.c @@ -41,6 +41,7 @@ #include "vinagre-window-private.h" #include "vinagre-bookmarks-entry.h" #include "vinagre-plugins-engine.h" +#include "vinagre-vala.h" #ifdef VINAGRE_HAVE_AVAHI #include "vinagre-mdns.h" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
