diff --git a/.gitignore b/.gitignore index cfde0c5..04db8af 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/dotnet-2.0.6.tar.gz +SOURCES/dotnet-2.0.7.tar.gz diff --git a/.rh-dotnet20-dotnet.metadata b/.rh-dotnet20-dotnet.metadata index ea98ac1..f3e8f83 100644 --- a/.rh-dotnet20-dotnet.metadata +++ b/.rh-dotnet20-dotnet.metadata @@ -1 +1 @@ -66b7c83e14426f308f441da1d5db9f801d32580a SOURCES/dotnet-2.0.6.tar.gz +617a9f60d51df588dfb25f277a166f3c72ef9262 SOURCES/dotnet-2.0.7.tar.gz diff --git a/SPECS/dotnet.spec b/SPECS/dotnet.spec index 38e69f4..6abbea8 100644 --- a/SPECS/dotnet.spec +++ b/SPECS/dotnet.spec @@ -5,8 +5,8 @@ %undefine _include_minidebuginfo %global _find_debuginfo_dwz_opts %{nil} -%global sdk_version 2.1.101 -%global runtime_version 2.0.6 +%global sdk_version 2.1.105 +%global runtime_version 2.0.7 # Do not provide internal .so as standard libraries %global __provides_exclude_from ^(%{_libdir}/dotnet/.*\\.so|%{_libdir}/dotnetcore/sdk/%{sdk_version}/.*\\.so|%{_libdir}/dotnetcore/shared/Microsoft.NETCore.App/%{runtime_version}/.*)$ @@ -16,7 +16,7 @@ Name: %{?scl_prefix}dotnet Version: %{runtime_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: .NET Core is a general-purpose cross platform development platform Group: Development/Languages License: ASL 2.0 and MIT @@ -142,6 +142,7 @@ popd # Increase build verbosity sed -i -e "s|flp:Verbosity=normal|flp:Verbosity=diag|" src/coreclr/build.sh +sed -i -e "s|/flp:v=normal|/flp:v=diag|" src/corefx/config.json # Change text printed when SDK is not installed sed -i -e "s|http://go.microsoft.com/fwlink/?LinkID=798306&clcid=0x409|yum install %{?scl_prefix}dotnet-sdk-2.1|" src/core-setup/src/corehost/common/utils.h @@ -150,10 +151,9 @@ sed -i -e "s|http://go.microsoft.com/fwlink/?LinkID=798306&clcid=0x409|yum insta # Replace RHEL rid with CentOS rid sed -i -e 's|rhel.7.4-|centos.%{centos}-|g' targets/core-setup.props sed -i -e 's|rhel.7.4-|centos.%{centos}-|g' targets/cli.props - -# These patches explicitly force a RHEL runtime id -rm patches/corefx/0008-fix-ilasm.patch -rm patches/cli/0013-pass-rid-to-crossgen.csproj.patch +sed -i -e 's|rhel.7.4-x64|centos.%{centos}-x64|' targets/roslyn.props +sed -i -e 's|rhel.7-x64|centos.%{centos}-x64|' build.proj +sed -i -e 's|rhel.7.4-x64|centos.%{centos}-x64|' src/cli/tools/CrossGen.Dependencies/CrossGen.Dependencies.csproj %endif %build @@ -161,7 +161,7 @@ rm patches/cli/0013-pass-rid-to-crossgen.csproj.patch set -xe export CMAKE_PREFIX_PATH="%{_prefix}" -VERBOSE=1 ./build.sh /clp:v=detailed +VERBOSE=1 ./build.sh /clp:v=diag || ./build.sh /clp:v=diag %{?scl:EOF} @@ -230,6 +230,12 @@ python %{SOURCE1} %{buildroot}%{_libdir}/dotnet/ %{_root_datadir}/zsh/site-functions/%{name} %changelog +* Mon Apr 23 2018 Omair Majid - 2.0.7-2 +- Fix build for CentOS + +* Fri Apr 20 2018 Omair Majid - 2.0.7-1 +- Update to .NET Core 2.0.7 + * Fri Mar 2 2018 Omair Majid - 2.0.6-1 - Update to .NET Core 2.0.6