From 9c788e9f2ea82f4c2ee32dd81d8bf418c2c75617 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: May 24 2017 07:56:26 +0000 Subject: import rh-dotnetcore10-dotnetcore-1.0.3-3.el7 --- diff --git a/.gitignore b/.gitignore index 46bbb11..5fac05d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/dotnet-dev-rhel-x64.1.0.0-preview2-003131.tar.gz -SOURCES/manpages.tar.gz +SOURCES/dotnet-dev-rhel-x64.1.0.0-preview2-003156.tar.gz +SOURCES/manpages.1.0.0-preview2-003156.tar.gz diff --git a/.rh-dotnetcore10-dotnetcore.metadata b/.rh-dotnetcore10-dotnetcore.metadata index 4bd9ce5..f159391 100644 --- a/.rh-dotnetcore10-dotnetcore.metadata +++ b/.rh-dotnetcore10-dotnetcore.metadata @@ -1,2 +1,2 @@ -f72856a8bf786ccfae112c9fb48536b72d2fde4c SOURCES/dotnet-dev-rhel-x64.1.0.0-preview2-003131.tar.gz -98ddfed1b8db417e05e73c048064540af7a28f23 SOURCES/manpages.tar.gz +27c3537ddd8779b7b02a9ddaa53fd028c0fbaaee SOURCES/dotnet-dev-rhel-x64.1.0.0-preview2-003156.tar.gz +fcae4bfef5e45e2a180b866b11344d2175564359 SOURCES/manpages.1.0.0-preview2-003156.tar.gz diff --git a/SOURCES/LICENSE b/SOURCES/LICENSE new file mode 100644 index 0000000..cd10d69 --- /dev/null +++ b/SOURCES/LICENSE @@ -0,0 +1,22 @@ +The MIT License (MIT) + +Copyright (c) 2015 .NET Foundation + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + diff --git a/SPECS/dotnetcore.spec b/SPECS/dotnetcore.spec index 5730eaa..f27e84d 100644 --- a/SPECS/dotnetcore.spec +++ b/SPECS/dotnetcore.spec @@ -9,8 +9,8 @@ %undefine _include_minidebuginfo %global _find_debuginfo_dwz_opts %{nil} -%global cli_version 1.0.0-preview2-003131 -%global runtime_version 1.0.1 +%global cli_version 1.0.0-preview2-003156 +%global runtime_version 1.0.3 # Do not provide internal .so as standard libraries %global __provides_exclude_from ^(%{_libdir}/dotnetcore/.*\\.so|%{_libdir}/dotnetcore/sdk/%{cli_version}/.*\\.so|%{_libdir}/dotnetcore/shared/Microsoft.NETCore.App/%{runtime_version}/.*)$ @@ -22,20 +22,18 @@ %global __requires_exclude ^(libmscordaccore.so\\(\\)\\(64bit\\)|libmscordaccore.so\\(V1.0\\)\\(64bit\\))$ Name: %{?scl_prefix}dotnetcore -Version: 1.0.1 -Release: 2%{?dist} +Version: 1.0.3 +Release: 3%{?dist} Summary: .NET Core 1.0 Group: Development/Languages -License: Apache 2.0 +License: ASL 2.0 and MIT URL: http://www.microsoft.com/net -# Original builds available from: -# Source0: https://dotnetcli.blob.core.windows.net/dotnet/beta/Binaries/%%{cli_version}/dotnet-dev-rhel-x64.%%{cli_version}.tar.gz - # Built on a developer's laptop, from source Source0: dotnet-dev-rhel-x64.%{cli_version}.tar.gz -Source1: manpages.tar.gz +Source1: manpages.%{cli_version}.tar.gz +Source2: https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0-preview2/LICENSE Requires: %{?scl_prefix}libcurl%{?_isa} Requires: %{?scl_prefix}libuv%{?_isa} @@ -49,7 +47,13 @@ Requires: %{?scl_prefix}libuv%{?_isa} %setup -q -c -n %{pkg_name}-%{version} tar xvf %{SOURCE1} +# Upstream build produces a bogus LICENSE +# https://github.com/dotnet/core-setup/issues/676 +rm LICENSE.txt +cp %{SOURCE2} LICENSE + %build + # Nothing to build; this is already a binary in a tarball # Remove things with dependencies that are not ready yet @@ -75,12 +79,23 @@ mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1/ find -type f -iname 'dotnet*\.1' -exec cp {} $RPM_BUILD_ROOT/%{_mandir}/man1/ \; %files +%doc LICENSE %doc ThirdPartyNotices.txt %{_libdir}/%{pkg_name} %{_bindir}/* %{_mandir}/man1/dotnet*.1* %changelog +* Tue Dec 06 2016 Omair Majid - 1.0.3-3 +- Update to latest build + +* Mon Dec 05 2016 Omair Majid - 1.0.3-2 +- Remove .cs files from nuget archive +- Resolves: RHBZ 1384151 + +* Sat Nov 26 2016 Omair Majid - 1.0.3-1 +- Update to 1.0.3 + * Tue Sep 20 2016 Omair Majid - 1.0.1-2 - Add man pages