diff --git a/.gitignore b/.gitignore index 41a17ff..46bbb11 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -SOURCES/dotnet-dev-rhel-x64.1.0.0-preview2-003121.tar.gz +SOURCES/dotnet-dev-rhel-x64.1.0.0-preview2-003131.tar.gz +SOURCES/manpages.tar.gz diff --git a/.rh-dotnetcore10-dotnetcore.metadata b/.rh-dotnetcore10-dotnetcore.metadata index 28d9390..4bd9ce5 100644 --- a/.rh-dotnetcore10-dotnetcore.metadata +++ b/.rh-dotnetcore10-dotnetcore.metadata @@ -1 +1,2 @@ -4a55d0c27b638a3beaa91e95db1a4a374382aa17 SOURCES/dotnet-dev-rhel-x64.1.0.0-preview2-003121.tar.gz +f72856a8bf786ccfae112c9fb48536b72d2fde4c SOURCES/dotnet-dev-rhel-x64.1.0.0-preview2-003131.tar.gz +98ddfed1b8db417e05e73c048064540af7a28f23 SOURCES/manpages.tar.gz diff --git a/SPECS/dotnetcore.spec b/SPECS/dotnetcore.spec index e82c79b..5730eaa 100644 --- a/SPECS/dotnetcore.spec +++ b/SPECS/dotnetcore.spec @@ -5,8 +5,12 @@ # dont abort finding-debuginfo because of that %undefine _missing_build_ids_terminate_build -%global cli_version 1.0.0-preview2-003121 -%global runtime_version 1.0.0 +# lldb doesn't like our nice debug information +%undefine _include_minidebuginfo +%global _find_debuginfo_dwz_opts %{nil} + +%global cli_version 1.0.0-preview2-003131 +%global runtime_version 1.0.1 # 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}/.*)$ @@ -18,8 +22,8 @@ %global __requires_exclude ^(libmscordaccore.so\\(\\)\\(64bit\\)|libmscordaccore.so\\(V1.0\\)\\(64bit\\))$ Name: %{?scl_prefix}dotnetcore -Version: 1.0.0 -Release: 7%{?dist} +Version: 1.0.1 +Release: 2%{?dist} Summary: .NET Core 1.0 Group: Development/Languages @@ -31,9 +35,10 @@ URL: http://www.microsoft.com/net # Built on a developer's laptop, from source Source0: dotnet-dev-rhel-x64.%{cli_version}.tar.gz +Source1: manpages.tar.gz Requires: %{?scl_prefix}libcurl%{?_isa} -Requires: %{?scl_prefix}libuv%{?_isa} +Requires: %{?scl_prefix}libuv%{?_isa} %{?scl:Requires: %scl_runtime} @@ -42,6 +47,7 @@ Requires: %{?scl_prefix}libuv%{?_isa} %prep %setup -q -c -n %{pkg_name}-%{version} +tar xvf %{SOURCE1} %build # Nothing to build; this is already a binary in a tarball @@ -65,12 +71,24 @@ cp -a dotnet sdk host shared $RPM_BUILD_ROOT/%{_libdir}/%{pkg_name}/ mkdir -p $RPM_BUILD_ROOT/%{_bindir} ln -s %{_libdir}/%{pkg_name}/dotnet $RPM_BUILD_ROOT/%{_bindir}/ +mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1/ +find -type f -iname 'dotnet*\.1' -exec cp {} $RPM_BUILD_ROOT/%{_mandir}/man1/ \; + %files %doc ThirdPartyNotices.txt %{_libdir}/%{pkg_name} %{_bindir}/* +%{_mandir}/man1/dotnet*.1* %changelog +* Tue Sep 20 2016 Omair Majid - 1.0.1-2 +- Add man pages + +* Mon Sep 19 2016 Omair Majid - 1.0.1-1 +- Update to 1.0.1 +- Resolves: RHBZ 1361254 +- Resolves: RHBZ 1372033 + * Wed Jun 22 2016 Omair Majid - 1.0.0-7 - Update to newer build. - Fixes https://github.com/NuGet/Home/issues/3010