.dotnet7.0.metadata

@@ -1 +1 @@
-cf6efafdf1639cf4a58c8ba953512f2cf513daa4 SOURCES/dotnet-v7.0.115.tar.gz
+c2015d0972371ab8995d18246d1f5b76299f3be3 SOURCES/dotnet-v7.0.103.tar.gz

.gitignore

@@ -1 +1 @@
-SOURCES/dotnet-v7.0.115.tar.gz
+SOURCES/dotnet-v7.0.103.tar.gz

SPECS/dotnet7.0.spec

@@ -1,5 +1,4 @@
-# We dont' use %%bootstrap since that doesn't work in CentOS Koji
-%bcond_with bootstrap_dotnet
+%bcond_with bootstrap
 
 # LTO triggers a compilation error for a source level issue.  Given that LTO should not
 # change the validity of any given source and the nature of the error (undefined enum), I
@@ -7,10 +6,10 @@
 # until that's done, disable LTO.  This has to happen before setting the flags below.
 %define _lto_cflags %{nil}
 
-%global host_version 7.0.15
-%global runtime_version 7.0.15
+%global host_version 7.0.3
+%global runtime_version 7.0.3
 %global aspnetcore_runtime_version %{runtime_version}
-%global sdk_version 7.0.115
+%global sdk_version 7.0.103
 %global sdk_feature_band_version %(echo %{sdk_version} | cut -d '-' -f 1 | 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 }')
@@ -57,17 +56,16 @@ 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/
 
-%if %{with bootstrap_dotnet}
-%global bootstrap_sdk_version 7.0.109
+%if %{with bootstrap}
 # The source is generated on a RHEL box via:
 # ./build-dotnet-tarball --bootstrap %%{upstream_tag}
 Source0:        dotnet-%{upstream_tag}-x64-bootstrap.tar.xz
 # Generated via ./build-arm64-bootstrap-tarball
-Source1:        dotnet-prebuilts-%{bootstrap_sdk_version}-arm64.tar.gz
+Source1:        dotnet-arm64-prebuilts-2022-10-12.tar.gz
 # Generated manually, same pattern as the arm64 tarball
-Source2:        dotnet-prebuilts-%{bootstrap_sdk_version}-ppc64le.tar.gz
+Source2:        dotnet-ppc64le-prebuilts-2022-10-21.tar.gz
 # Generated manually, same pattern as the arm64 tarball
-Source3:        dotnet-prebuilts-%{bootstrap_sdk_version}-s390x.tar.gz
+Source3:        dotnet-s390x-prebuilts-2022-10-12.tar.gz
 %else
 # The source is generated on a RHEL box via:
 # ./build-dotnet-tarball %%{upstream_tag}
@@ -92,7 +90,7 @@ ExclusiveArch:  x86_64
 BuildRequires:  clang
 BuildRequires:  cmake
 BuildRequires:  coreutils
-%if %{without bootstrap_dotnet}
+%if %{without bootstrap}
 BuildRequires:  dotnet-sdk-7.0
 BuildRequires:  dotnet-sdk-7.0-source-built-artifacts
 %endif
@@ -326,7 +324,7 @@ applications using the .NET SDK.
 %dotnet_targeting_pack dotnet-apphost-pack-7.0 %{runtime_rpm_version} Microsoft.NETCore.App 7.0 Microsoft.NETCore.App.Host.%{runtime_id}
 %dotnet_targeting_pack dotnet-targeting-pack-7.0 %{runtime_rpm_version} Microsoft.NETCore.App 7.0 Microsoft.NETCore.App.Ref
 %dotnet_targeting_pack aspnetcore-targeting-pack-7.0 %{aspnetcore_runtime_rpm_version} Microsoft.AspNetCore.App 7.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-7.0-source-built-artifacts
@@ -342,7 +340,7 @@ These are not meant for general use.
 
 
 %prep
-%if %{without bootstrap_dotnet}
+%if %{without bootstrap}
 %setup -q -n dotnet-%{upstream_tag}
 
 # Remove all prebuilts
@@ -413,7 +411,7 @@ sed -i -E 's|( /p:BuildDebPackage=false)|\1 --cmakeargs -DCLR_CMAKE_USE_SYSTEM_L
 %build
 cat /etc/os-release
 
-%if %{without bootstrap_dotnet}
+%if %{without bootstrap}
 # We need to create a copy because we will mutate this
 cp -a %{_libdir}/dotnet previously-built-dotnet
 find previously-built-dotnet
@@ -468,7 +466,7 @@ export OPENSSL_ENABLE_SHA1_SIGNATURES=1
 %endif
 
 VERBOSE=1 ./build.sh \
-%if %{without bootstrap_dotnet}
+%if %{without bootstrap}
     --with-sdk previously-built-dotnet \
 %endif
 %ifarch %{mono_archs}
@@ -518,35 +516,30 @@ 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 {} \;
 
-# Provided by dotnet-host from another SRPM
-#install -dm 0755 %%{buildroot}%%{_sysconfdir}/profile.d/
-#install dotnet.sh %%{buildroot}%%{_sysconfdir}/profile.d/
+install -dm 0755 %{buildroot}%{_sysconfdir}/profile.d/
+install dotnet.sh %{buildroot}%{_sysconfdir}/profile.d/
 
