import dotnet6.0-6.0.109-3.el8

.dotnet6.0.metadata

@@ -1 +1 @@
-fa3960a7a58e87c1c7faf53772479e2f2025ccb2 SOURCES/dotnet-v6.0.108-SDK.tar.gz
+3e7e0c4fc4757c07747759196784dbdd3a49feaa SOURCES/dotnet-v6.0.109.tar.gz

.gitignore

@@ -1 +1 @@
-SOURCES/dotnet-v6.0.108-SDK.tar.gz
+SOURCES/dotnet-v6.0.109.tar.gz

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.8
+%global host_version 6.0.9
-%global runtime_version 6.0.8
+%global runtime_version 6.0.9
 %global aspnetcore_runtime_version %{runtime_version}
-%global sdk_version 6.0.108
+%global sdk_version 6.0.109
 %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 }')
@@ -34,7 +34,7 @@
 %global sdk_rpm_version %{sdk_version}
 
 # upstream can update releases without revving the SDK version so these don't always match
-%global upstream_tag v%{sdk_version}-SDK
+%global upstream_tag v%{sdk_version}
 
 %if 0%{?fedora} || 0%{?rhel} < 8
 %global use_bundled_libunwind 0
@@ -60,7 +60,7 @@
 
 Name:           dotnet6.0
 Version:        %{sdk_rpm_version}
