diff --git a/.gitignore b/.gitignore index e798550..977de64 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/dotnet-v5.0.100-SDK.tar.gz +SOURCES/dotnet-v5.0.102-SDK.tar.gz diff --git a/.rh-dotnet50-dotnet.metadata b/.rh-dotnet50-dotnet.metadata index e0a322e..ce998a9 100644 --- a/.rh-dotnet50-dotnet.metadata +++ b/.rh-dotnet50-dotnet.metadata @@ -1 +1 @@ -496dbf31f5355047ca4ccd5f6ca647c59dec2a86 SOURCES/dotnet-v5.0.100-SDK.tar.gz +1b47f758a911b780975042502298ba5fc2a585ce SOURCES/dotnet-v5.0.102-SDK.tar.gz diff --git a/SPECS/dotnet.spec b/SPECS/dotnet.spec index 40d6e8e..c246f6b 100644 --- a/SPECS/dotnet.spec +++ b/SPECS/dotnet.spec @@ -23,18 +23,18 @@ # until that's done, disable LTO. This has to happen before setting the flags below. %define _lto_cflags %{nil} -%global host_version 5.0.0 -%global runtime_version 5.0.0 -%global aspnetcore_runtime_version 5.0.0 -%global sdk_version 5.0.100 -%global templates_version 5.0.0 +%global host_version 5.0.2 +%global runtime_version 5.0.2 +%global aspnetcore_runtime_version %{runtime_version} +%global sdk_version 5.0.102 +%global templates_version %{runtime_version} #%%global templates_version %%(echo %%{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }') -%global host_rpm_version 5.0.0 -%global aspnetcore_runtime_rpm_version 5.0.0 -%global runtime_rpm_version 5.0.0 -%global sdk_rpm_version 5.0.100 +%global host_rpm_version %{host_version} +%global aspnetcore_runtime_rpm_version %{aspnetcore_runtime_version} +%global runtime_rpm_version %{runtime_version} +%global sdk_rpm_version %{sdk_version} # upstream can update releases without revving the SDK version so these don't always match %global src_version %{sdk_version} @@ -310,25 +310,24 @@ rm -rf packages/source-built %endif %if %{without bootstrap} -sed -i -e 's|5.0.100-preview1-014459|5.0.103|' global.json mkdir -p packages/archive ln -s %{_libdir}/dotnet/source-built-artifacts/*.tar.gz packages/archive/ ln -s %{_libdir}/dotnet/reference-packages/Private.SourceBuild.ReferencePackages*.tar.gz packages/archive %endif # Fix bad hardcoded path in build -sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/runtime.*/src/installer/corehost/cli/hostmisc/pal.unix.cpp +sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/dotnet-runtime.*/src/installer/corehost/cli/hostmisc/pal.unix.cpp # Disable warnings sed -i 's|skiptests|skiptests ignorewarnings|' repos/runtime.common.props %patch1 -p1 -pushd src/runtime.* +pushd src/dotnet-runtime.* %patch100 -p1 popd -pushd src/sdk.* +pushd src/dotnet-sdk.* %patch500 -p1 popd @@ -447,7 +446,7 @@ install dotnet.sh %{buildroot}%{_sysconfdir}/profile.d/ install -dm 0755 %{buildroot}/%{_root_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}/%{_root_datadir}/bash-completion/completions/dotnet +install src/dotnet-sdk.*/scripts/register-completions.bash %{buildroot}/%{_root_datadir}/bash-completion/completions/dotnet # TODO: the zsh completion script needs to be ported to use #compdef #install -dm 755 %%{buildroot}/%%{_root_datadir}/zsh/site-functions @@ -524,6 +523,10 @@ echo "Testing build results for debug symbols..." %changelog +* Mon Jan 04 2021 Omair Majid - 5.0.102-1 +- Update to .NET SDK 5.0.102 and Runtime 5.0.2 +- Resolves: RHBZ#1912568 + * Fri Dec 04 2020 Omair Majid - 5.0.100-1 - Update to SDK 5.0.100 and Runtime 5.0.0 - Resolves: RHBZ#1897368