Fix rpm macro install location

This commit is contained in:
Orion Poplawski 2014-02-01 12:22:03 -07:00
parent 26a4442558
commit 0636ce0a66

View File

@ -10,7 +10,7 @@
Name: octave Name: octave
Epoch: 6 Epoch: 6
Version: 3.8.0 Version: 3.8.0
Release: 4%{?dist} Release: 5%{?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+
@ -236,8 +236,8 @@ done
sed -i -e '/^# Created by Octave/d' %{buildroot}%{_datadir}/%{name}/%{version}%{?rctag}/etc/doc-cache sed -i -e '/^# Created by Octave/d' %{buildroot}%{_datadir}/%{name}/%{version}%{?rctag}/etc/doc-cache
# rpm macros # rpm macros
mkdir -p %{buildroot}%{_sysconfdir}/rpm mkdir -p %{buildroot}%{_rpmconfigdir}/macros.d
cp -p %SOURCE1 %{buildroot}%{_sysconfdir}/rpm/ cp -p %SOURCE1 %{buildroot}%{_rpmconfigdir}/macros.d/
%check %check
make check make check
@ -278,7 +278,7 @@ fi
#%{_sysconfdir}/prelink.conf.d/octave.conf #%{_sysconfdir}/prelink.conf.d/octave.conf
%files devel %files devel
%{_sysconfdir}/rpm/macros.octave %{_rpmconfigdir}/macros.d/macros.octave
%{_bindir}/mkoctfile %{_bindir}/mkoctfile
%{_bindir}/mkoctfile-%{version}%{?rctag} %{_bindir}/mkoctfile-%{version}%{?rctag}
%{_includedir}/octave-%{version}%{?rctag}/ %{_includedir}/octave-%{version}%{?rctag}/
@ -291,6 +291,9 @@ fi
%changelog %changelog
* Sat Feb 1 2014 Orion Poplawski <orion@cora.nwra.com> - 6:3.8.0-5
- Fix rpm macro install location
* Tue Jan 14 2014 Orion Poplawski <orion@cora.nwra.com> - 6:3.8.0-4 * Tue Jan 14 2014 Orion Poplawski <orion@cora.nwra.com> - 6:3.8.0-4
- Also fix base-list.h include - Also fix base-list.h include