[octave] Fix config.h include

Orion Poplawski orion at fedoraproject.org
Wed Jan 8 21:13:10 UTC 2014


commit a7fc062a474e47f33df384d2015094117e50f38d
Author: Orion Poplawski <orion at nwra.com>
Date:   Wed Jan 8 14:13:17 2014 -0700

    Fix config.h include

 octave-config.patch |   12 ++++++++++++
 octave.spec         |    7 ++++++-
 2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/octave-config.patch b/octave-config.patch
new file mode 100644
index 0000000..59534a6
--- /dev/null
+++ b/octave-config.patch
@@ -0,0 +1,12 @@
+diff -up octave-3.8.0/libinterp/corefcn/oct.h.config octave-3.8.0/libinterp/corefcn/oct.h
+--- octave-3.8.0/libinterp/corefcn/oct.h.config	2013-12-27 14:57:41.000000000 -0700
++++ octave-3.8.0/libinterp/corefcn/oct.h	2014-01-08 14:10:27.816397648 -0700
+@@ -28,7 +28,7 @@ along with Octave; see the file COPYING.
+ // config.h needs to be first because it includes #defines that can */
+ // affect other header files.
+ 
+-#include <config.h>
++#include "config.h"
+ 
+ #include "Matrix.h"
+ 
diff --git a/octave.spec b/octave.spec
index 03e625e..a1ca38f 100644
--- a/octave.spec
+++ b/octave.spec
@@ -10,7 +10,7 @@
 Name:           octave
 Epoch:          6
 Version:        3.8.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A high-level language for numerical computations
 Group:          Applications/Engineering
 License:        GPLv3+
@@ -26,6 +26,8 @@ Source1:        macros.octave
 # Fix to allow pkg build to use a directory
 # https://savannah.gnu.org/bugs/?func=detailitem&item_id=32839
 Patch0:         octave-3.8.0-pkgbuilddir.patch
+# Fix config.h include
+Patch1:         octave-config.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -290,6 +292,9 @@ fi
 
 
 %changelog
+* Wed Jan 8 2014 Orion Poplawski <orion at cora.nwra.com> - 6:3.8.0-2
+- Fix config.h include
+
 * Sat Dec 28 2013 Orion Poplawski <orion at cora.nwra.com> - 6:3.8.0-1
 - Update to 3.8.0 final
 


More information about the scm-commits mailing list