|
|
@@ -1,6 +1,6 @@
|
|
|
%define pkg_name octave
|
|
|
%define pkg_version 4.4.0
|
|
|
-%define pkg_release 3%{?_dist_release}
|
|
|
+%define pkg_release 4%{?_dist_release}
|
|
|
|
|
|
%define gui 1
|
|
|
%define sound 1
|
|
|
@@ -54,9 +54,15 @@ BuildRequires: desktop-file-utils
|
|
|
BuildRequires: freeglut-devel
|
|
|
BuildRequires: fltk-devel
|
|
|
BuildRequires: gl2ps-devel
|
|
|
+%if %{?_dist_release} == "vl6"
|
|
|
BuildRequires: qt4-devel
|
|
|
BuildRequires: qscintilla-devel
|
|
|
%endif
|
|
|
+%if %{?_dist_release} >= "vl7"
|
|
|
+BuildRequires: qt5-qtbase-devel
|
|
|
+BuildRequires: qt5-qttools-devel
|
|
|
+%endif
|
|
|
+%endif
|
|
|
%if %{sound}
|
|
|
BuildRequires: portaudio-devel
|
|
|
BuildRequires: libsndfile-devel
|
|
|
@@ -87,9 +93,15 @@ Requires: pstoedit epstool transfig
|
|
|
Requires: freeglut
|
|
|
Requires: fltk
|
|
|
Requires: gl2ps
|
|
|
+%if %{?_dist_release} == "vl6"
|
|
|
Requires: qt4
|
|
|
Requires: qscintilla
|
|
|
%endif
|
|
|
+%if %{?_dist_release} >= "vl7"
|
|
|
+Requires: qt5-qtbase
|
|
|
+Requires: qt5-qttools-libs-help
|
|
|
+%endif
|
|
|
+%endif
|
|
|
%if %{sound}
|
|
|
Requires: portaudio
|
|
|
Requires: libsndfile
|
|
|
@@ -152,7 +164,7 @@ graphics_toolkit("gnuplot");
|
|
|
--with-magick=GraphicsMagick \
|
|
|
--with-curl-includedir=%{_includedir}/curl \
|
|
|
--with-glpk-includedir=%{_includedir}/glpk \
|
|
|
- --with-qhull-includedir=%{_includedir}/qhull \
|
|
|
+ --with-qhull-includedir=%{_includedir}/libqhull \
|
|
|
--with-amd-includedir=%{_includedir}/suitesparse \
|
|
|
--with-camd-includedir=%{_includedir}/suitesparse \
|
|
|
--with-colamd-includedir=%{_includedir}/suitesparse \
|
|
|
@@ -161,8 +173,10 @@ graphics_toolkit("gnuplot");
|
|
|
--with-cxsparse-includedir=%{_includedir}/suitesparse \
|
|
|
--with-umfpack-includedir=%{_includedir}/suitesparse \
|
|
|
--enable-java \
|
|
|
+%if %{gui}
|
|
|
+ --with-qt=5 \
|
|
|
+%endif
|
|
|
%if !%{gui}
|
|
|
- --disable-gui \
|
|
|
--without-opengl \
|
|
|
--without-fltk \
|
|
|
%endif
|
|
|
@@ -189,7 +203,6 @@ echo "%{_libdir}/octave-%{version}" > \
|
|
|
${RPM_BUILD_ROOT}%{_datadir}/applications/org.octave.Octave.desktop
|
|
|
%endif
|
|
|
|
|
|
-
|
|
|
%check
|
|
|
%{__make} %{?_smp_mflags} check
|
|
|
|
|
|
@@ -220,8 +233,14 @@ echo "%{_libdir}/octave-%{version}" > \
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Sun Jul 01 2018 Toshiaki Ara <ara_t@384.jp> 4.4.0-4
|
|
|
+- using qt5 for VineSeed
|
|
|
+ - add configure option: --with-qt=5
|
|
|
+ - add BuildRequires: qt5-qtbase-devel and qt5-qttools-devel
|
|
|
+ - add Requires: qt5-qtbase and qt5-qttools-libs-help
|
|
|
+
|
|
|
* Sun Jul 01 2018 Toshiaki Ara <ara_t@384.jp> 4.4.0-3
|
|
|
-- rebuild under hdf5-1.8.20 for VineSeed
|
|
|
+- rebuild with hdf5-1.8.20 for VineSeed
|
|
|
|
|
|
* Wed Jun 06 2018 Toshiaki Ara <ara_t@384.jp> 4.4.0-2
|
|
|
- add BuildRequires: arpack-devel for VineSeed
|
ara_t