From cc146a45a5c04a67eec64c293e32996d571ee9dd Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: May 28 2015 20:56:24 +0000 Subject: Merge branch 'master' into f21 --- diff --git a/octave.spec b/octave.spec index e130621..f647203 100644 --- a/octave.spec +++ b/octave.spec @@ -1,6 +1,8 @@ # From src/version.h:#define OCTAVE_API_VERSION %global octave_api api-v49+ +%{?!_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}} + # Building docs fails on EL7 due to https://bugzilla.redhat.com/show_bug.cgi?id=1064453 %if 0%{?rhel} == 7 %global builddocs 0 @@ -16,7 +18,7 @@ Name: octave Epoch: 6 Version: 3.8.2 -Release: 11%{?dist} +Release: 18%{?dist} Summary: A high-level language for numerical computations Group: Applications/Engineering License: GPLv3+ @@ -144,7 +146,9 @@ export F77=gfortran libjvm=$(find /usr/lib/jvm/jre/lib -name libjvm.so -printf %h) export JAVA_HOME=%{java_home} # JIT support is still experimental, and causes a segfault on ARM. +# --enable-float-truncate - https://savannah.gnu.org/bugs/?40560 %configure --enable-shared --disable-static --enable-64=%enable64 \ + --enable-float-truncate \ %{?disabledocs} \ --with-blas="-L%{_libdir}/atlas %{atlasblaslib}" \ --with-lapack="-L%{_libdir}/atlas %{atlaslapacklib}" \ @@ -162,12 +166,18 @@ then exit 1 fi -# SMP make still not working in Octave 3.6.0 -#make OCTAVE_RELEASE="Fedora %{version}-%{release}" %{?_smp_mflags} -make OCTAVE_RELEASE="Fedora %{version}%{?rctag}-%{release}" +make OCTAVE_RELEASE="Fedora %{version}%{?rctag}-%{release}" %{?_smp_mflags} %install make install DESTDIR=%{buildroot} + +# Docs - In case we didn't build them and to explicitly install pre-built docs +make -C doc install-data install-html install-info install-pdf DESTDIR=%{buildroot} +mkdir -p %{buildroot}%{_pkgdocdir} +cp -ar AUTHORS BUGS ChangeLog examples NEWS README %{buildroot}%{_pkgdocdir}/ +cp -a doc/refcard/*.pdf %{buildroot}%{_pkgdocdir}/ + +# No info directory rm -f %{buildroot}%{_infodir}/dir # Make library links @@ -256,6 +266,49 @@ cp -p doc/interpreter/macros.texi %{buildroot}%{_datadir}/%{name}/%{version}/etc mkdir -p %{buildroot}%{_rpmconfigdir}/macros.d cp -p %SOURCE1 %{buildroot}%{_rpmconfigdir}/macros.d/ +# Register as an application to be visible in the software center +# +# NOTE: It would be *awesome* if this file was maintained by the upstream +# project, translated and installed into the right place during `make install`. +# +# See http://www.freedesktop.org/software/appstream/docs/ for more details. +# +mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata +cat > $RPM_BUILD_ROOT%{_datadir}/appdata/%{name}.appdata.xml < + + + + octave.desktop + CC0-1.0 + Interactive programming environment for numerical computations + +

+ GNU Octave is a high-level interpreted language, primarily intended for + numerical computations. + It provides capabilities for the numerical solution of linear and + nonlinear problems, and for performing other numerical experiments. + It also provides extensive graphics capabilities for data visualization + and manipulation. +

+

+ Octave is normally used through its interactive command line interface, + but it can also be used to write non-interactive programs. + The Octave language is quite similar to Matlab so that most programs are + easily portable. +

+ + http://www.octave.org + + http://www.gnu.org/software/octave/images/screenshot.png + + octave-maintainers@octave.org + +EOF + %check # Tests are currently segfaulting on arm # https://bugzilla.redhat.com/show_bug.cgi?id=1149953 @@ -282,17 +335,21 @@ fi %postun -p /sbin/ldconfig %files -%doc AUTHORS BUGS ChangeLog COPYING NEWS README +%license COPYING +%{_pkgdocdir}/AUTHORS +%{_pkgdocdir}/BUGS +%{_pkgdocdir}/ChangeLog +%{_pkgdocdir}/NEWS +%{_pkgdocdir}/README # FIXME: Create an -emacs package that has the emacs addon %config(noreplace) %{_sysconfdir}/ld.so.conf.d/octave-*.conf %{_bindir}/octave* %{_libdir}/octave/ %{_libexecdir}/octave/ -%if %{builddocs} %{_mandir}/man1/octave*.1.* %{_infodir}/liboctave.info* %{_infodir}/octave.info* -%endif +%{_datadir}/appdata/%{name}.appdata.xml %{_datadir}/applications/octave.desktop # octave_packages is %ghost, so need to list everything else separately %dir %{_datadir}/octave @@ -308,17 +365,39 @@ fi %{_bindir}/mkoctfile %{_bindir}/mkoctfile-%{version}%{?rctag} %{_includedir}/octave-%{version}%{?rctag}/ -%if %{builddocs} %{_mandir}/man1/mkoctfile.1.* -%endif %files doc -%doc doc/liboctave/liboctave.html doc/liboctave/liboctave.pdf -%doc doc/refcard/*.pdf -%doc examples/ - +%{_pkgdocdir}/examples/ +%{_pkgdocdir}/liboctave.html/ +%{_pkgdocdir}/liboctave.pdf +%{_pkgdocdir}/octave.html +%{_pkgdocdir}/octave.pdf +%{_pkgdocdir}/refcard*.pdf %changelog +* Thu May 28 2015 Orion Poplawski - 6:3.8.2-18 +- Fix doc install (bug #799662) + +* Sun May 17 2015 Orion Poplawski - 6:3.8.2-17 +- Rebuild for hdf5 1.8.15 + +* Mon Apr 20 2015 Rex Dieter - 6:3.8.2-16 +- rebuild (qscintilla) + +* Thu Mar 26 2015 Richard Hughes - 6:3.8.2-15 +- Add an AppData file for the software center + +* Tue Mar 10 2015 Orion Poplawski - 6:3.8.2-14 +- Build with --enable-float-truncate (https://savannah.gnu.org/bugs/?40560) +- Re-enable parallel builds + +* Mon Mar 09 2015 Rex Dieter - 6:3.8.2-13 +- rebuild (GraphicsMagick) + +* Fri Feb 20 2015 Orion Poplawski - 6:3.8.2-12 +- Rebuild for rebuilt swig + * Wed Feb 18 2015 Orion Poplawski - 6:3.8.2-11 - Rebuild for fltk 1.3.3