Add patch to ignore deps when building packages for now (bug 733615)

This commit is contained in:
Orion Poplawski 2012-12-21 21:11:43 -07:00
parent 61b8aad6dc
commit 77aff487ff
2 changed files with 24 additions and 1 deletions

17
octave-pkgbuilddeps.patch Normal file
View File

@ -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

View File

@ -9,7 +9,7 @@
Name: octave
Version: 3.6.4
Release: 0.2.rc0%{?dist}
Release: 0.3.rc0%{?dist}
Summary: A high-level language for numerical computations
Epoch: 6
Group: Applications/Engineering
@ -22,6 +22,8 @@ Source0: ftp://alpha.gnu.org/gnu/octave/octave-%{version}%{rctag}.tar.bz2
# RPM macros for helping to build Octave packages
Source1: macros.octave
Patch0: octave-gets.patch
# 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}
%patch0 -p1 -b .gets
%patch1 -p1 -b .pkgbuilddeps
%patch2 -p1 -b .pkgbuilddir
# Check permissions
@ -257,6 +260,9 @@ fi
%changelog
* Fri Dec 21 2012 Orion Poplawski <orion@cora.nwra.com> - 6:3.6.4-0.3.rc0
- Add patch to ignore deps when building packages for now (bug 733615)
* Wed Dec 05 2012 Orion Poplawski <orion@cora.nwra.com> - 6:3.6.4-0.2.rc0
- Restore gets patch
- Rebuild for hdf5 1.8.10