Browse Source

octave: update to 4.4.0

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@11640 ec354946-7b23-47d6-9f5a-488ba84defc7
ara_t 6 years ago
parent
commit
79c8c4d9ac
1 changed files with 12 additions and 35 deletions
  1. 12 35
      o/octave/octave-vl.spec

+ 12 - 35
o/octave/octave-vl.spec

@@ -1,17 +1,10 @@
 %define pkg_name    octave
-%define pkg_version 4.2.2
+%define pkg_version 4.4.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
-
 
 Summary:     GNU Octave -- a high-level language for numerical computations
 Summary(ja): 数値計算のための高級言語
@@ -19,10 +12,9 @@ Name:        %{pkg_name}
 Version:     %{pkg_version}
 Release:     %{pkg_release}
 
-License: GPL
+License: GPLv3
 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.lz
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
@@ -43,7 +35,6 @@ BuildRequires: freetype-devel
 BuildRequires: glpk-devel
 BuildRequires: GraphicsMagick-c++-devel
 BuildRequires: hdf5-devel
-# BuildRequires: java-%{openjdk_ver}-openjdk-devel
 BuildRequires: java-devel
 BuildRequires: qhull-devel
 BuildRequires: qrupdate
@@ -176,9 +167,9 @@ graphics_toolkit("gnuplot");
 
 %{__make} %{?_smp_mflags}
 
+
 %install
 %{make_install}
-%{__rm} -f ${RPM_BUILD_ROOT}%{_infodir}/dir
 
 find %{buildroot} -name "*.oct" | xargs strip
 
@@ -188,18 +179,11 @@ echo "%{_libdir}/octave-%{version}" > \
      ${RPM_BUILD_ROOT}/etc/ld.so.conf.d/octave-%{_arch}.conf
 
 %if %{gui}
-# Create desktop file
-%{__mv} \
- ${RPM_BUILD_ROOT}%{_datadir}/applications/www.octave.org-octave.desktop \
- ${RPM_BUILD_ROOT}%{_datadir}/applications/octave.desktop
+# desktop file
 %{__perl} -pi -e s/"Education;Science;Math;"/"Education;Science;"/g \
- ${RPM_BUILD_ROOT}%{_datadir}/applications/octave.desktop
+ ${RPM_BUILD_ROOT}%{_datadir}/applications/org.octave.Octave.desktop
 %endif
 
-# rename %{_datadir}/appdata/*
-%{__mv} \
- ${RPM_BUILD_ROOT}%{_datadir}/appdata/www.octave.org-octave.appdata.xml \
- ${RPM_BUILD_ROOT}%{_datadir}/appdata/octave.appdata.xml
 
 %check
 %{__make} %{?_smp_mflags} check
@@ -207,16 +191,8 @@ echo "%{_libdir}/octave-%{version}" > \
 %clean
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
-%post
-%{_syssbindir}/ldconfig
-/sbin/install-info --info-dir=%{_infodir} --section="Programming" \
-                   %{_infodir}/octave.info.gz || :
 
-%preun
-if [ "$1" = "0" ]; then
-    /sbin/install-info --delete --info-dir=%{_infodir} \
-                       %{_infodir}/octave.info.gz || :
-fi
+%post -p %{_syssbindir}/ldconfig
 
 %postun -p %{_syssbindir}/ldconfig
 
@@ -224,24 +200,25 @@ fi
 %files
 %defattr(-,root,root)
 %doc AUTHORS BUGS CITATION COPYING ChangeLog NEWS README
-%doc examples doc/interpreter/octave.p* doc/refcard
+%doc examples doc/interpreter/octave.pdf doc/refcard
 %config(noreplace) /etc/ld.so.conf.d/
 %{_bindir}/
 %{_libdir}/octave
 %{_includedir}/octave-%{version}
-%{_datadir}/appdata/
 %if %{gui}
 %{_datadir}/applications/
 %endif
 %{_datadir}/icons/
+%{_datadir}/metainfo/
 %{_datadir}/octave
 %{_libexecdir}/octave
-%{_mandir}/man*/*
-%{_infodir}/octave*
-%{_infodir}/liboctave.info*
 
 
 %changelog
+* Sun May 20 2018 Toshiaki Ara <ara_t@384.jp> 4.4.0-1
+- update to 4.4.0
+- correct License
+
 * Sun Apr 01 2018 Toshiaki Ara <ara_t@384.jp> 4.2.2-1
 - update to 4.2.2