Accepting request 400080 from home:Warhammer40k:Mono:Factory
Added patch and mono version check to support build with upcoming mono 4.6. Build results with current mono 4.2: https://build.opensuse.org/package/show/home:Warhammer40k:Mono:4.2/mono-zeroconf . Buld results with upcoming mono 4.6 alpha1 (4.4.0.148): https://build.opensuse.org/package/show/home:Warhammer40k:Mono:Factory/mono-zeroconf OBS-URL: https://build.opensuse.org/request/show/400080 OBS-URL: https://build.opensuse.org/package/show/Mono:Factory/mono-zeroconf?expand=0&rev=10
This commit is contained in:
parent
5ed4b0674e
commit
1ef3c15bcf
14
mono-search-path.patch
Normal file
14
mono-search-path.patch
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
diff -uprN mono-zeroconf-0.9.0.old/configure mono-zeroconf-0.9.0/configure
|
||||||
|
--- mono-zeroconf-0.9.0.old/configure 2009-03-31 03:13:16.000000000 +0400
|
||||||
|
+++ mono-zeroconf-0.9.0/configure 2016-06-05 13:17:00.366791012 +0300
|
||||||
|
@@ -3096,8 +3096,8 @@ fi
|
||||||
|
{ $as_echo "$as_me:$LINENO: checking for Mono 2.0 GAC for $asm.dll" >&5
|
||||||
|
$as_echo_n "checking for Mono 2.0 GAC for $asm.dll... " >&6; }
|
||||||
|
if test \
|
||||||
|
- -e "$($PKG_CONFIG --variable=libdir mono)/mono/2.0/$asm.dll" -o \
|
||||||
|
- -e "$($PKG_CONFIG --variable=prefix mono)/lib/mono/2.0/$asm.dll"; \
|
||||||
|
+ -e "$($PKG_CONFIG --variable=libdir mono)/mono/2.0-api/$asm.dll" -o \
|
||||||
|
+ -e "$($PKG_CONFIG --variable=prefix mono)/lib/mono/2.0-api/$asm.dll"; \
|
||||||
|
then \
|
||||||
|
{ $as_echo "$as_me:$LINENO: result: found" >&5
|
||||||
|
$as_echo "found" >&6; }
|
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Sun Jun 5 00:00:00 UTC 2016 - fwdsbs.to.11df@xoxy.net
|
||||||
|
|
||||||
|
- Added patch mono-search-path.patch:
|
||||||
|
* Added alternative search path in configure script for System.dll and System.Web.dll in order to fix build with mono 4.4.0 and up
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue May 5 22:58:04 EDT 2009 - abockover@novell.com
|
Tue May 5 22:58:04 EDT 2009 - abockover@novell.com
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package mono-zeroconf (Version 0.9.0)
|
# spec file for package mono-zeroconf
|
||||||
#
|
#
|
||||||
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -15,18 +15,16 @@
|
|||||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||||
#
|
#
|
||||||
|
|
||||||
# norootforbuild
|
|
||||||
|
|
||||||
|
|
||||||
Name: mono-zeroconf
|
Name: mono-zeroconf
|
||||||
AutoReqProv: on
|
Summary: A cross platform Zero Configuration Networking library for Mono
|
||||||
License: MIT
|
License: MIT
|
||||||
Group: Development/Languages/Mono
|
Group: Development/Languages/Mono
|
||||||
Summary: A cross platform Zero Configuration Networking library for Mono
|
|
||||||
Url: http://mono-project.com/Mono.Zeroconf
|
Url: http://mono-project.com/Mono.Zeroconf
|
||||||
Version: 0.9.0
|
Version: 0.9.0
|
||||||
Release: 1
|
Release: 0
|
||||||
Source0: %{name}-%{version}.tar.bz2
|
Source0: %{name}-%{version}.tar.bz2
|
||||||
|
Patch0: mono-search-path.patch
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
BuildRequires: mono-devel
|
BuildRequires: mono-devel
|
||||||
@ -109,7 +107,6 @@ Authors:
|
|||||||
%if %{build_mdnsr} == 1
|
%if %{build_mdnsr} == 1
|
||||||
|
|
||||||
%package provider-mDNSResponder
|
%package provider-mDNSResponder
|
||||||
License: MIT
|
|
||||||
Summary: A cross platform Zero Configuration Networking library for Mono
|
Summary: A cross platform Zero Configuration Networking library for Mono
|
||||||
Group: Development/Languages/Mono
|
Group: Development/Languages/Mono
|
||||||
BuildRequires: mDNSResponder-devel
|
BuildRequires: mDNSResponder-devel
|
||||||
@ -138,7 +135,6 @@ Authors:
|
|||||||
%if %{build_avahi} == 1
|
%if %{build_avahi} == 1
|
||||||
|
|
||||||
%package provider-avahi
|
%package provider-avahi
|
||||||
License: MIT
|
|
||||||
Summary: A cross platform Zero Configuration Networking library for Mono
|
Summary: A cross platform Zero Configuration Networking library for Mono
|
||||||
Group: Development/Languages/Mono
|
Group: Development/Languages/Mono
|
||||||
Requires: avahi
|
Requires: avahi
|
||||||
@ -166,7 +162,6 @@ Authors:
|
|||||||
%if %{build_docs} == 1
|
%if %{build_docs} == 1
|
||||||
|
|
||||||
%package doc
|
%package doc
|
||||||
License: MIT
|
|
||||||
Summary: A cross platform Zero Configuration Networking library for Mono
|
Summary: A cross platform Zero Configuration Networking library for Mono
|
||||||
Group: Development/Languages/Mono
|
Group: Development/Languages/Mono
|
||||||
|
|
||||||
@ -191,7 +186,6 @@ Authors:
|
|||||||
## --- Devel Package (pkg-config file) --- ##
|
## --- Devel Package (pkg-config file) --- ##
|
||||||
|
|
||||||
%package devel
|
%package devel
|
||||||
License: MIT
|
|
||||||
Summary: A cross platform Zero Configuration Networking library for Mono
|
Summary: A cross platform Zero Configuration Networking library for Mono
|
||||||
Group: Development/Languages/Mono
|
Group: Development/Languages/Mono
|
||||||
Requires: %{name} = %{version}
|
Requires: %{name} = %{version}
|
||||||
@ -216,6 +210,10 @@ Authors:
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
%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
|
||||||
|
%patch0 -p1
|
||||||
|
%endif
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%{?env_options}
|
%{?env_options}
|
||||||
|
Loading…
Reference in New Issue
Block a user