commit 5a8e2ead459e51844fe49734c913e25b84030748
Author: Jan Rękorajski <[email protected]>
Date: Fri May 26 21:05:31 2017 +0200
- octave include and lib dirs must be patched for mkoctfile to be built
correctly
- rel 2
octave.spec | 12 +++++-------
octdirs.patch | 20 ++++++++++++++++++++
2 files changed, 25 insertions(+), 7 deletions(-)
---
diff --git a/octave.spec b/octave.spec
index 117924f..878ea7e 100644
--- a/octave.spec
+++ b/octave.spec
@@ -23,7 +23,7 @@ Summary(sv.UTF-8): GNU Octave - ett högninvåspråk för
numeriska beräkningar
Summary(zh_CN.UTF-8): GNU Octave - 用于数字计算的高级语言。
Name: octave
Version: 4.2.1
-Release: 1
+Release: 2
Epoch: 2
License: GPL v3+
Group: Applications/Math
@@ -33,6 +33,7 @@ Source1: %{name}.desktop
Patch0: %{name}-info.patch
Patch1: %{name}-build.patch
Patch2: %{name}-suitesparse.patch
+Patch3: octdirs.patch
URL: http://www.octave.org/
BuildRequires: AMD-devel >= 2.4.0
BuildRequires: CAMD-devel
@@ -332,6 +333,7 @@ Pliki nagłówkowe i dodatkowa dokumentacja Octave.
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%build
%{__libtoolize}
@@ -365,17 +367,13 @@ export CLASSPATH=.
--enable-shared \
--disable-silent-rules
-%{__make} \
- octincludedir=%{_includedir}/octave \
- octlibdir=%{_libdir}
+%{__make}
%install
rm -rf $RPM_BUILD_ROOT
%{__make} install \
- DESTDIR=$RPM_BUILD_ROOT \
- octincludedir=%{_includedir}/octave \
- octlibdir=%{_libdir}
+ DESTDIR=$RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_desktopdir}
cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
diff --git a/octdirs.patch b/octdirs.patch
new file mode 100644
index 0000000..23808fe
--- /dev/null
+++ b/octdirs.patch
@@ -0,0 +1,20 @@
+--- octave-4.2.1/configure.ac.orig 2017-02-22 19:03:04.000000000 +0100
++++ octave-4.2.1/configure.ac 2017-05-26 20:32:53.218210980 +0200
+@@ -87,7 +87,7 @@
+
+ ## Where to install and expect libraries like liboctave.a, liboctinterp.a,
+ ## and other architecture-dependent data.
+-OCTAVE_SET_DEFAULT([octlibdir], '${libdir}/octave/${version}')
++OCTAVE_SET_DEFAULT([octlibdir], '${libdir}')
+
+ ## Where to put executables to be run by Octave rather than
+ ## the user. This path usually includes the Octave version
+@@ -128,7 +128,7 @@
+ '${libdir}/octave/${version}/site/oct/${canonical_host_type}')
+
+ ## Where to install Octave's include files.
+-OCTAVE_SET_DEFAULT([octincludedir], '${includedir}/octave-${version}/octave')
++OCTAVE_SET_DEFAULT([octincludedir], '${includedir}/octave')
+
+ ## Where to install the function file distributed with
+ ## Octave. This includes the Octave version, so that the
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/octave.git/commitdiff/5a8e2ead459e51844fe49734c913e25b84030748
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
