diff --git a/build-dotnet-tarball b/build-dotnet-tarball
index 500a9f6..7c9a3aa 100755
--- a/build-dotnet-tarball
+++ b/build-dotnet-tarball
@@ -178,6 +178,9 @@ rm -r src/nuget-client/test/EndToEnd
 # https://github.com/microsoft/ApplicationInsights-dotnet/issues/2670
 rm -r src/source-build-externals/src/application-insights/LOGGING/test/Shared/CustomTelemetryChannel.cs
 
+# CC-BY-SA https://gitlab.com/fedora/legal/fedora-license-data/-/issues/104#note_1230640823
+rm -r src/runtime/src/tests/sizeondisk/sodbench
+
 popd
 
 if [[ ${build_bootstrap} == true ]]; then
diff --git a/dotnet7.0.spec b/dotnet7.0.spec
index 54db677..2ec2d5f 100644
--- a/dotnet7.0.spec
+++ b/dotnet7.0.spec
@@ -56,7 +56,8 @@ Name:           dotnet%{dotnetver}
 Version:        %{sdk_rpm_version}
 Release:        0%{?dist}.1
 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
+License:        0BSD AND Apache-2.0 AND (Apache-2.0 WITH LLVM-Exception) AND APSL-2.0 AND BSD-2-Clause AND BSD-3-Clause AND BSD-4-Clause AND BSL-1.0 AND bzip2-1.0.6 AND CC0-1.0 AND CC-BY-3.0 AND CC-BY-4.0 AND CC-PDDC AND CNRI-Python AND EPL-1.0 AND GPL-2.0-only AND (GPL-2.0-only WITH GCC-exception-2.0) AND GPL-2.0-or-later AND GPL-3.0-only AND ICU AND ISC AND LGPL-2.1-only AND LGPL-2.1-or-later AND LicenseRef-Fedora-Public-Domain AND LicenseRef-ISO-8879 AND MIT AND MIT-Wu AND MS-PL AND MS-RL AND NCSA AND OFL-1.1 AND OpenSSL AND Unicode-DFS-2015 AND Unicode-DFS-2016 AND W3C-19980720 AND X11 AND Zlib
+
 URL:            https://github.com/dotnet/
 
 %if %{with bootstrap}
@@ -426,17 +427,7 @@ popd
 
 %endif
 
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
+%autopatch -p1
 
 # Fix bad hardcoded path in build
 sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/runtime/src/native/corehost/hostmisc/pal.unix.cpp