Really fix config.h include
This commit is contained in:
parent
a7fc062a47
commit
a3e449d179
@ -1,12 +0,0 @@
|
||||
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"
|
||||
|
@ -10,7 +10,7 @@
|
||||
Name: octave
|
||||
Epoch: 6
|
||||
Version: 3.8.0
|
||||
Release: 2%{?dist}
|
||||
Release: 3%{?dist}
|
||||
Summary: A high-level language for numerical computations
|
||||
Group: Applications/Engineering
|
||||
License: GPLv3+
|
||||
@ -26,8 +26,6 @@ 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)
|
||||
|
||||
@ -115,6 +113,7 @@ This package contains documentation for Octave.
|
||||
%prep
|
||||
%setup -q -n %{name}-%{version}%{?rctag}
|
||||
%patch0 -p1 -b .pkgbuilddir
|
||||
find -name \*.h -o -name \*.cc | xargs sed -i -e 's/<config.h>/"config.h"/'
|
||||
|
||||
# Check permissions
|
||||
find -name *.cc -exec chmod 644 {} \;
|
||||
@ -292,6 +291,9 @@ fi
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Jan 9 2014 Orion Poplawski <orion@cora.nwra.com> - 6:3.8.0-3
|
||||
- Really fix config.h include
|
||||
|
||||
* Wed Jan 8 2014 Orion Poplawski <orion@cora.nwra.com> - 6:3.8.0-2
|
||||
- Fix config.h include
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user