From 1d2756f3402a9859a0d91c3c00a24afac16ca9fd Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@cora.nwra.com>
Date: Dec 28 2013 23:22:05 +0000
Subject: Rebase pkgbuilddir patch


---

diff --git a/octave-3.4.0-pkgbuilddir.patch b/octave-3.4.0-pkgbuilddir.patch
deleted file mode 100644
index c6811dc..0000000
--- a/octave-3.4.0-pkgbuilddir.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- octave-3.4.0/scripts/pkg/pkg.m.pkgbuilddir	2011-02-08 03:00:51.000000000 -0700
-+++ octave-3.4.0/scripts/pkg/pkg.m	2011-03-18 09:31:24.670165643 -0600
-@@ -644,7 +644,14 @@
-     for i = 1:length (files)
-       tgz = files{i};
- 
--      if (exist (tgz, "file"))
-+      ## The filename pointed to an uncompressed package to begin with.
-+      if (exist (tgz, "dir"))
-+        if (tgz(1) == '/')
-+          packdir = tgz;
-+        else
-+          packdir = fullfile (pwd(), tgz);
-+        endif
-+      elseif (exist (tgz, "file"))
-         ## Create a temporary directory.
-         tmpdir = tmpnam ();
-         tmpdirs{end+1} = tmpdir;
-@@ -671,20 +678,12 @@
-         if (length (dirlist) > 3)
-           error ("bundles of packages are not allowed");
-         endif
--      endif
- 
--      ## The filename pointed to an uncompressed package to begin with.
--      if (exist (tgz, "dir"))
--        dirlist = {".", "..", tgz};
-+        ## The two first entries of dirlist are "." and "..".
-+        packdir = fullfile (tmpdir, dirlist{3});
-       endif
- 
-       if (exist (tgz, "file") || exist (tgz, "dir"))
--        ## The two first entries of dirlist are "." and "..".
--        if (exist (tgz, "file"))
--          packdir = fullfile (tmpdir, dirlist{3});
--        else
--          packdir = fullfile (pwd(), dirlist{3});
--        endif
-         packdirs{end+1} = packdir;
- 
-         ## Make sure the package contains necessary files.
diff --git a/octave-3.8.0-pkgbuilddir.patch b/octave-3.8.0-pkgbuilddir.patch
new file mode 100644
index 0000000..e91f6a3
--- /dev/null
+++ b/octave-3.8.0-pkgbuilddir.patch
@@ -0,0 +1,41 @@
+diff -up octave-3.8.0-rc2/scripts/pkg/private/install.m.pkgbuilddir octave-3.8.0-rc2/scripts/pkg/private/install.m
+--- octave-3.8.0-rc2/scripts/pkg/private/install.m.pkgbuilddir	2013-12-21 12:31:40.000000000 -0700
++++ octave-3.8.0-rc2/scripts/pkg/private/install.m	2013-12-28 16:12:03.283207320 -0700
+@@ -62,7 +62,10 @@ function install (files, handle_deps, au
+     for i = 1:length (files)
+       tgz = files{i};
+ 
+-      if (exist (tgz, "file"))
++      ## The filename pointed to an uncompressed package to begin with.
++      if (exist (tgz, "dir"))
++        dirlist = {".", "..", tgz};
++      elseif (exist (tgz, "file"))
+         ## Create a temporary directory.
+         tmpdir = tmpnam ();
+         tmpdirs{end+1} = tmpdir;
+@@ -91,17 +94,16 @@ function install (files, handle_deps, au
+         endif
+       endif
+ 
+-      ## The filename pointed to an uncompressed package to begin with.
+-      if (exist (tgz, "dir"))
+-        dirlist = {".", "..", tgz};
+-      endif
+-
+-      if (exist (tgz, "file") || exist (tgz, "dir"))
++      if (exist (tgz, "file"))
+         ## The two first entries of dirlist are "." and "..".
+-        if (exist (tgz, "file"))
+-          packdir = fullfile (tmpdir, dirlist{3});
++        if (exist (tgz, "dir"))
++          if (tgz(1) == '/')
++            packdir = tgz;
++          else
++            packdir = fullfile (pwd (), dirlist{3});
++          endif
+         else
+-          packdir = fullfile (pwd (), dirlist{3});
++          packdir = fullfile (tmpdir, dirlist{3});
+         endif
+         packdirs{end+1} = packdir;
+ 
diff --git a/octave.spec b/octave.spec
index a11890a..288658a 100644
--- a/octave.spec
+++ b/octave.spec
@@ -10,7 +10,7 @@
 Name:           octave
 Epoch:          6
 Version:        3.8.0
-Release:        0.3.rc2%{?dist}
+Release:        0.4.rc2%{?dist}
 Summary:        A high-level language for numerical computations
 Group:          Applications/Engineering
 License:        GPLv3+
@@ -23,6 +23,9 @@ Source0:        ftp://alpha.gnu.org/gnu/octave/octave-%{version}%{rctag}.tar.gz
 %endif
 # RPM macros for helping to build Octave packages
 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
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -109,6 +112,7 @@ This package contains documentation for Octave.
 
 %prep
 %setup -q -n %{name}-%{version}%{?rctag}
+%patch0 -p1 -b .pkgbuilddir
 
 # Check permissions
 find -name *.cc -exec chmod 644 {} \;
@@ -286,6 +290,9 @@ fi
 
 
 %changelog
+* Sat Dec 28 2013 Orion Poplawski <orion@cora.nwra.com> - 6:3.8.0-0.4.rc2
+- Rebase pkgbuilddir patch
+
 * Fri Dec 27 2013 Orion Poplawski <orion@cora.nwra.com> - 6:3.8.0-0.3.rc2
 - Rebuild for hdf5 1.8.12