Skip to content

Commit

Permalink
Merge pull request #130 from aws/bugfix-fedora41-support
Browse files Browse the repository at this point in the history
build: Conditionally use dotnet-runtime-8/dotnet-sdk-8 on Fedora 41
  • Loading branch information
as14692 authored Jul 8, 2024
2 parents 81084ba + 90d0718 commit 4cd83a0
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 4 deletions.
4 changes: 3 additions & 1 deletion auth/kerberos/src/utf16_decode/build-using-csc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ fi
echo "dotnethome=$dotnethome"

dotnetlib=$dotnethome/shared/Microsoft.NETCore.App/$fwkver
if [ -d /usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/$fwkver/ref/net6.0/ ]; then
if [ -d /usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/$fwkver/ref/net8.0/ ]; then
dotnetlib=/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/$fwkver/ref/net8.0/
elif [ -d /usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/$fwkver/ref/net6.0/ ]; then
dotnetlib=/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/$fwkver/ref/net6.0/
fi
echo "dotnetlib=$dotnetlib"
Expand Down
15 changes: 12 additions & 3 deletions package/credentials-fetcher.spec
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,22 @@ Source0: credentials-fetcher-v.1.3.6.tar.gz

BuildRequires: cmake3 make chrpath openldap-clients grpc-devel gcc-c++ glib2-devel jsoncpp-devel
BuildRequires: openssl-devel zlib-devel protobuf-devel re2-devel krb5-devel systemd-devel
BuildRequires: systemd-rpm-macros dotnet-sdk-6.0 grpc-plugins
BuildRequires: systemd-rpm-macros grpc-plugins

%if 0%{?amzn} >= 2023
BuildRequires: aws-sdk-cpp-devel aws-sdk-cpp aws-sdk-cpp-static
%endif

Requires: bind-utils openldap openldap-clients awscli dotnet-runtime-6.0 jsoncpp

# fedora41 does not support .NET6
%if 0%{?fedora} >= 41
BuildRequires: dotnet-sdk-8.0
Requires: dotnet-runtime-8.0
%else
BuildRequires: dotnet-sdk-6.0
Requires: dotnet-runtime-6.0
%endif

Requires: bind-utils openldap openldap-clients awscli jsoncpp
# No one likes you i686
ExclusiveArch: x86_64 aarch64 s390x

Expand Down

0 comments on commit 4cd83a0

Please sign in to comment.