At the prompting of Alex Tumanov and per suggestion from Red Hat, when
using install_in_opt, put the %doc files in there as well (i.e., move docdir to be in /opt as well). This commit was SVN r15387.
Этот коммит содержится в:
родитель
cdb56d65e2
Коммит
7dee2fc4e8
10
contrib/dist/linux/openmpi.spec
поставляемый
10
contrib/dist/linux/openmpi.spec
поставляемый
@ -180,6 +180,11 @@
|
|||||||
%define _includedir /opt/%{name}/%{version}/include
|
%define _includedir /opt/%{name}/%{version}/include
|
||||||
%define _mandir /opt/%{name}/%{version}/man
|
%define _mandir /opt/%{name}/%{version}/man
|
||||||
%define _pkgdatadir /opt/%{name}/%{version}/share/%{name}
|
%define _pkgdatadir /opt/%{name}/%{version}/share/%{name}
|
||||||
|
# Per advice from Doug Ledford at Red Hat, docdir is supposed to be in
|
||||||
|
# a fixed location. But if you're installing a package in /opt, all
|
||||||
|
# bets are off. So feel free to install it anywhere in your tree. He
|
||||||
|
# suggests $prefix/doc.
|
||||||
|
%define _defaultdocdir /opt/%{name}/%{version}/doc
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if !%{build_debuginfo_rpm}
|
%if !%{build_debuginfo_rpm}
|
||||||
@ -682,6 +687,11 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
|
|||||||
#
|
#
|
||||||
#############################################################################
|
#############################################################################
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jul 12 2007 Jeff Squyres <jsquyres@cisco.com>
|
||||||
|
- Change default doc location when using install_in_opt. Thanks to
|
||||||
|
Alex Tumanov for pointing this out and to Doug Ledford for
|
||||||
|
suggestions where to put docdir in this case.
|
||||||
|
|
||||||
* Thu May 3 2007 Jeff Squyres <jsquyres@cisco.com>
|
* Thu May 3 2007 Jeff Squyres <jsquyres@cisco.com>
|
||||||
- Ensure to move out of $RPM_BUILD_ROOT before deleting it in % clean.
|
- Ensure to move out of $RPM_BUILD_ROOT before deleting it in % clean.
|
||||||
- Remove a debugging "echo" that somehow got left in there
|
- Remove a debugging "echo" that somehow got left in there
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user