Hello community, here is the log from the commit of package vinagre for openSUSE:Factory checked in at 2016-08-17 12:00:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vinagre (Old) and /work/SRC/openSUSE:Factory/.vinagre.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vinagre" Changes: -------- --- /work/SRC/openSUSE:Factory/vinagre/vinagre.changes 2016-05-16 12:02:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.vinagre.new/vinagre.changes 2016-08-17 12:00:45.000000000 +0200 @@ -1,0 +2,13 @@ +Fri May 27 02:33:08 UTC 2016 - [email protected] + +- Enable rdp by default, since we now have the 2.0 branch in + factory. Switch bcond_with rdp to bcond_without rdp. +- Add vinagre-freerdp2.patch: make configure check for freerdp2, + rather than just freerdp (bgo#765444). +- Following the above patch: Replace pkgconfig(freerdp) for + pkgconfig(freerdp2). Also add gnome-common BuildRequires and pass + autreconf as the patch touches the buildsystem. Further add + pkgconfig(appstream-glib) BuildRequires, new dependency after the + port to freerdp2. + +------------------------------------------------------------------- New: ---- vinagre-freerdp2.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vinagre.spec ++++++ --- /var/tmp/diff_new_pack.bdjS4p/_old 2016-08-17 12:00:46.000000000 +0200 +++ /var/tmp/diff_new_pack.bdjS4p/_new 2016-08-17 12:00:46.000000000 +0200 @@ -16,8 +16,7 @@ # -# disable RDP support for now. Vinagre requires features from the freerdp 1.1.x branch -%bcond_with rdp +%bcond_without rdp Name: vinagre Version: 3.20.2 @@ -27,6 +26,8 @@ Group: Productivity/Networking/Other Url: http://www.gnome.org/projects/vinagre/ Source0: http://download.gnome.org/sources/vinagre/3.20/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM vinagre-freerdp2.patch bgo#765444.patch [email protected] -- handle new "freerdp2" package name. +Patch1: vinagre-freerdp2.patch # The icon we rely on is from adwaita-icon-theme BuildRequires: adwaita-icon-theme BuildRequires: fdupes @@ -42,7 +43,7 @@ BuildRequires: pkgconfig(avahi-gobject) BuildRequires: pkgconfig(avahi-ui-gtk3) %if %{with rdp} -BuildRequires: pkgconfig(freerdp) +BuildRequires: pkgconfig(freerdp2) %endif BuildRequires: pkgconfig(gtk+-3.0) >= 3.9.6 BuildRequires: pkgconfig(gtk-vnc-2.0) >= 0.4.3 @@ -52,6 +53,9 @@ BuildRequires: pkgconfig(telepathy-glib) BuildRequires: pkgconfig(vte-2.91) BuildRequires: pkgconfig(x11) +# Next two lines needed for Patch1 +BuildRequires: gnome-common +BuildRequires: pkgconfig(appstream-glib) Recommends: %{name}-lang Obsoletes: %{name}-devel < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -66,9 +70,12 @@ %prep %setup -q +%patch1 -p1 translation-update-upstream %build +# Needed for Patch1 +autoreconf %configure --disable-static \ --disable-scrollkeeper \ %if %{with rdp} ++++++ vinagre-freerdp2.patch ++++++ >From 8d072483ffff3a4e752c35811fb562f61d206f68 Mon Sep 17 00:00:00 2001 From: Adam Williamson <[email protected]> Date: Fri, 22 Apr 2016 14:54:09 -0700 Subject: [PATCH] handle new freerdp pkgconfig name freerdp has now changed its pkgconfig name to 'freerdp2' - https://github.com/FreeRDP/FreeRDP/commit/6fa36081 . Assuming we can build against both 1 and 2, we should handle both names. --- configure.ac | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 585c016..362951d 100644 --- a/configure.ac +++ b/configure.ac @@ -59,6 +59,7 @@ AM_CONDITIONAL([VINAGRE_ENABLE_SSH], [test "x$have_ssh" = "xyes"]) # Whether to enable support for RDP. RDP_DEPS="freerdp x11" +RDP_2_DEPS="freerdp2 x11" AC_ARG_ENABLE([rdp], [AS_HELP_STRING([--disable-rdp], [Disable Remote Desktop Protocol (RDP) support])]) @@ -68,7 +69,10 @@ AS_IF([test "x$enable_rdp" != "xno"], [have_rdp=yes PKG_CHECK_EXISTS(freerdp >= 1.1, [AC_DEFINE([HAVE_FREERDP_1_1], [1], [FreeRDP is of version 1.1 or newer])], [])], - [have_rdp=no])], + [PKG_CHECK_EXISTS([$RDP_2_DEPS], + [have_rdp=yes + RDP_DEPS=$RDP_2_DEPS + AC_DEFINE([HAVE_FREERDP_1_1], [1], [FreeRDP is of version 1.1 or newer])], [have_rdp=no])])], [have_rdp=no]) AS_IF([test "x$have_rdp" = "xyes"],
