Skip to content

Commit 4cab4d0

Browse files
committed
specfile: support unversioned doc dir
Use special %doc to install docs in specfile to support unversioned doc dir change on Fedora-20 (redhat bz #993703). Change-Id: I09e8ccab98006df3e50eb725dc5850bd3ed8963a
1 parent b046d2c commit 4cab4d0

File tree

2 files changed

+5
-10
lines changed

2 files changed

+5
-10
lines changed

clustershell.spec.in

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,6 @@ install -p -m 0644 doc/man/man1/nodeset.1 %{buildroot}/%{_mandir}/man1/
5656
install -p -m 0644 doc/man/man5/clush.conf.5 %{buildroot}/%{_mandir}/man5/
5757
install -p -m 0644 doc/man/man5/groups.conf.5 %{buildroot}/%{_mandir}/man5/
5858

59-
# docs and example files
60-
install -d %{buildroot}/%{_defaultdocdir}/%{name}-%{version}/examples
61-
install -p -m 0644 README ChangeLog Licence_CeCILL-C_V1-en.txt Licence_CeCILL-C_V1-fr.txt %{buildroot}/%{_defaultdocdir}/%{name}-%{version}/
62-
install -p -m 0755 doc/examples/defaults.conf-rsh %{buildroot}/%{_defaultdocdir}/%{name}-%{version}/examples/
63-
install -p -m 0755 doc/examples/*.py %{buildroot}/%{_defaultdocdir}/%{name}-%{version}/examples/
64-
cp -a doc/sphinx %{buildroot}/%{_defaultdocdir}/%{name}-%{version}/
65-
# symlink png as a workaround to make both html and sphinx_rtd_html themes work
66-
ln -sf _static/clustershell-nautilus-logo200.png %{buildroot}/%{_defaultdocdir}/%{name}-%{version}/sphinx/clustershell-nautilus-logo200.png
67-
6859
# vim addons
6960
%define vimdatadir %{_datadir}/vim/vimfiles
7061
install -d %{buildroot}/%{vimdatadir}/{ftdetect,syntax}
@@ -77,7 +68,9 @@ rm -rf %{buildroot}
7768

7869
%files
7970
%defattr(-,root,root,-)
80-
%doc %{_defaultdocdir}/%{name}-%{version}/
71+
%doc README ChangeLog Licence_CeCILL-C_V1-en.txt Licence_CeCILL-C_V1-fr.txt
72+
%doc doc/examples
73+
%doc doc/sphinx
8174
%{_mandir}/man1/clubak.1*
8275
%{_mandir}/man1/clush.1*
8376
%{_mandir}/man1/nodeset.1*

mkrpm.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,8 @@ install -p -m 0644 doc/sphinx/Makefile $TMPDIR/doc/sphinx/
102102
install -p -m 0644 doc/sphinx/*.rst $TMPDIR/doc/sphinx/
103103
install -p -m 0644 doc/sphinx/_static/*.css $TMPDIR/doc/sphinx/_static/
104104
install -p -m 0644 doc/sphinx/_static/*.png $TMPDIR/doc/sphinx/_static/
105+
# symlink png as a workaround to make both html and sphinx_rtd_html themes work
106+
ln -s _static/clustershell-nautilus-logo200.png $TMPDIR/doc/sphinx/
105107
install -p -m 0644 doc/sphinx/api/*.rst $TMPDIR/doc/sphinx/api
106108
install -p -m 0644 doc/sphinx/api/workers/*.rst $TMPDIR/doc/sphinx/api/workers/
107109
install -p -m 0644 doc/sphinx/guide/*.rst $TMPDIR/doc/sphinx/guide/

0 commit comments

Comments
 (0)