diff --git a/.gitignore b/.gitignore index 2d64355..7451eed 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/dotnet-v2.2.0.tar.gz +SOURCES/dotnet-2.2.1.tar.gz diff --git a/.rh-dotnet22-dotnet.metadata b/.rh-dotnet22-dotnet.metadata index db54816..16a2c2b 100644 --- a/.rh-dotnet22-dotnet.metadata +++ b/.rh-dotnet22-dotnet.metadata @@ -1 +1 @@ -0f5a5d6efa3d37cdb120dbcdbb0fb7fceb84aa95 SOURCES/dotnet-v2.2.0.tar.gz +ffc8d27a948a282b9b1c9e1f909288446a37d53c SOURCES/dotnet-2.2.1.tar.gz diff --git a/SOURCES/source-build-869-build-log.patch b/SOURCES/source-build-869-build-log.patch deleted file mode 100644 index 61723c6..0000000 --- a/SOURCES/source-build-869-build-log.patch +++ /dev/null @@ -1,193 +0,0 @@ -From a542e1977bf264a1a4e26f0e978387668c74b798 Mon Sep 17 00:00:00 2001 -From: Davis Goodin -Date: Wed, 14 Nov 2018 10:05:41 -0600 -Subject: [PATCH] Set IgnoreStandardErrorWarningFormat on Execs - -For every Exec that takes RedirectRepoOutputToLog, ignore standard error/warning format. If it isn't ignored, there might be problems that are ignored by redirecting to the logs that aren't ignored if redirecting is turned off. Configure Exec not to detect these at all to behave the same whether redirecting or not. ---- - repos/application-insights.proj | 9 ++++++--- - repos/dir.targets | 21 ++++++++++++--------- - repos/netcorecli-fsc.proj | 3 ++- - repos/newtonsoft-json.proj | 3 ++- - repos/nuget-client.proj | 9 ++++++--- - repos/roslyn.proj | 9 ++++++--- - repos/templating.proj | 3 ++- - 7 files changed, 36 insertions(+), 21 deletions(-) - -diff --git a/repos/application-insights.proj b/repos/application-insights.proj -index d9d56eb194..64dffe8ecb 100644 ---- a/repos/application-insights.proj -+++ b/repos/application-insights.proj -@@ -18,14 +18,17 @@ - - -+ WorkingDirectory="$(ProjectDirectory)" -+ IgnoreStandardErrorWarningFormat="true" /> - - -+ WorkingDirectory="$(ProjectDirectory)" -+ IgnoreStandardErrorWarningFormat="true" /> - - -+ WorkingDirectory="$(ProjectDirectory)" -+ IgnoreStandardErrorWarningFormat="true" /> - - -diff --git a/repos/dir.targets b/repos/dir.targets -index 761e7ae603..b3793b1d04 100644 ---- a/repos/dir.targets -+++ b/repos/dir.targets -@@ -245,7 +245,10 @@ - - - -- -+ - - - -@@ -261,7 +264,10 @@ - - - -- -+ - - - -@@ -309,13 +315,10 @@ - - - -- -- -- -- -- -+ - - - -diff --git a/repos/netcorecli-fsc.proj b/repos/netcorecli-fsc.proj -index c905cf9d81..0422eeb233 100644 ---- a/repos/netcorecli-fsc.proj -+++ b/repos/netcorecli-fsc.proj -@@ -12,7 +12,8 @@ - - -+ EnvironmentVariables="@(EnvironmentVariables)" -+ IgnoreStandardErrorWarningFormat="true" /> - - - -diff --git a/repos/newtonsoft-json.proj b/repos/newtonsoft-json.proj -index 073f725fa0..9ad089b05a 100644 ---- a/repos/newtonsoft-json.proj -+++ b/repos/newtonsoft-json.proj -@@ -19,7 +19,8 @@ - - -+ EnvironmentVariables="@(EnvironmentVariables)" -+ IgnoreStandardErrorWarningFormat="true" /> - - - -diff --git a/repos/nuget-client.proj b/repos/nuget-client.proj -index da135caa8a..d97f550d46 100644 ---- a/repos/nuget-client.proj -+++ b/repos/nuget-client.proj -@@ -36,11 +36,13 @@ - - -+ WorkingDirectory="$(ProjectDirectory)" -+ IgnoreStandardErrorWarningFormat="true" /> - - -+ WorkingDirectory="$(ProjectDirectory)" -+ IgnoreStandardErrorWarningFormat="true" /> - - - $(BuildCommandBase) /t:PackXPlat -@@ -53,7 +55,8 @@ - - -+ WorkingDirectory="$(ProjectDirectory)" -+ IgnoreStandardErrorWarningFormat="true" /> - - - -diff --git a/repos/roslyn.proj b/repos/roslyn.proj -index 84d05915b2..5601e710cd 100644 ---- a/repos/roslyn.proj -+++ b/repos/roslyn.proj -@@ -56,7 +56,8 @@ - - -+ EnvironmentVariables="@(EnvironmentVariables)" -+ IgnoreStandardErrorWarningFormat="true" /> - - - -@@ -90,7 +91,8 @@ - - -+ EnvironmentVariables="@(EnvironmentVariables)" -+ IgnoreStandardErrorWarningFormat="true" /> - - - pack --no-build -@@ -104,7 +106,8 @@ - - -+ EnvironmentVariables="@(EnvironmentVariables)" -+ IgnoreStandardErrorWarningFormat="true" /> - - - -diff --git a/repos/templating.proj b/repos/templating.proj -index 568949f865..91a84908c6 100644 ---- a/repos/templating.proj -+++ b/repos/templating.proj -@@ -38,7 +38,8 @@ - - -+ EnvironmentVariables="@(EnvironmentVariables)" -+ IgnoreStandardErrorWarningFormat="true" /> - - - diff --git a/SPECS/dotnet.spec b/SPECS/dotnet.spec index 963e185..d822754 100644 --- a/SPECS/dotnet.spec +++ b/SPECS/dotnet.spec @@ -36,13 +36,13 @@ %global dotnet_cflags %(echo %optflags | sed -e 's/-fcf-protection//' | sed -re 's/-specs=[^ ]*//g') %global dotnet_ldflags %(echo %{__global_ldflags} | sed -re 's/-specs=[^ ]*//g') -%global host_version 2.2.0 -%global sdk_version 2.2.100 -%global runtime_version 2.2.0 +%global host_version 2.2.1 +%global sdk_version 2.2.102 +%global runtime_version 2.2.1 Name: %{?scl_prefix}dotnet Version: %{sdk_version} -Release: 5%{?dist} +Release: 1%{?dist} Group: Development/Languages Summary: .NET Core CLI tools and runtime License: MIT and ASL 2.0 and BSD @@ -55,11 +55,9 @@ URL: https://github.com/dotnet/ # - ./build-source-tarball.sh dotnet-%%{sdk_version} # - tar cvzf dotnet-%%{sdk_version}.tar.gz dotnet-%%{sdk_version} -Source0: dotnet-v%{runtime_version}.tar.gz +Source0: dotnet-%{runtime_version}.tar.gz Source1: check-debug-symbols.py -Patch1: source-build-869-build-log.patch - Patch100: corefx-32956-alpn.patch Patch101: corefx-optflags-support.patch @@ -188,7 +186,7 @@ It particularly focuses on creating console applications, web applications and micro-services. %prep -%setup -q -n %{pkg_name}-v%{runtime_version} +%setup -q -n %{pkg_name}-%{runtime_version} # Disable warnings sed -i 's|skiptests|skiptests ignorewarnings|' repos/coreclr.proj @@ -196,8 +194,6 @@ sed -i 's|skiptests|skiptests ignorewarnings|' repos/coreclr.proj # Fix bad hardcoded path in build sed -i 's|/usr/share/dotnet|%{_libdir}/%{pkg_name}|' src/core-setup/src/corehost/common/pal.unix.cpp -%patch1 -p1 - pushd src/corefx %patch100 -p1 %patch101 -p1 @@ -298,6 +294,10 @@ echo "Testing build results for debug symbols..." %{_libdir}/%{pkg_name}/sdk/%{sdk_version} %changelog +* Tue Dec 18 2018 Omair Majid - 2.2.102-1 +- Update to .NET Core Runtime 2.1.2 and SDK 2.2.102 +- Resolves: RHBZ#1660223 + * Thu Nov 29 2018 Omair Majid - 2.2.100-5 - Remove bash completion to fix parallel installation with .NET Core 2.1 - Resolves: RHBZ#1649584