update to 4.0.1

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

o/octave/octave-vl.spec

@@ -1,42 +1,109 @@
-# From src/version.h:#define OCTAVE_API_VERSION
-%define octave_api api-v32
+%define pkg_name    octave
+%define pkg_version 4.0.1
+%define pkg_release 1%{?_dist_release}
 
-%define vine4 0
+%define gui   1
+%define sound 1
 
-%define version 3.0.2
-%define release 1%{?_dist_release}
-%define name octave
+%if %{?_dist_release} == "vl6"
+%define openjdk_ver 1.6.0
+%endif
+%if %{?_dist_release} == "vl7"
+%define openjdk_ver 1.7.0
+%endif
 
-Summary: GNU Octave -- a high-level language for numerical computations
+
+Summary:     GNU Octave -- a high-level language for numerical computations
 Summary(ja): 数値計算のための高級言語
-Name: %{name}
-Version: %{version}
-Release: %{release}
+Name:        %{pkg_name}
+Version:     %{pkg_version}
+Release:     %{pkg_release}
+
 License: GPL
-Group: Applications/Engineering
-
-Source: ftp://ftp.octave.org/pub/octave/%{name}-%{version}.tar.bz2
-URL: http://www.octave.org
-BuildRequires:  bison flex less tetex lapack-devel blas-devel
-BuildRequires:  ncurses-devel zlib-devel curl-devel texinfo
-BuildRequires:  readline-devel glibc-devel fftw3-devel gperf ghostscript
-BuildRequires:  glpk-devel gnuplot desktop-file-utils
-BuildRequires:  hdf5-devel qhull-devel suitesparse-devel 
-%if !%{vine4}
-BuildRequires:  gcc-gfortran
-%else
-BuildRequires:  gcc-g77
+Group:   Applications/Edutainment
+URL:     http://www.gnu.org/software/octave/
+Source0: ftp://ftp.octave.org/gnu/octave/%{name}-%{version}.tar.gz
+
+Buildroot: %{_tmppath}/%{name}-%{version}-root
+
+BuildRequires: gcc-gfortran
+BuildRequires: bison flex gperf texinfo less
+BuildRequires: gnuplot
+BuildRequires: ghostscript-devel
+BuildRequires: mesa-libOSMesa-devel
+BuildRequires: librsvg2
+BuildRequires: blas-devel lapack-devel
+BuildRequires: pcre-devel
+BuildRequires: readline-devel
+BuildRequires: arpack
+BuildRequires: curl-devel
+BuildRequires: fftw3-devel
+BuildRequires: fontconfig-devel
+BuildRequires: freetype-devel
+BuildRequires: glpk-devel
+BuildRequires: GraphicsMagick-c++-devel
+BuildRequires: hdf5-devel
+BuildRequires: java-%{openjdk_ver}-openjdk-devel
+BuildRequires: qhull-devel
+BuildRequires: qrupdate
+BuildRequires: suitesparse-devel
+BuildRequires: zlib-devel
+BuildRequires: xz-devel
+BuildRequires: libtool-ltdl-devel
+BuildRequires: libXext-devel
+%if %{gui}
+BuildRequires: desktop-file-utils
+BuildRequires: freeglut-devel
+BuildRequires: fltk-devel
+BuildRequires: gl2ps-devel
+BuildRequires: qt4-devel
+BuildRequires: qscintilla-devel
+%endif
+%if %{sound}
+BuildRequires: portaudio-devel
+BuildRequires: libsndfile-devel
+%endif
+
+Requires: ghostscript
+Requires: blas lapack
+Requires: pcre
+Requires: readline
+Requires: mesa-libOSMesa
+Requires: gnuplot
+Requires: arpack
+Requires: curl
+Requires: fftw3
+Requires: fontconfig
+Requires: freetype
+Requires: glpk
+Requires: GraphicsMagick-c++
+Requires: hdf5
+Requires: qhull
+Requires: qrupdate
+Requires: suitesparse
+Requires: zlib
+Requires: pstoedit epstool transfig
+%if %{gui}
+Requires: freeglut
+Requires: fltk
+Requires: gl2ps
+Requires: qt4
+Requires: qscintilla
+%endif
+%if %{sound}
+Requires: portaudio
+Requires: libsndfile
 %endif
 
-Requires: gnuplot 
-Requires(post): /sbin/install-info
+Requires(post):   /sbin/install-info
 Requires(postun): /sbin/ldconfig
-Requires(post): /sbin/ldconfig
-Requires(preun): /sbin/install-info
-Buildroot: %{_tmppath}/%{name}-%{version}-root
+Requires(post):   /sbin/ldconfig
+Requires(preun):  /sbin/install-info
 
 Vendor: Project Vine
 Distribution: Vine Linux
