-update to 4.2.0

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@10822 ec354946-7b23-47d6-9f5a-488ba84defc7

o/octave/octave-vl.spec

@@ -1,16 +1,16 @@
 %define pkg_name    octave
-%define pkg_version 4.0.3
+%define pkg_version 4.2.0
 %define pkg_release 1%{?_dist_release}
 
 %define gui   1
 %define sound 1
 
-%if %{?_dist_release} == "vl6"
-%define openjdk_ver 1.6.0
-%endif
-%if %{?_dist_release} >= "vl7"
-%define openjdk_ver 1.8.0
-%endif
+# %if %{?_dist_release} == "vl6"
+# %define openjdk_ver 1.6.0
+# %endif
+# %if %{?_dist_release} >= "vl7"
+# %define openjdk_ver 1.8.0
+# %endif
 
 
 Summary:     GNU Octave -- a high-level language for numerical computations
@@ -22,7 +22,8 @@ Release:     %{pkg_release}
 License: GPL
 Group:   Applications/Edutainment
 URL:     http://www.gnu.org/software/octave/
-Source0: ftp://ftp.octave.org/gnu/octave/%{name}-%{version}.tar.gz
+# Source0: ftp://ftp.octave.org/gnu/octave/%{name}-%{version}.tar.gz
+Source0: ftp://ftp.octave.org/gnu/octave/%{name}-%{version}.tar.lz
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 
@@ -42,7 +43,8 @@ BuildRequires: freetype-devel
 BuildRequires: glpk-devel
 BuildRequires: GraphicsMagick-c++-devel
 BuildRequires: hdf5-devel
-BuildRequires: java-%{openjdk_ver}-openjdk-devel
+# BuildRequires: java-%{openjdk_ver}-openjdk-devel
+BuildRequires: java-devel
 BuildRequires: qhull-devel
 BuildRequires: qrupdate
 BuildRequires: suitesparse-devel
@@ -63,6 +65,7 @@ BuildRequires: qscintilla-devel
 BuildRequires: portaudio-devel
 BuildRequires: libsndfile-devel
 %endif
+BuildRequires: lzip
 
 Requires: ghostscript
 Requires: blas lapack
@@ -172,7 +175,6 @@ graphics_toolkit("gnuplot");
 %endif
 
 %{__make} %{?_smp_mflags}
-# %{__make} check
 
 %install
 %{make_install}
@@ -199,6 +201,9 @@ echo "%{_libdir}/octave-%{version}" > \
  ${RPM_BUILD_ROOT}%{_datadir}/appdata/www.octave.org-octave.appdata.xml \
  ${RPM_BUILD_ROOT}%{_datadir}/appdata/octave.appdata.xml
 
+%check
+%{__make} %{?_smp_mflags} check
+
 %clean
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
@@ -237,6 +242,12 @@ fi
 
 
 %changelog
+* Sat Nov 19 2016 Toshiaki Ara <ara_t@384.jp> 4.2.0-1
+- update to 4.2.0
+- add make check
+- add BuildRequires: lzip
+- change BuildRequires: java-devel
+
 * Mon Jul 18 2016 Toshiaki Ara <ara_t@384.jp> 4.0.3-1
 - update to 4.0.3
 - change BuildRequires: java-1.8.0-openjdk-devel for VineSeed