| |
@@ -14,11 +14,11 @@
|
| |
|
| |
Name: charliecloud
|
| |
Version: 0.9.10
|
| |
- Release: 10%{?dist}
|
| |
+ Release: 11%{?dist}
|
| |
Summary: Lightweight user-defined software stacks for high-performance computing
|
| |
License: ASL 2.0
|
| |
URL: https://hpc.github.io/%{name}/
|
| |
- Source0: https://github.com/hpc/%{name}/archive/v%{version}.tar.gz
|
| |
+ Source0: https://github.com/hpc/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
|
| |
BuildRequires: gcc rsync
|
| |
%if 0%{?el7}
|
| |
BuildRequires: /usr/bin/python2
|
| |
@@ -40,7 +40,8 @@
|
| |
%package doc
|
| |
Summary: %{name} html documentation
|
| |
License: BSD and MIT and ASL 2.0
|
| |
- Requires: %{name}%{?_isa} = %{version}-%{release}
|
| |
+ BuildArch: noarch
|
| |
+ Obsoletes: %{name} < %{version}
|
| |
%if 0%{?el7}
|
| |
BuildRequires: python-sphinx python-sphinx_rtd_theme
|
| |
%else
|
| |
@@ -96,9 +97,9 @@
|
| |
%{__rm} -rf %{buildroot}%{_docdir}/%{name}/html/_static/fonts
|
| |
%{__rm} -rf %{buildroot}%{_docdir}/%{name}/html/_static/js
|
| |
%if 0%{?el7}
|
| |
- sphinxdir=%{_prefix}/lib/python2.7/site-packages/sphinx_rtd_theme/static
|
| |
+ sphinxdir=%{python_sitelib}/sphinx_rtd_theme/static
|
| |
%else
|
| |
- sphinxdir=%{_prefix}/lib/python3.6/site-packages/sphinx_rtd_theme/static
|
| |
+ sphinxdir=%{python3_sitelib}/sphinx_rtd_theme/static
|
| |
%endif
|
| |
ln -s "${sphinxdir}/css" %{buildroot}%{_docdir}/%{name}/html/_static/css
|
| |
ln -s "${sphinxdir}/fonts" %{buildroot}%{_docdir}/%{name}/html/_static/fonts
|
| |
@@ -126,6 +127,10 @@
|
| |
%{_pkgdocdir}/html
|
| |
|
| |
%changelog
|
| |
+ * Mon Aug 19 2019 Dave love <loveshack@fedoraproject.org> - 0.9.10-11
|
| |
+ - Use canonical form for Source0
|
| |
+ - remove main package dependency from doc, and make it noarch
|
| |
+
|
| |
* Fri Aug 02 2019 <jogas@lanl.gov> 0.9.10-10
|
| |
- Tidy comments; fix typo
|
| |
* Thu Jul 25 2019 <jogas@lanl.gov> 0.9.10-9
|
| |
Extends https://src.fedoraproject.org/rpms/charliecloud/pull-request/1.