+Packager: ara_t
+
 
 %description
 GNU Octave is a high-level language, primarily intended for numerical
@@ -52,110 +119,151 @@ differential and differential-algebraic equations. It is easily
 extensible and customizable via user-defined functions written in
 Octave's own language, or using dynamically loaded modules written in
 C++, C, Fortran, or other languages.
-
-#'
+# '
 
 %description -l ja
 GNU Octave は数値計算用に開発の始められた高級言語です。線形問題や非線形
 問題を数値的に解いたり、その他のMatlab と互換性の高い言語を用いた数値計算
 を行うための使いやすいコマンドライン・インタフェースを備えています。
 バッチ指向言語としても使うこともできます。Octave は多機能なツールで、
-一般的な線形幾何の問題の数値解や、通常の関数の積分・微分、多項式の操作
-等を行うことができます。Octave の言語でユーザが関数を定義したり、C++,
-C, Fortran その他の言語で書いた動的ライブラリを用いて容易に拡張やカスタ
-マイズを行うことができます。
+一般的な線形幾何の問題の数値解や、通常の関数の積分・微分、多項式の操作等を
+行うことができます。
+Octave の言語でユーザが関数を定義したり、C++, C, Fortran その他の言語で
+書いた動的ライブラリを用いて容易に拡張やカスタマイズを行うことができます。
+
+%if %{gui}
+（注意）
+デフォルトではグラフの描画にOpenGL/fltkを使用してます。
+もし不安定な場合には、
+gnuplotをデフォルトとするために ~/.octaverc に
+graphics_toolkit("gnuplot");
+を追加してから起動して下さい。
+%endif
+
 
 %prep
-%setup -q 
-# 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
+%{__rm} -rf ${RPM_BUILD_ROOT}
+%setup -q
 
 %build
-%define enable64 no
-%if !%{vine4}
-%define f77 gfortran
-%else
-%define f77 g77
+%{configure} \
+ CPPFLAGS="-I%{_includedir}/pcre" \
+ --with-x \
+ --with-magick=GraphicsMagick \
+ --with-curl-includedir=%{_includedir}/curl \
+ --with-glpk-includedir=%{_includedir}/glpk \
+ --with-qhull-includedir=%{_includedir}/qhull \
+ --with-amd-includedir=%{_includedir}/suitesparse \
+ --with-camd-includedir=%{_includedir}/suitesparse \
+ --with-colamd-includedir=%{_includedir}/suitesparse \
+ --with-ccolamd-includedir=%{_includedir}/suitesparse \
+ --with-cholmod-includedir=%{_includedir}/suitesparse \
+ --with-cxsparse-includedir=%{_includedir}/suitesparse \
+ --with-umfpack-includedir=%{_includedir}/suitesparse \
+ --enable-java \
+%if !%{gui}
+ --disable-gui \
+ --without-opengl \
+ --without-fltk \
+%endif
+%if !%{sound}
+ --without-sndfile --without-portaudio \
 %endif
-export CPPFLAGS=-I%{_includedir}/glpk
-%configure --enable-shared --disable-static --enable-64=%enable64 --with-f77=%{f77} --with-curl
-make %{?_smp_mflags} OCTAVE_RELEASE="VinePlus %{version}-%{release}"
 
-#CXXFLAGS="$RPM_OPT_FLAGS"
-#export CXXFLAGS
-#configure --enable-dl --enable-shared --enable-lite-kernel --enable-picky-flags --disable-rpath --with-g77 --without-mpi
+%{__make} %{?_smp_mflags}
+# %{__make} check
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
+%{make_install}
+%{__rm} -f ${RPM_BUILD_ROOT}%{_infodir}/dir
 
 find %{buildroot} -name "*.oct" | xargs strip
 
 # Make library links
-mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d
-echo "%{_libdir}/octave-%{version}" > $RPM_BUILD_ROOT/etc/ld.so.conf.d/octave-%{_arch}.conf
-
-# Remove RPM_BUILD_ROOT from ls-R files
-perl -pi -e "s,$RPM_BUILD_ROOT,," $RPM_BUILD_ROOT%{_libexecdir}/%{name}/ls-R
-perl -pi -e "s,$RPM_BUILD_ROOT,," $RPM_BUILD_ROOT%{_datadir}/%{name}/ls-R
-
-# Clean doc directory
-pushd doc
-  make distclean
-  rm -f *.in */*.in */*.cc refcard/*.tex
-popd
+%{__mkdir_p} ${RPM_BUILD_ROOT}/etc/ld.so.conf.d
+echo "%{_libdir}/octave-%{version}" > \
+     ${RPM_BUILD_ROOT}/etc/ld.so.conf.d/octave-%{_arch}.conf
 
+%if %{gui}
 # Create desktop file
-rm $RPM_BUILD_ROOT%{_datadir}/applications/www.octave.org-octave.desktop
-desktop-file-install --vendor vine --add-category X-Fedora \
-	--dir $RPM_BUILD_ROOT%{_datadir}/applications examples/octave.desktop
+%{__mv} \
+ ${RPM_BUILD_ROOT}%{_datadir}/applications/www.octave.org-octave.desktop \
+ ${RPM_BUILD_ROOT}%{_datadir}/applications/octave.desktop
+%{__perl} -pi -e s/"Education;Science;Math;"/"Education;Science;"/g \
+ ${RPM_BUILD_ROOT}%{_datadir}/applications/octave.desktop
+%endif
 
-# Create directories for add-on packages
-HOST_TYPE=`$RPM_BUILD_ROOT%{_bindir}/octave-config -p CANONICAL_HOST_TYPE`
-mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/%{name}/site/oct/%{octave_api}/$HOST_TYPE
-mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/%{name}/site/oct/$HOST_TYPE
+# rename %{_datadir}/appdata/*
+%{__mv} \
+ ${RPM_BUILD_ROOT}%{_datadir}/appdata/www.octave.org-octave.appdata.xml \
+ ${RPM_BUILD_ROOT}%{_datadir}/appdata/octave.appdata.xml
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf ${RPM_BUILD_ROOT}
 
 %post
-/sbin/ldconfig
+%{_syssbindir}/ldconfig
 /sbin/install-info --info-dir=%{_infodir} --section="Programming" \
-	%{_infodir}/octave.info || :
+                   %{_infodir}/octave.info || :
 
 %preun
 if [ "$1" = "0" ]; then
-   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/octave.info || :
+    /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/octave.info || :
 fi
 
-%postun -p /sbin/ldconfig
+%postun -p %{_syssbindir}/ldconfig
+
 
 %files
 %defattr(-,root,root)
-%doc COPYING NEWS* PROJECTS README README.Linux README.kpathsea ROADMAP
-%doc SENDING-PATCHES THANKS emacs examples doc/interpreter/octave.p*
-%doc doc/faq doc/interpreter/HTML doc/refcard
-
-%{_bindir}/*
-%config(noreplace) /etc/ld.so.conf.d/*
-%{_libdir}/octave-%{version}
+%doc AUTHORS BUGS CITATION COPYING ChangeLog NEWS README
+%doc examples doc/interpreter/octave.p* doc/refcard
+%config(noreplace) /etc/ld.so.conf.d/
+%{_bindir}/
+%{_libdir}/octave
 %{_includedir}/octave-%{version}
-%{_datadir}/applications/*
+%{_datadir}/appdata/
+%if %{gui}
+%{_datadir}/applications/
+%endif
+%{_datadir}/icons/
 %{_datadir}/octave
 %{_libexecdir}/octave
 %{_mandir}/man*/*
 %{_infodir}/octave*
-#{_menudir}/%{name}
-#{_iconsdir}/%{name}.xpm
-#{_miconsdir}/%{name}.xpm
-#{_liconsdir}/%{name}.xpm
+%{_infodir}/liboctave.info*
+
 
 %changelog
+* Wed Apr 13 2016 Toshiaki Ara <ara_t@384.jp> 4.0.1-1
+- update to 4.0.1
+- change dependencies
+
+* Sun Oct 05 2014 Toshiaki Ara <ara_t@384.jp> 3.6.4-2
+- [BTS:0002801] add configure option --with-magick=Magick
+- delete BuildRequires: texlive-collection-texinfo
+- add BuildRequires: texlive-collection-plainextra
+- add BuildRequires: texlive-collection-latexextra
+- add BuildRequires: texlive-collection-fontsrecommended
+-   for VineSeed
+
+* Wed Mar 06 2013 Toshiaki Ara <ara_t@384.jp> 3.6.4-1
+- update to 3.6.4
+- add BuildRequires: freeglut-devel and Requires: freeglut for VineSeed
+
+* Tue Sep 11 2012 Toshiaki Ara <ara_t@384.jp> 3.6.2-2
+- delete octave from menu (programming)
+
+* Tue Aug 28 2012 Toshiaki Ara <ara_t@384.jp> 3.6.2-1
+- update to 3.6.2
+- correct spec file for version 3.6.2
+- add BuildRequires: pcre-devel fltk-devel
+- add BuildRequires: ImageMagick-devel ImageMagick-c++-devel
+- add BuildRequires: gcc-gfortran
+- add BuildRequires: texlive texlive-common texlive-collection-basic
+- add BuildRequires: texlive-collection-texinfo texlive-collection-genericrecommended
+- chanfe Group to Applications/Edutainment
+
 * Sat Aug 23 2008 Shu KONNO <owa@bg.wakwak.com> 3.0.2-1vl5
 - update to 3.0.2
 - applied new versioning policy, spec in utf-8