Author: alexlan
Update of /cvs/pkgs/rpms/octave/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8766
Modified Files:
octave.spec
Log Message:
* Fri Feb 26 2010 Michal Schmidt <mschmidt(a)redhat.com> 6:3.2.4-2
- Fix the prelink workaround to work with any version.
- Use _sysconfdir macro instead of /etc.
Index: octave.spec
===================================================================
RCS file: /cvs/pkgs/rpms/octave/devel/octave.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- octave.spec 28 Jan 2010 13:06:39 -0000 1.97
+++ octave.spec 28 Feb 2010 23:08:24 -0000 1.98
@@ -3,13 +3,12 @@
Name: octave
Version: 3.2.4
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A high-level language for numerical computations
Epoch: 6
Group: Applications/Engineering
License: GPLv3+
Source0:
ftp://ftp.octave.org/pub/octave/octave-%{version}.tar.bz2
-Source1: octave.conf
URL:
http://www.octave.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -95,8 +94,8 @@ make install DESTDIR=%{buildroot}
rm -f %{buildroot}%{_infodir}/dir
# Make library links
-mkdir -p %{buildroot}/etc/ld.so.conf.d
-echo "%{_libdir}/octave-%{version}" >
%{buildroot}/etc/ld.so.conf.d/octave-%{_arch}.conf
+mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d
+echo "%{_libdir}/octave-%{version}" >
%{buildroot}%{_sysconfdir}/ld.so.conf.d/octave-%{_arch}.conf
# Remove RPM_BUILD_ROOT from ls-R files
perl -pi -e "s,%{buildroot},," %{buildroot}%{_libexecdir}/%{name}/ls-R
@@ -129,7 +128,7 @@ cp -a doc/interpreter/*.pdf doc/interpre
# work-around broken pre-linking (bug 524493)
install -d %{buildroot}%{_sysconfdir}/prelink.conf.d
-install -p -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/prelink.conf.d/
+echo "-b %{_bindir}/octave-%{version}" >
%{buildroot}%{_sysconfdir}/prelink.conf.d/octave.conf
%check
make check
@@ -154,7 +153,7 @@ fi
%doc COPYING NEWS* PROJECTS README README.Linux README.kpathsea ROADMAP
%doc SENDING-PATCHES emacs/
# FIXME: Create an -emacs package that has the emacs addon
-%config /etc/ld.so.conf.d/octave-*.conf
+%config %{_sysconfdir}/ld.so.conf.d/octave-*.conf
%{_bindir}/octave*
%{_libdir}/octave-%{version}/
%{_libexecdir}/octave/
@@ -185,6 +184,10 @@ fi
%changelog
+* Fri Feb 26 2010 Michal Schmidt <mschmidt(a)redhat.com> 6:3.2.4-2
+- Fix the prelink workaround to work with any version.
+- Use _sysconfdir macro instead of /etc.
+
* Thu Jan 28 2010 Jussi Lehtola <jussilehtola(a)fedoraproject.org> - 6:3.2.4-1
- Update to 3.2.4 with a few rpmlint fixes.