From 7d9020ec1b8b381ad5b3bab8e688b81cce5319e2 Mon Sep 17 00:00:00 2001 From: Jussi Lehtola Date: Sat, 6 Aug 2011 10:44:15 +0300 Subject: [PATCH 1/7] Update to 3.4.2. --- .gitignore | 1 + octave.spec | 43 +++++++++++++++++++++---------------------- sources | 2 +- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index d3f0347..824a8b5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ octave-3.2.4.tar.bz2 /octave-3.3.54.tar.bz2 /octave-3.4.0.tar.bz2 +/octave-3.4.2.tar.bz2 diff --git a/octave.spec b/octave.spec index b5977b7..cc428d7 100644 --- a/octave.spec +++ b/octave.spec @@ -1,17 +1,15 @@ # From src/version.h:#define OCTAVE_API_VERSION -%global octave_api api-v47+ +%global octave_api api-v45+ Name: octave -Version: 3.4.0 -Release: 4%{?dist} +Version: 3.4.2 +Release: 1%{?dist} Summary: A high-level language for numerical computations Epoch: 6 Group: Applications/Engineering License: GPLv3+ Source0: ftp://ftp.gnu.org/gnu/octave/octave-%{version}.tar.bz2 Source1: macros.octave -# Add missing cstddef for gcc 4.6 -Patch0: octave-3.4.0-gcc46.patch URL: http://www.octave.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -23,6 +21,7 @@ BuildRequires: readline-devel glibc-devel fftw-devel gperf ghostscript BuildRequires: curl-devel pcre-devel texinfo-tex arpack-devel libX11-devel BuildRequires: suitesparse-devel glpk-devel gnuplot desktop-file-utils BuildRequires: GraphicsMagick-c++-devel fltk-devel ftgl-devel qrupdate-devel +BuildRequires: %{_bindir}/dvips Requires: gnuplot gnuplot-common less info texinfo Requires(post): info @@ -68,13 +67,6 @@ This package contains documentation for Octave. %prep %setup -q -%patch0 -p1 -b .gcc46 -# Check that octave_api is set correctly -if ! grep -q '^#define OCTAVE_API_VERSION "%{octave_api}"' src/version.h -then - echo "octave_api variable in spec does not match src/version.h" - exit 1 -fi # Check permissions find -name *.cc -exec chmod 644 {} \; @@ -90,7 +82,16 @@ export F77=gfortran --with-lapack="-L%{_libdir}/atlas -llapack" \ --with-amd --with-umfpack --with-colamd --with-ccolamd --with-cholmod \ --with-cxsparse -make OCTAVE_RELEASE="Fedora %{version}-%{release}" + +# Check that octave_api is set correctly (autogenerated file) +make -C src version.h +if ! grep -q '^#define OCTAVE_API_VERSION "%{octave_api}"' src/version.h +then + echo "octave_api variable in spec does not match src/version.h" + exit 1 +fi + +make OCTAVE_RELEASE="Fedora %{version}-%{release}" %{?_smp_mflags} %install rm -rf %{buildroot} @@ -128,12 +129,8 @@ echo "-b %{_bindir}/octave-%{version}" > %{buildroot}%{_sysconfdir}/prelink.conf mkdir -p %{buildroot}%{_sysconfdir}/rpm cp -p %SOURCE1 %{buildroot}%{_sysconfdir}/rpm/ - -# TODO - Fix this: -# src/DLD-FUNCTIONS/md5sum.cc ............................*** stack smashing detected ***: /builddir/build/BUILD/octave-3.3.54/src/.libs/lt-octave terminated -#%check -#make check - +%check +make check %clean rm -rf %{buildroot} @@ -152,13 +149,12 @@ fi %files %defattr(-,root,root,-) -%doc AUTHORS BUGS ChangeLog* COPYING NEWS* PROJECTS README README.Linux -%doc README.kpathsea +%doc AUTHORS BUGS ChangeLog COPYING NEWS README # FIXME: Create an -emacs package that has the emacs addon %config(noreplace) %{_sysconfdir}/ld.so.conf.d/octave-*.conf %config(noreplace) %{_sysconfdir}/rpm/macros.octave %{_bindir}/octave* -%{_libdir}/octave-%{version}/ +%{_libdir}/octave/ %{_libexecdir}/octave/ %{_mandir}/man1/octave*.1.* %{_infodir}/liboctave.info* @@ -189,6 +185,9 @@ fi %changelog +* Sat Aug 06 2011 Jussi Lehtola - 6:3.4.2-1 +- Update to 6.4.2. + * Wed Feb 23 2011 Orion Poplawski - 6:3.4.0-4 - Update rpm macros per FPC comments diff --git a/sources b/sources index 14057a2..51f6ebc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c8144cee1d37e645d3368a8e8a5f1856 octave-3.4.0.tar.bz2 +31c744ab4555a2bf04d5e644b93f9b51 octave-3.4.2.tar.bz2 From 8aedd34a03b2a125f5f7985b51c9b559d0b8633e Mon Sep 17 00:00:00 2001 From: Jussi Lehtola Date: Sat, 6 Aug 2011 10:46:53 +0300 Subject: [PATCH 2/7] Update to 3.4.2. --- octave-3.4.0-gcc46.patch | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 octave-3.4.0-gcc46.patch diff --git a/octave-3.4.0-gcc46.patch b/octave-3.4.0-gcc46.patch deleted file mode 100644 index c174204..0000000 --- a/octave-3.4.0-gcc46.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up octave-3.4.0/liboctave/oct-alloc.h.gcc46 octave-3.4.0/liboctave/oct-alloc.h ---- octave-3.4.0/liboctave/oct-alloc.h.gcc46 2011-02-08 03:00:51.000000000 -0700 -+++ octave-3.4.0/liboctave/oct-alloc.h 2011-02-08 09:41:23.984081687 -0700 -@@ -23,6 +23,8 @@ along with Octave; see the file COPYING. - #if !defined (octave_oct_alloc_h) - #define octave_oct_alloc_h 1 - -+#include -+ - class - OCTAVE_API - octave_allocator -diff -up octave-3.4.0/src/pr-output.cc.gcc46 octave-3.4.0/src/pr-output.cc ---- octave-3.4.0/src/pr-output.cc.gcc46 2011-02-08 03:00:52.000000000 -0700 -+++ octave-3.4.0/src/pr-output.cc 2011-02-08 09:55:16.149662744 -0700 -@@ -3024,7 +3024,7 @@ abs (T x) - } - - #define INSTANTIATE_ABS(T) \ -- template /* static */ inline T abs (T) -+ template /* static */ T abs (T) - - INSTANTIATE_ABS(signed char); - INSTANTIATE_ABS(short); From e00ea4db3d91496d672147f9960ec9d7428748b7 Mon Sep 17 00:00:00 2001 From: Jussi Lehtola Date: Sat, 6 Aug 2011 11:24:44 +0300 Subject: [PATCH 3/7] Fix typo. --- octave.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/octave.spec b/octave.spec index 27e08f1..bae221f 100644 --- a/octave.spec +++ b/octave.spec @@ -242,7 +242,7 @@ fi %changelog * Sat Aug 06 2011 Jussi Lehtola - 6:3.4.2-1 -- Update to 6.4.2. +- Update to 3.4.2. * Fri May 27 2011 Orion Poplawski - 6:3.4.0-8 - Add patch to fix Fl_File_Chooser.H location From 2eb0eabb3a1d5b1e189801f5669df43cb3b8ac43 Mon Sep 17 00:00:00 2001 From: Jussi Lehtola Date: Sat, 6 Aug 2011 12:07:29 +0300 Subject: [PATCH 4/7] Patch to get package to build in rawhide. --- octave-3.4.2-curl.patch | 11 +++++++++++ octave.spec | 3 +++ 2 files changed, 14 insertions(+) create mode 100644 octave-3.4.2-curl.patch diff --git a/octave-3.4.2-curl.patch b/octave-3.4.2-curl.patch new file mode 100644 index 0000000..0e44063 --- /dev/null +++ b/octave-3.4.2-curl.patch @@ -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 + #include +-#include + #include + + static int diff --git a/octave.spec b/octave.spec index bae221f..a7a23a0 100644 --- a/octave.spec +++ b/octave.spec @@ -10,6 +10,8 @@ Group: Applications/Engineering License: GPLv3+ Source0: ftp://ftp.gnu.org/gnu/octave/octave-%{version}.tar.bz2 Source1: macros.octave +# Don't include which isn't used and is missing on newer versions of libcurl +Patch0: octave-3.4.2-curl.patch # https://savannah.gnu.org/bugs/index.php?32839 # Fix building packages from directories Patch2: octave-3.4.0-pkgbuilddir.patch @@ -70,6 +72,7 @@ This package contains documentation for Octave. %prep %setup -q +%patch0 -p1 -b .curl %patch2 -p1 -b .pkgbuilddir # Check permissions From 1605c403eb0ad119956e94746cf8c5e4be9d0a06 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 11 Aug 2011 15:18:49 -0600 Subject: [PATCH 5/7] Drop smp build - seems to be failing Add patch to fix tar argument handling Add patch to fix xzip --- octave-tar.patch | 12 ++++++++++++ octave-xzip.patch | 25 +++++++++++++++++++++++++ octave.spec | 19 ++++++++++++++++--- 3 files changed, 53 insertions(+), 3 deletions(-) create mode 100644 octave-tar.patch create mode 100644 octave-xzip.patch diff --git a/octave-tar.patch b/octave-tar.patch new file mode 100644 index 0000000..bb9600c --- /dev/null +++ b/octave-tar.patch @@ -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 + diff --git a/octave-xzip.patch b/octave-xzip.patch new file mode 100644 index 0000000..0e0e881 --- /dev/null +++ b/octave-xzip.patch @@ -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); diff --git a/octave.spec b/octave.spec index a7a23a0..20afd67 100644 --- a/octave.spec +++ b/octave.spec @@ -3,7 +3,7 @@ Name: octave Version: 3.4.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A high-level language for numerical computations Epoch: 6 Group: Applications/Engineering @@ -12,9 +12,15 @@ Source0: ftp://ftp.gnu.org/gnu/octave/octave-%{version}.tar.bz2 Source1: macros.octave # Don't include which isn't used and is missing on newer versions of libcurl Patch0: octave-3.4.2-curl.patch +# https://savannah.gnu.org/bugs/index.php?33988 +# Fix tar argument handling +Patch1: octave-tar.patch # https://savannah.gnu.org/bugs/index.php?32839 # Fix building packages from directories Patch2: octave-3.4.0-pkgbuilddir.patch +# https://savannah.gnu.org/bugs/index.php?33993 +# Fix xzip +Patch3: octave-xzip.patch URL: http://www.octave.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -73,7 +79,9 @@ This package contains documentation for Octave. %prep %setup -q %patch0 -p1 -b .curl +%patch1 -p1 -b .tar %patch2 -p1 -b .pkgbuilddir +%patch3 -p1 -b .xzip # Check permissions find -name *.cc -exec chmod 644 {} \; @@ -98,7 +106,8 @@ then exit 1 fi -make OCTAVE_RELEASE="Fedora %{version}-%{release}" %{?_smp_mflags} +# smp builds failing as of 3.4.2 +make OCTAVE_RELEASE="Fedora %{version}-%{release}" %install rm -rf %{buildroot} @@ -244,6 +253,11 @@ fi %changelog +* Thu Aug 11 2011 Orion Poplawski - 6:3.4.2-2 +- Drop smp build - seems to be failing +- Add patch to fix tar argument handling +- Add patch to fix xzip + * Sat Aug 06 2011 Jussi Lehtola - 6:3.4.2-1 - Update to 3.4.2. @@ -263,7 +277,6 @@ fi - Fix multilib installs - Re-enable prelinking, seems to work - Add patch to enable building packages from directories ->>>>>>> c9d48722b5642ad74c3504a69163771eb4b11d9d * Wed Feb 23 2011 Orion Poplawski - 6:3.4.0-4 - Update rpm macros per FPC comments From b108d3146bba81c5a2018a5d606aeb8299d68f53 Mon Sep 17 00:00:00 2001 From: Jussi Lehtola Date: Wed, 24 Aug 2011 19:54:24 +0300 Subject: [PATCH 6/7] Place macros in -devel. --- octave.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/octave.spec b/octave.spec index 20afd67..819593f 100644 --- a/octave.spec +++ b/octave.spec @@ -3,7 +3,7 @@ Name: octave Version: 3.4.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A high-level language for numerical computations Epoch: 6 Group: Applications/Engineering @@ -220,7 +220,6 @@ fi %doc AUTHORS BUGS ChangeLog COPYING NEWS README # FIXME: Create an -emacs package that has the emacs addon %config(noreplace) %{_sysconfdir}/ld.so.conf.d/octave-*.conf -%config(noreplace) %{_sysconfdir}/rpm/macros.octave %{_bindir}/octave* %{_libdir}/octave/ %{_libexecdir}/octave/ @@ -240,6 +239,7 @@ fi %files devel %defattr(-,root,root,-) +%config(noreplace) %{_sysconfdir}/rpm/macros.octave %{_bindir}/mkoctfile %{_bindir}/mkoctfile-%{version} %{_includedir}/octave-%{version}/ @@ -253,6 +253,9 @@ fi %changelog +* Wed Aug 24 2011 Jussi Lehtola - 6:3.4.2-3 +- Place rpm macros in -devel. + * Thu Aug 11 2011 Orion Poplawski - 6:3.4.2-2 - Drop smp build - seems to be failing - Add patch to fix tar argument handling From a4a8bae8e3be491392a10f49f4c0b7ee1f7f4b61 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 24 Oct 2011 21:45:12 -0600 Subject: [PATCH 7/7] Update to 3.4.3 Drop upstreamed patches --- .gitignore | 1 + octave-3.4.2-curl.patch | 11 ----------- octave-tar.patch | 12 ------------ octave-xzip.patch | 25 ------------------------- octave.spec | 19 ++++++------------- sources | 2 +- 6 files changed, 8 insertions(+), 62 deletions(-) delete mode 100644 octave-3.4.2-curl.patch delete mode 100644 octave-tar.patch delete mode 100644 octave-xzip.patch diff --git a/.gitignore b/.gitignore index 824a8b5..266ab26 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ octave-3.2.4.tar.bz2 /octave-3.3.54.tar.bz2 /octave-3.4.0.tar.bz2 /octave-3.4.2.tar.bz2 +/octave-3.4.3.tar.bz2 diff --git a/octave-3.4.2-curl.patch b/octave-3.4.2-curl.patch deleted file mode 100644 index 0e44063..0000000 --- a/octave-3.4.2-curl.patch +++ /dev/null @@ -1,11 +0,0 @@ -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 - #include --#include - #include - - static int diff --git a/octave-tar.patch b/octave-tar.patch deleted file mode 100644 index bb9600c..0000000 --- a/octave-tar.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 - diff --git a/octave-xzip.patch b/octave-xzip.patch deleted file mode 100644 index 0e0e881..0000000 --- a/octave-xzip.patch +++ /dev/null @@ -1,25 +0,0 @@ -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); diff --git a/octave.spec b/octave.spec index 819593f..108515e 100644 --- a/octave.spec +++ b/octave.spec @@ -2,25 +2,17 @@ %global octave_api api-v45+ Name: octave -Version: 3.4.2 -Release: 3%{?dist} +Version: 3.4.3 +Release: 1%{?dist} Summary: A high-level language for numerical computations Epoch: 6 Group: Applications/Engineering License: GPLv3+ Source0: ftp://ftp.gnu.org/gnu/octave/octave-%{version}.tar.bz2 Source1: macros.octave -# Don't include which isn't used and is missing on newer versions of libcurl -Patch0: octave-3.4.2-curl.patch -# https://savannah.gnu.org/bugs/index.php?33988 -# Fix tar argument handling -Patch1: octave-tar.patch # https://savannah.gnu.org/bugs/index.php?32839 # Fix building packages from directories Patch2: octave-3.4.0-pkgbuilddir.patch -# https://savannah.gnu.org/bugs/index.php?33993 -# Fix xzip -Patch3: octave-xzip.patch URL: http://www.octave.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -78,10 +70,7 @@ This package contains documentation for Octave. %prep %setup -q -%patch0 -p1 -b .curl -%patch1 -p1 -b .tar %patch2 -p1 -b .pkgbuilddir -%patch3 -p1 -b .xzip # Check permissions find -name *.cc -exec chmod 644 {} \; @@ -253,6 +242,10 @@ fi %changelog +* Mon Oct 24 2011 Orion Poplawski - 6:3.4.3-1 +- Update to 3.4.3 +- Drop upstreamed patches + * Wed Aug 24 2011 Jussi Lehtola - 6:3.4.2-3 - Place rpm macros in -devel. diff --git a/sources b/sources index 51f6ebc..8cefd2e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -31c744ab4555a2bf04d5e644b93f9b51 octave-3.4.2.tar.bz2 +185b08f4e4a7b646d76e4d33b77fa87e octave-3.4.3.tar.bz2