Fix doc install (bug #799662)

This commit is contained in:
Orion Poplawski 2015-05-28 14:54:32 -06:00
parent 2b25bd0b11
commit 8c3c9ac2fc
1 changed files with 26 additions and 10 deletions

View File

@ -1,6 +1,8 @@
# From src/version.h:#define OCTAVE_API_VERSION # From src/version.h:#define OCTAVE_API_VERSION
%global octave_api api-v49+ %global octave_api api-v49+
%{?!_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}}
# Building docs fails on EL7 due to https://bugzilla.redhat.com/show_bug.cgi?id=1064453 # Building docs fails on EL7 due to https://bugzilla.redhat.com/show_bug.cgi?id=1064453
%if 0%{?rhel} == 7 %if 0%{?rhel} == 7
%global builddocs 0 %global builddocs 0
@ -16,7 +18,7 @@
Name: octave Name: octave
Epoch: 6 Epoch: 6
Version: 3.8.2 Version: 3.8.2
Release: 17%{?dist} Release: 18%{?dist}
Summary: A high-level language for numerical computations Summary: A high-level language for numerical computations
Group: Applications/Engineering Group: Applications/Engineering
License: GPLv3+ License: GPLv3+
@ -168,6 +170,14 @@ make OCTAVE_RELEASE="Fedora %{version}%{?rctag}-%{release}" %{?_smp_mflags}
%install %install
make install DESTDIR=%{buildroot} make install DESTDIR=%{buildroot}
# Docs - In case we didn't build them and to explicitly install pre-built docs
make -C doc install-data install-html install-info install-pdf DESTDIR=%{buildroot}
mkdir -p %{buildroot}%{_pkgdocdir}
cp -ar AUTHORS BUGS ChangeLog examples NEWS README %{buildroot}%{_pkgdocdir}/
cp -a doc/refcard/*.pdf %{buildroot}%{_pkgdocdir}/
# No info directory
rm -f %{buildroot}%{_infodir}/dir rm -f %{buildroot}%{_infodir}/dir
# Make library links # Make library links
@ -325,17 +335,20 @@ fi
%postun -p /sbin/ldconfig %postun -p /sbin/ldconfig
%files %files
%doc AUTHORS BUGS ChangeLog COPYING NEWS README %license COPYING
%{_pkgdocdir}/AUTHORS
%{_pkgdocdir}/BUGS
%{_pkgdocdir}/ChangeLog
%{_pkgdocdir}/NEWS
%{_pkgdocdir}/README
# FIXME: Create an -emacs package that has the emacs addon # FIXME: Create an -emacs package that has the emacs addon
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/octave-*.conf %config(noreplace) %{_sysconfdir}/ld.so.conf.d/octave-*.conf
%{_bindir}/octave* %{_bindir}/octave*
%{_libdir}/octave/ %{_libdir}/octave/
%{_libexecdir}/octave/ %{_libexecdir}/octave/
%if %{builddocs}
%{_mandir}/man1/octave*.1.* %{_mandir}/man1/octave*.1.*
%{_infodir}/liboctave.info* %{_infodir}/liboctave.info*
%{_infodir}/octave.info* %{_infodir}/octave.info*
%endif
%{_datadir}/appdata/%{name}.appdata.xml %{_datadir}/appdata/%{name}.appdata.xml
%{_datadir}/applications/octave.desktop %{_datadir}/applications/octave.desktop
# octave_packages is %ghost, so need to list everything else separately # octave_packages is %ghost, so need to list everything else separately
@ -352,17 +365,20 @@ fi
%{_bindir}/mkoctfile %{_bindir}/mkoctfile
%{_bindir}/mkoctfile-%{version}%{?rctag} %{_bindir}/mkoctfile-%{version}%{?rctag}
%{_includedir}/octave-%{version}%{?rctag}/ %{_includedir}/octave-%{version}%{?rctag}/
%if %{builddocs}
%{_mandir}/man1/mkoctfile.1.* %{_mandir}/man1/mkoctfile.1.*
%endif
%files doc %files doc
%doc doc/liboctave/liboctave.html doc/liboctave/liboctave.pdf %{_pkgdocdir}/examples/
%doc doc/refcard/*.pdf %{_pkgdocdir}/liboctave.html/
%doc examples/ %{_pkgdocdir}/liboctave.pdf
%{_pkgdocdir}/octave.html
%{_pkgdocdir}/octave.pdf
%{_pkgdocdir}/refcard*.pdf
%changelog %changelog
* Thu May 28 2015 Orion Poplawski <orion@cora.nwra.com> - 6:3.8.2-18
- Fix doc install (bug #799662)
* Sun May 17 2015 Orion Poplawski <orion@cora.nwra.com> - 6:3.8.2-17 * Sun May 17 2015 Orion Poplawski <orion@cora.nwra.com> - 6:3.8.2-17
- Rebuild for hdf5 1.8.15 - Rebuild for hdf5 1.8.15