Hello community, here is the log from the commit of package libproxy for openSUSE:Factory checked in at 2016-10-10 17:32:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libproxy (Old) and /work/SRC/openSUSE:Factory/.libproxy.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libproxy" Changes: -------- --- /work/SRC/openSUSE:Factory/libproxy/libproxy-plugins.changes 2016-09-21 18:26:31.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libproxy.new/libproxy-plugins.changes 2016-10-10 17:32:03.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Sep 29 09:48:02 UTC 2016 - [email protected] + +- Add libproxy-FindMono-4.6.patch: Fall back to mcs if gmcs cannot + be found. Fixes issues with mono 4.6, which no longer ships the + wrapper by default. + +------------------------------------------------------------------- libproxy.changes: same change New: ---- libproxy-FindMono-4.6.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libproxy-plugins.spec ++++++ --- /var/tmp/diff_new_pack.cp22ob/_old 2016-10-10 17:32:05.000000000 +0200 +++ /var/tmp/diff_new_pack.cp22ob/_new 2016-10-10 17:32:05.000000000 +0200 @@ -47,6 +47,8 @@ Patch0: libproxy-gnome-waitpid.patch # PATCH-FIX-UPSTREAM libproxy-python3-support.patch [email protected] -- Add support to build python2 and python3 bindings together Patch1: libproxy-python3-support.patch +# PATCH-FIX-UPSTREAM libproxy-FindMono-4.6.patch gh#libproxy/libproxy#37 [email protected] -- Fall back to mcs if gmcs cannot be found +Patch2: libproxy-FindMono-4.6.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake BuildRequires: gcc-c++ @@ -340,6 +342,7 @@ %setup -q -n %{_sourcename} %patch0 -p1 %patch1 -p1 +%patch2 -p1 mkdir build %build ++++++ libproxy.spec ++++++ --- /var/tmp/diff_new_pack.cp22ob/_old 2016-10-10 17:32:05.000000000 +0200 +++ /var/tmp/diff_new_pack.cp22ob/_new 2016-10-10 17:32:05.000000000 +0200 @@ -47,6 +47,8 @@ Patch0: libproxy-gnome-waitpid.patch # PATCH-FIX-UPSTREAM libproxy-python3-support.patch [email protected] -- Add support to build python2 and python3 bindings together Patch1: libproxy-python3-support.patch +# PATCH-FIX-UPSTREAM libproxy-FindMono-4.6.patch gh#libproxy/libproxy#37 [email protected] -- Fall back to mcs if gmcs cannot be found +Patch2: libproxy-FindMono-4.6.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake BuildRequires: gcc-c++ @@ -340,6 +342,7 @@ %setup -q -n %{_sourcename} %patch0 -p1 %patch1 -p1 +%patch2 -p1 mkdir build %build ++++++ libproxy-FindMono-4.6.patch ++++++ >From 2e4546b3cde31d657df34f6d247c92c47c83bf81 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger <[email protected]> Date: Thu, 29 Sep 2016 11:36:50 +0200 Subject: [PATCH 5/5] FindMono: fall back to mcs when gmcs cannot be found With mono 4.6, gmcs is no longer an upstream shipped wrapper. Just fallback to 'mcs' if gmcs cannot be found. Distros still shipping gmcs are assumed to know why they do so - in this case we favor their local scripts. Fixes issue #37. --- cmake/FindMono.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/FindMono.cmake b/cmake/FindMono.cmake index 95930b0..d4aa0ca 100644 --- a/cmake/FindMono.cmake +++ b/cmake/FindMono.cmake @@ -12,7 +12,7 @@ # Redistribution and use is allowed according to the terms of the GPL license. FIND_PROGRAM (MONO_EXECUTABLE mono) -FIND_PROGRAM (GMCS_EXECUTABLE gmcs) +FIND_PROGRAM (GMCS_EXECUTABLE NAMES gmcs mcs) FIND_PROGRAM (GACUTIL_EXECUTABLE gacutil) SET (MONO_FOUND FALSE CACHE INTERNAL "") -- 2.10.0
