SHA256
1
0
forked from pool/mono-core

Accepting request 841324 from home:dimstar:Factory

- Fix build with RPM 4.16: error: bare words are no longer
  supported, please use "...":  no == yes.

- Fixup mono-find-requires for v1 profiles

OBS-URL: https://build.opensuse.org/request/show/841324
OBS-URL: https://build.opensuse.org/package/show/Mono:Factory/mono-core?expand=0&rev=214
This commit is contained in:
Matthias Mailänder 2020-10-12 19:24:17 +00:00 committed by Git OBS Bridge
parent 07868eb388
commit 3ddef11799
2 changed files with 31 additions and 25 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Oct 12 15:37:39 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
- Fix build with RPM 4.16: error: bare words are no longer
supported, please use "...": no == yes.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu May 28 07:05:06 UTC 2020 - Ismail Dönmez <idonmez@suse.com> Thu May 28 07:05:06 UTC 2020 - Ismail Dönmez <idonmez@suse.com>

View File

@ -88,7 +88,7 @@ BuildRequires: pkgconfig(zlib)
%ifnarch ia64 %arm s390 %ifnarch ia64 %arm s390
BuildRequires: pkgconfig(valgrind) BuildRequires: pkgconfig(valgrind)
%endif %endif
%if %llvm == yes %if "%llvm" == "yes"
BuildRequires: llvm-mono-devel BuildRequires: llvm-mono-devel
%endif %endif
Requires: ca-certificates Requires: ca-certificates
@ -100,7 +100,7 @@ Provides: mono-posix = %{version}
Provides: mono-xml-relaxng = %{version} Provides: mono-xml-relaxng = %{version}
Provides: mono-ziplib = %{version} Provides: mono-ziplib = %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %llvm == yes %if "%llvm" == "yes"
Recommends: libmono-llvm0 = %{version} Recommends: libmono-llvm0 = %{version}
%endif %endif
Recommends: libgdiplus0 Recommends: libgdiplus0
@ -211,7 +211,7 @@ technologies that have been submitted to the ECMA for standardization.
%setup -q -n mono-%{version}.%{version_suffix} %setup -q -n mono-%{version}.%{version_suffix}
%patch14 -p1 %patch14 -p1
%patch16 -p1 %patch16 -p1
%if %roslyn == no %if "%roslyn" == "no"
%patch15 -p1 %patch15 -p1
%else %else
%patch20 -p1 %patch20 -p1
@ -258,12 +258,12 @@ export MONO_CPU_ARCH="armv7l-thumb"
export MONO_CPU_ARCH="armv5el" export MONO_CPU_ARCH="armv5el"
%endif %endif
# distro specific configure options # distro specific configure options
%if %llvm == yes %if "%llvm" == "yes"
export PATH=/opt/novell/llvm-mono/bin:$PATH export PATH=/opt/novell/llvm-mono/bin:$PATH
%endif %endif
%configure \ %configure \
--with-sgen=%{sgen} \ --with-sgen=%{sgen} \
%if %llvm == yes %if "%llvm" == "yes"
--enable-loadedllvm \ --enable-loadedllvm \
%endif %endif
%ifarch ppc %ifarch ppc
@ -272,7 +272,7 @@ export PATH=/opt/novell/llvm-mono/bin:$PATH
%ifnarch %ix86 x86_64 %ifnarch %ix86 x86_64
--disable-system-aot \ --disable-system-aot \
%endif %endif
%if %roslyn == no %if "%roslyn" == "no"
--with-csc=mcs \ --with-csc=mcs \
%endif %endif
--with-ikvm=yes \ --with-ikvm=yes \
@ -347,7 +347,7 @@ install -D -m 0755 %{S:2} %{buildroot}%{_bindir}/gmcs
# this trick is needed to fix build for some packages (gnome-keyring-sharp for example), # this trick is needed to fix build for some packages (gnome-keyring-sharp for example),
# that incorrectly detect CSC precense when it is actually not usable for current platform. # that incorrectly detect CSC precense when it is actually not usable for current platform.
# mono still package roslyn components even if it is disabled from build # mono still package roslyn components even if it is disabled from build
%if %roslyn == no %if "%roslyn" == "no"
rm -v %{buildroot}%{_prefix}/lib/mono/4.5/Microsoft.CodeAnalysis.CSharp.dll* rm -v %{buildroot}%{_prefix}/lib/mono/4.5/Microsoft.CodeAnalysis.CSharp.dll*
rm -v %{buildroot}%{_prefix}/lib/mono/4.5/Microsoft.CodeAnalysis.dll* rm -v %{buildroot}%{_prefix}/lib/mono/4.5/Microsoft.CodeAnalysis.dll*
rm -v %{buildroot}%{_prefix}/lib/mono/4.5/System.Collections.Immutable.dll* rm -v %{buildroot}%{_prefix}/lib/mono/4.5/System.Collections.Immutable.dll*
@ -371,7 +371,7 @@ rm -v %{buildroot}%{_prefix}/lib/mono/msbuild/Current/bin/Roslyn/*
%find_lang mcs %find_lang mcs
%if %sgen == no %if "%sgen" == "no"
# installed anyway but not packaged # installed anyway but not packaged
rm %{buildroot}%{_bindir}/mono-sgen-gdb.py rm %{buildroot}%{_bindir}/mono-sgen-gdb.py
%endif %endif
@ -410,11 +410,11 @@ rm %{buildroot}%{_bindir}/mono-sgen-gdb.py
%{_bindir}/mcs %{_bindir}/mcs
%{_bindir}/mono %{_bindir}/mono
%{_bindir}/mono-hang-watchdog %{_bindir}/mono-hang-watchdog
%if %boehm == yes %if "%boehm" == "yes"
%{_bindir}/mono-boehm %{_bindir}/mono-boehm
%endif %endif
%{_bindir}/mono-configuration-crypto %{_bindir}/mono-configuration-crypto
%if %sgen == yes %if "%sgen" == "yes"
%{_bindir}/mono-sgen %{_bindir}/mono-sgen
%endif %endif
%{_bindir}/mono-test-install %{_bindir}/mono-test-install
@ -551,12 +551,12 @@ rm %{buildroot}%{_bindir}/mono-sgen-gdb.py
%{_prefix}/lib/mono/gac/System.IO.Compression %{_prefix}/lib/mono/gac/System.IO.Compression
%{_prefix}/lib/mono/gac/cscompmgd %{_prefix}/lib/mono/gac/cscompmgd
%{_prefix}/lib/mono/mono-configuration-crypto %{_prefix}/lib/mono/mono-configuration-crypto
%if %btls == yes %if "%btls" == "yes"
%{_libdir}/libmono-btls-shared.so* %{_libdir}/libmono-btls-shared.so*
%{_prefix}/lib/mono/4.5/Mono.Btls.Interface.dll %{_prefix}/lib/mono/4.5/Mono.Btls.Interface.dll
%{_prefix}/lib/mono/gac/Mono.Btls.Interface %{_prefix}/lib/mono/gac/Mono.Btls.Interface
%endif %endif
%if %roslyn == yes %if "%roslyn" == "yes"
%{_bindir}/csc %{_bindir}/csc
%{_bindir}/csi %{_bindir}/csi
%{_bindir}/vbc %{_bindir}/vbc
@ -645,7 +645,7 @@ Development files for libmono.
%{_libdir}/libmono-2.0.so %{_libdir}/libmono-2.0.so
%{_libdir}/pkgconfig/mono-2.pc %{_libdir}/pkgconfig/mono-2.pc
%if %boehm == yes %if "%boehm" == "yes"
%package -n libmonoboehm-2_0-1 %package -n libmonoboehm-2_0-1
Summary: A Library for embedding Mono in your Application (Boehm GC) Summary: A Library for embedding Mono in your Application (Boehm GC)
License: LGPL-2.1-only License: LGPL-2.1-only
@ -691,7 +691,7 @@ Development files for libmonoboehm
%{_libdir}/libmonoboehm-2.0.so %{_libdir}/libmonoboehm-2.0.so
%endif %endif
%if %sgen == yes %if "%sgen" == "yes"
%package -n libmonosgen-2_0-1 %package -n libmonosgen-2_0-1
Summary: A Library for embedding Mono in your Application (SGen GC) Summary: A Library for embedding Mono in your Application (SGen GC)
License: LGPL-2.1-only License: LGPL-2.1-only
@ -739,7 +739,7 @@ Development files for libmonosgen.
%{_libdir}/pkgconfig/monosgen-2.pc %{_libdir}/pkgconfig/monosgen-2.pc
%endif %endif
%if %llvm == yes %if "%llvm" == "yes"
%package -n libmono-llvm0 %package -n libmono-llvm0
Summary: Loadable LLVM libary for mono Summary: Loadable LLVM libary for mono
License: LGPL-2.1-only License: LGPL-2.1-only
@ -856,7 +856,7 @@ Database connectivity for Mono.
%{_prefix}/lib/mono/gac/System.Runtime.Serialization %{_prefix}/lib/mono/gac/System.Runtime.Serialization
%{_prefix}/lib/mono/gac/System.Transactions %{_prefix}/lib/mono/gac/System.Transactions
%{_prefix}/lib/mono/gac/WebMatrix.Data %{_prefix}/lib/mono/gac/WebMatrix.Data
%if %roslyn == yes %if "%roslyn" == "yes"
%{_prefix}/lib/mono/4.5/sqlmetal.pdb %{_prefix}/lib/mono/4.5/sqlmetal.pdb
%{_prefix}/lib/mono/4.5/sqlsharp.pdb %{_prefix}/lib/mono/4.5/sqlsharp.pdb
%endif %endif
@ -981,7 +981,7 @@ Extra packages.
%{_prefix}/lib/mono/gac/System.ServiceProcess %{_prefix}/lib/mono/gac/System.ServiceProcess
%{_prefix}/lib/mono/gac/System.Xaml %{_prefix}/lib/mono/gac/System.Xaml
%{_prefix}/lib/mono/gac/mono-service %{_prefix}/lib/mono/gac/mono-service
%if %roslyn == yes %if "%roslyn" == "yes"
%{_prefix}/lib/mono/4.5/installutil.pdb %{_prefix}/lib/mono/4.5/installutil.pdb
%{_prefix}/lib/mono/4.5/mono-service.pdb %{_prefix}/lib/mono/4.5/mono-service.pdb
%{_prefix}/lib/mono/4.5/RabbitMQ.Client.Apigen.pdb %{_prefix}/lib/mono/4.5/RabbitMQ.Client.Apigen.pdb
@ -1052,7 +1052,7 @@ Mono implementation of WCF, Windows Communication Foundation
%{_prefix}/lib/mono/gac/System.ServiceModel.Routing %{_prefix}/lib/mono/gac/System.ServiceModel.Routing
%{_prefix}/lib/mono/gac/System.ServiceModel.Web %{_prefix}/lib/mono/gac/System.ServiceModel.Web
%{_prefix}/lib/mono/gac/SMDiagnostics %{_prefix}/lib/mono/gac/SMDiagnostics
%if %roslyn == yes %if "%roslyn" == "yes"
%{_prefix}/lib/mono/4.5/svcutil.pdb %{_prefix}/lib/mono/4.5/svcutil.pdb
%endif %endif
@ -1176,7 +1176,7 @@ Mono implementation of ASP.NET, Remoting and Web Services.
%{_prefix}/lib/mono/gac/System.Web.WebPages.Deployment %{_prefix}/lib/mono/gac/System.Web.WebPages.Deployment
%{_prefix}/lib/mono/gac/System.Web.WebPages.Razor %{_prefix}/lib/mono/gac/System.Web.WebPages.Razor
%{_prefix}/lib/mono/gac/System.Web.WebPages %{_prefix}/lib/mono/gac/System.Web.WebPages
%if %roslyn == yes %if "%roslyn" == "yes"
%{_prefix}/lib/mono/4.5/disco.pdb %{_prefix}/lib/mono/4.5/disco.pdb
%{_prefix}/lib/mono/4.5/mconfig.pdb %{_prefix}/lib/mono/4.5/mconfig.pdb
%{_prefix}/lib/mono/4.5/soapsuds.pdb %{_prefix}/lib/mono/4.5/soapsuds.pdb
@ -1466,7 +1466,7 @@ Mono development tools.
%{_prefix}/lib/mono/xbuild-frameworks %{_prefix}/lib/mono/xbuild-frameworks
%dir %{_libdir}/mono/ %dir %{_libdir}/mono/
%{_libdir}/mono/lldb %{_libdir}/mono/lldb
%if %roslyn == yes %if "%roslyn" == "yes"
%{_prefix}/lib/mono/msbuild %{_prefix}/lib/mono/msbuild
%{_prefix}/lib/mono/4.5/caspol.pdb %{_prefix}/lib/mono/4.5/caspol.pdb
%{_prefix}/lib/mono/4.5/cccheck.pdb %{_prefix}/lib/mono/4.5/cccheck.pdb
@ -1589,7 +1589,7 @@ Monodoc-core contains documentation tools for C#.
%{_prefix}/lib/mono/gac/monodoc %{_prefix}/lib/mono/gac/monodoc
%{_prefix}/lib/mono/monodoc %{_prefix}/lib/mono/monodoc
%{_prefix}/lib/monodoc %{_prefix}/lib/monodoc
%if %roslyn == yes %if "%roslyn" == "yes"
%{_prefix}/lib/mono/4.5/mdoc.pdb %{_prefix}/lib/mono/4.5/mdoc.pdb
%{_prefix}/lib/mono/4.5/mod.pdb %{_prefix}/lib/mono/4.5/mod.pdb
%endif %endif
@ -1602,14 +1602,14 @@ Requires: ibm-data-db2 = %{version}
Requires: libmono-2_0-1 = %{version} Requires: libmono-2_0-1 = %{version}
Requires: libmono-2_0-devel = %{version} Requires: libmono-2_0-devel = %{version}
Requires: mono-core = %{version} Requires: mono-core = %{version}
%if %llvm == yes %if "%llvm" == "yes"
Requires: libmono-llvm0 = %{version} Requires: libmono-llvm0 = %{version}
%endif %endif
%if %sgen == yes %if "%sgen" == "yes"
Requires: libmonosgen-2_0-1 = %{version} Requires: libmonosgen-2_0-1 = %{version}
Requires: libmonosgen-2_0-devel = %{version} Requires: libmonosgen-2_0-devel = %{version}
%endif %endif
%if %boehm == yes %if "%boehm" == "yes"
Requires: libmonoboehm-2_0-1 = %{version} Requires: libmonoboehm-2_0-1 = %{version}
Requires: libmonoboehm-2_0-devel = %{version} Requires: libmonoboehm-2_0-devel = %{version}
%endif %endif