Compare commits
4 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
0ae14078e0 | ||
|
6dad512419 | ||
|
462683cbbe | ||
|
7509ddd86e |
@ -1,7 +1,7 @@
|
||||
# Octave packaging macros
|
||||
|
||||
# Octave binary API provided
|
||||
%octave_api %(octave-config -p API_VERSION || echo 0)}
|
||||
%octave_api %(octave-config -p API_VERSION || echo 0)
|
||||
|
||||
# Octave Package Directories
|
||||
%octshareprefix %{_datadir}/octave
|
||||
@ -35,9 +35,8 @@ echo "endfunction" >> %{buildroot}%{octpkgdir}/packinfo/on_uninstall.m \
|
||||
# preun script - we need to remove our uninstall protection and perhaps
|
||||
# run the package's own uninstall script.
|
||||
%octave_pkg_preun \
|
||||
rm %{octpkgdir}/packinfo/on_uninstall.m \
|
||||
if [ -e %{octpkgdir}/packinfo/on_uninstall.m.orig ]; then \
|
||||
mv %{octpkgdir}/packinfo/on_uninstall.m.orig %{octpkgdir}/packinfo/on_uninstall.m \
|
||||
cp -f %{octpkgdir}/packinfo/on_uninstall.m.orig %{octpkgdir}/packinfo/on_uninstall.m \
|
||||
cd %{octpkgdir}/packinfo \
|
||||
%octave_cmd l=pkg('list');on_uninstall(l{cellfun(@(x)strcmp(x.name,'%{octpkg}'),l)}); \
|
||||
fi \
|
||||
|
11
octave-3.4.2-curl.patch
Normal file
11
octave-3.4.2-curl.patch
Normal file
@ -0,0 +1,11 @@
|
||||
diff -up octave-3.4.2/src/DLD-FUNCTIONS/urlwrite.cc.curl octave-3.4.2/src/DLD-FUNCTIONS/urlwrite.cc
|
||||
--- octave-3.4.2/src/DLD-FUNCTIONS/urlwrite.cc.curl 2011-06-09 20:22:32.000000000 +0300
|
||||
+++ octave-3.4.2/src/DLD-FUNCTIONS/urlwrite.cc 2011-08-06 11:54:58.331640323 +0300
|
||||
@@ -52,7 +52,6 @@ along with Octave; see the file COPYING.
|
||||
|
||||
#include <curl/curl.h>
|
||||
#include <curl/curlver.h>
|
||||
-#include <curl/types.h>
|
||||
#include <curl/easy.h>
|
||||
|
||||
static int
|
12
octave-tar.patch
Normal file
12
octave-tar.patch
Normal file
@ -0,0 +1,12 @@
|
||||
diff -r d1db86336a49 scripts/miscellaneous/tar.m
|
||||
--- a/scripts/miscellaneous/tar.m Thu Aug 11 02:41:36 2011 -0500
|
||||
+++ b/scripts/miscellaneous/tar.m Thu Aug 11 10:56:18 2011 -0600
|
||||
@@ -42,7 +42,7 @@
|
||||
files = cellstr (files);
|
||||
endif
|
||||
|
||||
- if (ischar (tarfile) && iscellstr (files) && ischar (root))
|
||||
+ if !(ischar (tarfile) && iscellstr (files) && ischar (root))
|
||||
error ("tar: all arguments must be character strings");
|
||||
endif
|
||||
|
25
octave-xzip.patch
Normal file
25
octave-xzip.patch
Normal file
@ -0,0 +1,25 @@
|
||||
diff -r d1db86336a49 scripts/miscellaneous/private/__xzip__.m
|
||||
--- a/scripts/miscellaneous/private/__xzip__.m Thu Aug 11 02:41:36 2011 -0500
|
||||
+++ b/scripts/miscellaneous/private/__xzip__.m Thu Aug 11 14:28:45 2011 -0600
|
||||
@@ -80,14 +80,16 @@
|
||||
commandname, status);
|
||||
endif
|
||||
|
||||
- if (nargout > 0)
|
||||
- if (nargin == 5)
|
||||
+ if (nargin == 5)
|
||||
+ if (nargout > 0)
|
||||
entries = cellfun(
|
||||
@(x) fullfile (outdir, sprintf ("%s.%s", x, extension)),
|
||||
f, "uniformoutput", false);
|
||||
- else
|
||||
- movefile (cellfun(@(x) sprintf ("%s.%s", x, extension), f,
|
||||
- "uniformoutput", false), cwd);
|
||||
+ endif
|
||||
+ else
|
||||
+ movefile (cellfun(@(x) sprintf ("%s.%s", x, extension), f,
|
||||
+ "uniformoutput", false), cwd);
|
||||
+ if (nargout > 0)
|
||||
## FIXME this does not work when you try to compress directories
|
||||
entries = cellfun(@(x) sprintf ("%s.%s", x, extension),
|
||||
files, "uniformoutput", false);
|
Loading…
Reference in New Issue
Block a user