Handle rpm macros dir for EL6

This commit is contained in:
Orion Poplawski 2015-07-29 16:38:32 -06:00
parent c74f2dac08
commit 9bf4ad0090

View File

@ -3,6 +3,8 @@
%{?!_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}} %{?!_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}}
%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
# 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
@ -276,8 +278,8 @@ cp -p doc/interpreter/macros.texi %{buildroot}%{_datadir}/%{name}/%{version}/etc
%endif %endif
# rpm macros # rpm macros
mkdir -p %{buildroot}%{_rpmconfigdir}/macros.d mkdir -p %{buildroot}%{macrosdir}
cp -p %SOURCE1 %{buildroot}%{_rpmconfigdir}/macros.d/ cp -p %SOURCE1 %{buildroot}%{macrosdir}
%check %check
@ -354,7 +356,7 @@ fi
#%{_sysconfdir}/prelink.conf.d/octave.conf #%{_sysconfdir}/prelink.conf.d/octave.conf
%files devel %files devel
%{_rpmconfigdir}/macros.d/macros.octave %{macrosdir}/macros.octave
%{_bindir}/mkoctfile %{_bindir}/mkoctfile
%{_bindir}/mkoctfile-%{version}%{?rctag} %{_bindir}/mkoctfile-%{version}%{?rctag}
%{_includedir}/octave-%{version}%{?rctag}/ %{_includedir}/octave-%{version}%{?rctag}/