Hello community, here is the log from the commit of package mono-uia for openSUSE:Factory checked in at 2016-06-07 23:48:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mono-uia (Old) and /work/SRC/openSUSE:Factory/.mono-uia.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mono-uia" Changes: -------- --- /work/SRC/openSUSE:Factory/mono-uia/mono-uia.changes 2015-05-10 10:47:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mono-uia.new/mono-uia.changes 2016-06-07 23:48:36.000000000 +0200 @@ -1,0 +2,6 @@ +Sun Jun 5 00:00:00 UTC 2016 - [email protected] + +- added use_net40dir_for_pcfile_new patch: + * fixed incorrect WindowsBase.dll path for mono 4.4.0 and up + +------------------------------------------------------------------- New: ---- use_net40dir_for_pcfile_new ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mono-uia.spec ++++++ --- /var/tmp/diff_new_pack.VpMgxg/_old 2016-06-07 23:48:37.000000000 +0200 +++ /var/tmp/diff_new_pack.VpMgxg/_new 2016-06-07 23:48:37.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package mono-uia # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -32,6 +32,8 @@ # PATCH-FIX-UPSTREAM use_specific_libX11_soname --soname the specific X11 library to avoid conflicts Patch4: use_specific_libX11_soname Patch5: dmcs_net40_build.patch +# use_net40dir_for_pcfile patch for use with mono 4.4 and newer +Patch6: use_net40dir_for_pcfile_new BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: mono-core >= 2.4 Requires: mono-winfxcore @@ -61,7 +63,12 @@ %patch0 %patch1 -p1 %patch2 -p1 +%define mcsver %({ mcs --version | awk '{print $5}' | cut -f1 -d"." ; mcs --version | awk '{print $5}' | cut -f2 -d"." ; } | xargs printf "%03d") +%if 0%{?mcsver} >= 4004 +%patch6 -p1 +%else %patch3 -p1 +%endif %patch4 -p1 %patch5 -p1 ++++++ use_net40dir_for_pcfile_new ++++++ Index: mono-uia.git/data/Makefile.am =================================================================== --- mono-uia.git.orig/data/Makefile.am 2012-02-06 17:12:38.154508732 +0000 +++ mono-uia.git/data/Makefile.am 2012-02-06 17:13:04.142689270 +0000 @@ -1,7 +1,7 @@ EXTRA_DIST = -net20dir = $(prefix)/lib/mono/2.0 +net40dir = $(prefix)/lib/mono/4.0-api a11ydir = $(prefix)/lib/mono/accessibility SHELL = /bin/sh @@ -13,7 +13,7 @@ REWRITE= mono-uia.pc: mono-uia.pc.in Makefile - sed -e "s,@net20dir@,$(net20dir),g" < mono-uia.pc.in > [email protected] + sed -e "s,@net40dir@,$(net40dir),g" < mono-uia.pc.in > [email protected] sed -e "s,@a11ydir@,$(a11ydir),g" < [email protected] > [email protected] mv [email protected] $@ rm [email protected] Index: mono-uia.git/data/mono-uia.pc.in.in =================================================================== --- mono-uia.git.orig/data/mono-uia.pc.in.in 2012-02-06 17:12:26.002424264 +0000 +++ mono-uia.git/data/mono-uia.pc.in.in 2012-02-06 17:12:32.146466976 +0000 @@ -2,4 +2,4 @@ Name: UIAutomation Libraries Description: UIAutomation implementation for Mono. Version: @VERSION@ -Libs: -r:@a11ydir@/UIAutomationTypes.dll -r:@a11ydir@/UIAutomationBridge.dll -r:@a11ydir@/UIAutomationProvider.dll -r:@a11ydir@/UIAutomationSource.dll -r:@a11ydir@/UIAutomationClient.dll -r:@net20dir@/WindowsBase.dll +Libs: -r:@a11ydir@/UIAutomationTypes.dll -r:@a11ydir@/UIAutomationBridge.dll -r:@a11ydir@/UIAutomationProvider.dll -r:@a11ydir@/UIAutomationSource.dll -r:@a11ydir@/UIAutomationClient.dll -r:@net40dir@/WindowsBase.dll
