diff --git a/.gitignore b/.gitignore index 0430471..b6c93ce 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/dotnet-2.1.301.tar.gz +SOURCES/dotnet-2.1.2.tar.gz diff --git a/.rh-dotnet21-dotnet.metadata b/.rh-dotnet21-dotnet.metadata index a997bea..5793b7c 100644 --- a/.rh-dotnet21-dotnet.metadata +++ b/.rh-dotnet21-dotnet.metadata @@ -1 +1 @@ -4178b60d7648e05f4c6d7ddee24d2cb91279988f SOURCES/dotnet-2.1.301.tar.gz +3f5004e95d8f06596d3e67c5a72a7610d67a7ef4 SOURCES/dotnet-2.1.2.tar.gz diff --git a/SPECS/dotnet.spec b/SPECS/dotnet.spec index e8dcd95..2de24b5 100644 --- a/SPECS/dotnet.spec +++ b/SPECS/dotnet.spec @@ -1,3 +1,11 @@ +# Do *NOT* try and build this locally (using rhpkg or any other tool) if one of +# the parent directories is a git repository. This build uses git-apply during +# the upstream build process. git-apply will simply skip all patches since none +# of the patches affect the build subdirectory. +# +# Use `rhpkg local --builddir ../dotnet-build` or something similar to work +# around this. + %{?scl:%scl_package dotnet} %{!?scl:%global pkg_name %{name}} @@ -22,12 +30,12 @@ # on system libcurl package. We require the %%{?scl_prefix}libcurl package %global __requires_exclude ^(%{privlibs}|libcurl)\\.so -%global sdk_version 2.1.301 -%global runtime_version 2.1.1 +%global sdk_version 2.1.302 +%global runtime_version 2.1.2 Name: %{?scl_prefix}dotnet Version: %{sdk_version} -Release: 5%{?dist} +Release: 1%{?dist} Group: Development/Languages Summary: .NET Core CLI tools and runtime License: MIT and ASL 2.0 and BSD @@ -40,7 +48,7 @@ URL: https://github.com/dotnet/ # - ./build-source-tarball.sh dotnet-%%{sdk_version} # - tar cvzf dotnet-%%{sdk_version}.tar.gz dotnet-%%{sdk_version} -Source0: dotnet-%{sdk_version}.tar.gz +Source0: dotnet-%{runtime_version}.tar.gz Source1: check-debug-symbols.py # https://github.com/dotnet/cli/pull/9365 @@ -152,7 +160,7 @@ It particularly focuses on creating console applications, web applications and micro-services. %prep -%setup -q -n %{pkg_name}-%{version} +%setup -q -n %{pkg_name}-%{runtime_version} # Disable warnings sed -i 's|skiptests|skiptests ignorewarnings|' repos/coreclr.proj @@ -243,6 +251,9 @@ echo "Testing build results for debug symbols..." %{_libdir}/%{pkg_name}/sdk/%{sdk_version} %changelog +* Wed Jul 4 2018 Omair Majid - 2.1.302-1 +- Update to .NET Core Runtime 2.1.2 and SDK 2.1.302 + * Wed Jun 20 2018 Omair Majid - 2.1.301-5 - Add sdk-2.1.3xx subpackage