-# Provided by dotnet-host from another SRPM
-#install -dm 0755 %%{buildroot}/%%{_datadir}/bash-completion/completions
+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
 
-# Provided by dotnet-host from another SRPM
-#install -dm 0755 %%{buildroot}%%{_bindir}
-#ln -s ../../%%{_libdir}/dotnet/dotnet %%{buildroot}%%{_bindir}/
+install -dm 0755 %{buildroot}%{_bindir}
+ln -s ../../%{_libdir}/dotnet/dotnet %{buildroot}%{_bindir}/
 
-# Provided by dotnet-host from another SRPM
-#for section in 1 7; do
-#    install -dm 0755 %%{buildroot}%%{_mandir}/man${section}/
-#    find -iname 'dotnet*'.${section} -type f -exec cp {} %%{buildroot}%%{_mandir}/man${section}/ \;
-#done
+for section in 1 7; do
+    install -dm 0755 %{buildroot}%{_mandir}/man${section}/
+    find -iname 'dotnet*'.${section} -type f -exec cp {} %{buildroot}%{_mandir}/man${section}/ \;
+done
 
-# Provided by dotnet-host from another SRPM
-#install -dm 0755 %%{buildroot}%%{_sysconfdir}/dotnet
-#echo "%%{_libdir}/dotnet" >> install_location
-#install install_location %%{buildroot}%%{_sysconfdir}/dotnet/
-#echo "%%{_libdir}/dotnet" >> install_location_%%{runtime_arch}
-#install install_location_%%{runtime_arch} %%{buildroot}%%{_sysconfdir}/dotnet/
+install -dm 0755 %{buildroot}%{_sysconfdir}/dotnet
+echo "%{_libdir}/dotnet" >> install_location
+install install_location %{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/
@@ -563,7 +556,7 @@ echo "Testing build results for debug symbols..."
 
 
 
-# Self-check
+%check
 %if 0%{?fedora} > 35
 # lttng in Fedora > 35 is incompatible with .NET
 export COMPlus_LTTng=0
@@ -572,14 +565,27 @@ export COMPlus_LTTng=0
 %{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
 
-# Provided by netstandard-targeting-pack-2.1 from another SRPM
-rm -rf %{buildroot}%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0
+%if 0%{?rhel} <= 8
+%files -n dotnet
+# empty package useful for dependencies
+%endif
 
+%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
+%doc %{_mandir}/man7/dotnet*.7.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-7.0
 %dir %{_libdir}/dotnet/host/fxr
@@ -613,50 +619,6 @@ rm -rf %{buildroot}%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0
 
 
 %changelog
-* Wed Dec 20 2023 Omair Majid <omajid@redhat.com> - 7.0.115-1
-- Update to .NET SDK 7.0.115 and Runtime 7.0.15
-- Resolves: RHEL-19805
-
-* Thu Nov 02 2023 Omair Majid <omajid@redhat.com> - 7.0.114-1
-- Update to .NET SDK 7.0.114 and Runtime 7.0.14
-- Resolves: RHEL-15358
-
-* Tue Oct 24 2023 Omair Majid <omajid@redhat.com> - 7.0.113-2
-- Update to .NET SDK 7.0.113 and Runtime 7.0.13
-- Resolves: RHEL-14474
-
-* Mon Oct 16 2023 Omair Majid <omajid@redhat.com> - 7.0.112-2
-- Update to .NET SDK 7.0.112 and Runtime 7.0.12
-- Resolves: RHEL-11704
-
-* Tue Sep 12 2023 Omair Majid <omajid@redhat.com> - 7.0.111-2
-- Update to .NET SDK 7.0.111 and Runtime 7.0.11
-- Resolves: RHEL-2001
-
-* Wed Aug 23 2023 Omair Majid <omajid@redhat.com> - 7.0.110-4
-- Disable bootstrap
-- Related: RHBZ#2228570
-
-* Tue Aug 22 2023 Omair Majid <omajid@redhat.com> - 7.0.110-3
-- Enable bootstrap
-- Related: RHBZ#2228570
-
-* Wed Aug 09 2023 Omair Majid <omajid@redhat.com> - 7.0.110-2
-- Update to .NET SDK 7.0.110 and Runtime 7.0.10
-- Resolves: RHBZ#2228570
-
-* Tue Jul 11 2023 Omair Majid <omajid@redhat.com> - 7.0.109-2
-- Update to .NET SDK 7.0.109 and Runtime 7.0.9
-- Resolves: RHBZ#2219631
-
-* Wed Jul 05 2023 Omair Majid <omajid@redhat.com> - 7.0.108-2
-- Update to .NET SDK 7.0.108 and Runtime 7.0.8
-- Resolves: RHBZ#2216223
-
-* Thu Mar 02 2023 Omair Majid <omajid@redhat.com> - 7.0.104-1
-- Update to .NET SDK 7.0.104 and Runtime 7.0.4
-- Resolves: RHBZ#2175026
-
 * Thu Feb 02 2023 Omair Majid <omajid@redhat.com> - 7.0.103-1
 - Update to .NET SDK 7.0.103 and Runtime 7.0.3
 - Resolves: RHBZ#2166775