[octave/f18] Add patch to ignore deps when building packages for now (bug 733615)
Orion Poplawski
orion at fedoraproject.org
Sat Dec 22 04:14:54 UTC 2012
commit 04394b46f46d96c929fed93a3e7646469cdcbc66
Author: Orion Poplawski <orion at cora.nwra.com>
Date: Fri Dec 21 21:11:43 2012 -0700
Add patch to ignore deps when building packages for now (bug 733615)
octave-pkgbuilddeps.patch | 17 +++++++++++++++++
octave.spec | 8 +++++++-
2 files changed, 24 insertions(+), 1 deletions(-)
---
diff --git a/octave-pkgbuilddeps.patch b/octave-pkgbuilddeps.patch
new file mode 100644
index 0000000..582436c
--- /dev/null
+++ b/octave-pkgbuilddeps.patch
@@ -0,0 +1,17 @@
+--- octave-3.6.4-rc0/scripts/pkg/pkg.m.deps 2012-12-21 20:44:11.309702885 -0700
++++ octave-3.6.4-rc0/scripts/pkg/pkg.m 2012-12-21 20:51:19.529914112 -0700
+@@ -633,12 +633,12 @@
+ endif
+ files(1) = [];
+ buildlist = fullfile (builddir, "octave_packages");
+- install (files, handle_deps, autoload, installdir, installdir, verbose,
++ install (files, false, autoload, installdir, installdir, verbose,
+ buildlist, "", false);
+ unwind_protect
+ repackage (builddir, buildlist);
+ unwind_protect_cleanup
+- unload_packages ({"all"}, handle_deps, buildlist, "");
++ unload_packages ({"all"}, false, buildlist, "");
+ if (exist (installdir, "dir"))
+ rm_rf (installdir);
+ endif
diff --git a/octave.spec b/octave.spec
index 8e0942a..be629d7 100644
--- a/octave.spec
+++ b/octave.spec
@@ -9,7 +9,7 @@
Name: octave
Version: 3.6.3
-Release: 2%{?dist}.1
+Release: 2%{?dist}.2
Summary: A high-level language for numerical computations
Epoch: 6
Group: Applications/Engineering
@@ -21,6 +21,8 @@ Source0: ftp://alpha.gnu.org/gnu/octave/octave-%{version}%{rctag}.tar.bz2
%endif
# RPM macros for helping to build Octave packages
Source1: macros.octave
+# Ignore deps when doing a pkg build for now
+Patch1: octave-pkgbuilddeps.patch
# https://savannah.gnu.org/bugs/index.php?32839
# Fix building packages from directories
Patch2: octave-3.4.0-pkgbuilddir.patch
@@ -85,6 +87,7 @@ This package contains documentation for Octave.
%prep
%setup -q -n %{name}-%{version}%{?rctag}
+%patch1 -p1 -b .pkgbuilddeps
%patch2 -p1 -b .pkgbuilddir
%patch3 -p1 -b .sparse
@@ -258,6 +261,9 @@ fi
%changelog
+* Fri Dec 21 2012 Orion Poplawski <orion at cora.nwra.com> - 6:3.6.3-2.2
+- Add patch to ignore deps when building packages for now (bug 733615)
+
* Mon Dec 3 2012 Susi Lehtola <jussilehtola at fedoraproject.org> - 6:3.6.3-2.1
- Rebuild against newer fltk in Fedora 18.
More information about the scm-commits
mailing list