-Release:        1%{?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/
@@ -338,7 +338,7 @@ applications using the .NET SDK.
 %dotnet_targeting_pack dotnet-apphost-pack-6.0 %{runtime_rpm_version} Microsoft.NETCore.App 6.0 Microsoft.NETCore.App.Host.%{runtime_id}
 %dotnet_targeting_pack dotnet-targeting-pack-6.0 %{runtime_rpm_version} Microsoft.NETCore.App 6.0 Microsoft.NETCore.App.Ref
 %dotnet_targeting_pack aspnetcore-targeting-pack-6.0 %{aspnetcore_runtime_rpm_version} Microsoft.AspNetCore.App 6.0 Microsoft.AspNetCore.App.Ref
-%dotnet_targeting_pack netstandard-targeting-pack-2.1 %{sdk_rpm_version} NETStandard.Library 2.1 NETStandard.Library.Ref
+#%%dotnet_targeting_pack netstandard-targeting-pack-2.1 %%{sdk_rpm_version} NETStandard.Library 2.1 NETStandard.Library.Ref
 
 
 %package -n dotnet-sdk-6.0-source-built-artifacts
@@ -488,7 +488,7 @@ export EXTRA_CFLAGS="$CFLAGS"
 export EXTRA_CXXFLAGS="$CXXFLAGS"
 export EXTRA_LDFLAGS="$LDFLAGS"
 
-VERBOSE=1 ./build.sh \
+CheckEolTargetFramework=false VERBOSE=1 ./build.sh \
 %if %{without bootstrap}
     --with-sdk previously-built-dotnet \
 %endif
@@ -534,28 +534,33 @@ find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.targets' -exec chmod -x {}
 find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.txt' -exec chmod -x {} \;
 find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.xml' -exec chmod -x {} \;
 
-install -dm 0755 %{buildroot}%{_sysconfdir}/profile.d/
+# Provided by dotnet-host from another SRPM
-install dotnet.sh %{buildroot}%{_sysconfdir}/profile.d/
+#install -dm 0755 %%{buildroot}%%{_sysconfdir}/profile.d/
+#install dotnet.sh %%{buildroot}%%{_sysconfdir}/profile.d/
 
-install -dm 0755 %{buildroot}/%{_datadir}/bash-completion/completions
+# Provided by dotnet-host from another SRPM
+#install -dm 0755 %%{buildroot}/%%{_datadir}/bash-completion/completions
 # dynamic completion needs the file to be named the same as the base command
-install src/sdk/scripts/register-completions.bash %{buildroot}/%{_datadir}/bash-completion/completions/dotnet
+#install src/sdk/scripts/register-completions.bash %%{buildroot}/%%{_datadir}/bash-completion/completions/dotnet
 
 # TODO: the zsh completion script needs to be ported to use #compdef
 #install -dm 755 %%{buildroot}/%%{_datadir}/zsh/site-functions
 #install src/cli/scripts/register-completions.zsh %%{buildroot}/%%{_datadir}/zsh/site-functions/_dotnet
 
-install -dm 0755 %{buildroot}%{_bindir}
+# Provided by dotnet-host from another SRPM
-ln -s ../../%{_libdir}/dotnet/dotnet %{buildroot}%{_bindir}/
+#install -dm 0755 %%{buildroot}%%{_bindir}
+#ln -s ../../%%{_libdir}/dotnet/dotnet %%{buildroot}%%{_bindir}/
 
-install -dm 0755 %{buildroot}%{_mandir}/man1/
+# Provided by dotnet-host from another SRPM
-find -iname 'dotnet*.1' -type f -exec cp {} %{buildroot}%{_mandir}/man1/ \;
+#install -dm 0755 %%{buildroot}%%{_mandir}/man1/
+#find -iname 'dotnet*.1' -type f -exec cp {} %%{buildroot}%%{_mandir}/man1/ \;
 
-install -dm 0755 %{buildroot}%{_sysconfdir}/dotnet
+# Provided by dotnet-host from another SRPM
-echo "%{_libdir}/dotnet" >> install_location
+#install -dm 0755 %%{buildroot}%%{_sysconfdir}/dotnet
-install install_location %{buildroot}%{_sysconfdir}/dotnet/
+#echo "%%{_libdir}/dotnet" >> install_location
-echo "%{_libdir}/dotnet" >> install_location_%{runtime_arch}
+#install install_location %%{buildroot}%%{_sysconfdir}/dotnet/
-install install_location_%{runtime_arch} %{buildroot}%{_sysconfdir}/dotnet/
+#echo "%%{_libdir}/dotnet" >> install_location_%%{runtime_arch}
+#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/
@@ -571,29 +576,17 @@ echo "Testing build results for debug symbols..."
 %{SOURCE10} -v %{buildroot}%{_libdir}/dotnet/
 
 
-
+# Self-check
-%check
 %{buildroot}%{_libdir}/dotnet/dotnet --info
 %{buildroot}%{_libdir}/dotnet/dotnet --version
 
+# Provided by dotnet-host from another SRPM
+rm %{buildroot}%{_libdir}/dotnet/LICENSE.txt
+rm %{buildroot}%{_libdir}/dotnet/ThirdPartyNotices.txt
+rm %{buildroot}%{_libdir}/dotnet/dotnet
 
-%files -n dotnet
+# Provided by netstandard-targeting-pack-2.1 from another SRPM
-# empty package useful for dependencies
+rm -rf %{buildroot}%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0
-
-%files -n dotnet-host
-%dir %{_libdir}/dotnet
-%{_libdir}/dotnet/dotnet
-%dir %{_libdir}/dotnet/host
-%dir %{_libdir}/dotnet/host/fxr
-%{_bindir}/dotnet
-%license %{_libdir}/dotnet/LICENSE.txt
-%license %{_libdir}/dotnet/ThirdPartyNotices.txt
-%doc %{_mandir}/man1/dotnet*.1.gz
-%config(noreplace) %{_sysconfdir}/profile.d/dotnet.sh
-%config(noreplace) %{_sysconfdir}/dotnet
-%dir %{_datadir}/bash-completion
-%dir %{_datadir}/bash-completion/completions
-%{_datadir}/bash-completion/completions/dotnet
 
 %files -n dotnet-hostfxr-6.0
 %dir %{_libdir}/dotnet/host/fxr
@@ -627,6 +620,14 @@ echo "Testing build results for debug symbols..."
 
 
 %changelog
+* Sat Sep 17 2022 Omair Majid <omajid@redhat.com> - 6.0.109-3
+- Remove subpackages that are now provided by other packages
+- Related: RHBZ#2123787
+
+* Wed Sep 14 2022 Omair Majid <omajid@redhat.com> - 6.0.109-2
+- Update to .NET SDK 6.0.109 and Runtime 6.0.9
+- Resolves: RHBZ#2123787
+
 * Tue Aug 09 2022 Omair Majid <omajid@redhat.com> - 6.0.108-1
 - Update to .NET SDK 6.0.108 and Runtime 6.0.8
 - Resolves: RHBZ#2112408