diff --git a/.dotnet6.0.metadata b/.dotnet6.0.metadata index ce1ac50..21b2f55 100644 --- a/.dotnet6.0.metadata +++ b/.dotnet6.0.metadata @@ -1 +1 @@ -fabf7d61080026082feb263ff7cb6bf5d110cb89 SOURCES/dotnet-v6.0.103-SDK.tar.gz +17be2cc793acd02bb59a6a08616045c2fd1177b8 SOURCES/dotnet-v6.0.104-SDK.tar.gz diff --git a/.gitignore b/.gitignore index 648d0f3..1f6646c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/dotnet-v6.0.103-SDK.tar.gz +SOURCES/dotnet-v6.0.104-SDK.tar.gz diff --git a/SOURCES/check-debug-symbols.py b/SOURCES/check-debug-symbols.py index 53d5fd2..be26d87 100755 --- a/SOURCES/check-debug-symbols.py +++ b/SOURCES/check-debug-symbols.py @@ -65,7 +65,7 @@ def scan_file(file): def is_elf(file): result = subprocess.run(['file', file], stdout=subprocess.PIPE, encoding='utf-8', check=True) - return re.search(r'ELF 64-bit [LM]SB (?:pie )?(?:executable|shared object)', result.stdout) + return re.search('ELF 64-bit LSB (?:executable|shared object)', result.stdout) def scan_file_if_sensible(file): if is_elf(file): diff --git a/SPECS/dotnet6.0.spec b/SPECS/dotnet6.0.spec index 1d7627d..124c282 100644 --- a/SPECS/dotnet6.0.spec +++ b/SPECS/dotnet6.0.spec @@ -20,10 +20,10 @@ # until that's done, disable LTO. This has to happen before setting the flags below. %define _lto_cflags %{nil} -%global host_version 6.0.3 -%global runtime_version 6.0.3 +%global host_version 6.0.4 +%global runtime_version 6.0.4 %global aspnetcore_runtime_version %{runtime_version} -%global sdk_version 6.0.103 +%global sdk_version 6.0.104 %global sdk_feature_band_version %(echo %{sdk_version} | sed -e 's|[[:digit:]][[:digit:]]$|00|') %global templates_version %{runtime_version} #%%global templates_version %%(echo %%{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }') @@ -60,7 +60,7 @@ Name: dotnet6.0 Version: %{sdk_rpm_version} -Release: 5%{?dist} +Release: 3%{?dist} Summary: .NET Runtime and SDK License: MIT and ASL 2.0 and BSD and LGPLv2+ and CC-BY and CC0 and MS-PL and EPL-1.0 and GPL+ and GPLv2 and ISC and OFL and zlib URL: https://github.com/dotnet/ @@ -560,6 +560,7 @@ install install_location_%{runtime_arch} %{buildroot}%{_sysconfdir}/dotnet/ install -dm 0755 %{buildroot}%{_libdir}/dotnet/source-built-artifacts install -m 0644 artifacts/%{runtime_arch}/Release/Private.SourceBuilt.Artifacts.*.tar.gz %{buildroot}/%{_libdir}/dotnet/source-built-artifacts/ + # Quick and dirty check for https://github.com/dotnet/source-build/issues/2731 test -f %{buildroot}%{_libdir}/dotnet/sdk/%{sdk_version}/Sdks/Microsoft.NET.Sdk/Sdk/Sdk.props @@ -626,9 +627,9 @@ echo "Testing build results for debug symbols..." %changelog -* Wed Mar 23 2022 Omair Majid - 6.0.103-5 -- Update to .NET SDK 6.0.103 and Runtime 6.0.3 -- Resolves: RHBZ#2059636 +* Mon Apr 25 2022 Omair Majid - 6.0.104-3 +- Update to .NET SDK 6.0.104 and Runtime 6.0.4 +- Resolves: RHBZ#2072006 * Thu Feb 17 2022 Omair Majid - 6.0.102-1 - Update to .NET SDK 6.0.102 and Runtime 6.0.2