[maxima] avoid texinfo on f19+ (#913274)
Rex Dieter
rdieter at fedoraproject.org
Tue Feb 26 19:59:18 UTC 2013
commit b71d1a60e15c51f347ab417476a4c3a41faaf9b7
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Tue Feb 26 13:58:59 2013 -0600
avoid texinfo on f19+ (#913274)
maxima-5.29.1-no_doc.patch | 24 ++++++++++++++++++
maxima.spec | 58 ++++++++++++++++++++++++++++++++++----------
2 files changed, 69 insertions(+), 13 deletions(-)
---
diff --git a/maxima-5.29.1-no_doc.patch b/maxima-5.29.1-no_doc.patch
new file mode 100644
index 0000000..ff158ee
--- /dev/null
+++ b/maxima-5.29.1-no_doc.patch
@@ -0,0 +1,24 @@
+diff -up maxima-5.29.1/Makefile.am.no_doc maxima-5.29.1/Makefile.am
+--- maxima-5.29.1/Makefile.am.no_doc 2012-12-03 23:54:48.000000000 -0600
++++ maxima-5.29.1/Makefile.am 2013-02-26 13:32:02.200163679 -0600
+@@ -2,7 +2,7 @@ if ENABLE_GETTEXT
+ LOCALE_DIR = locale
+ endif
+
+-SUBDIRS = admin src lisp-utils tests doc interfaces share demo plotting $(LOCALE_DIR)
++SUBDIRS = admin src lisp-utils tests interfaces share demo plotting $(LOCALE_DIR)
+
+ EXTRA_DIST = \
+ common.mk maxima.iss.in \
+diff -up maxima-5.29.1/Makefile.in.no_doc maxima-5.29.1/Makefile.in
+--- maxima-5.29.1/Makefile.in.no_doc 2012-12-10 14:34:31.000000000 -0600
++++ maxima-5.29.1/Makefile.in 2013-02-26 13:32:22.691907497 -0600
+@@ -208,7 +208,7 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ win32 = @win32@
+ @ENABLE_GETTEXT_TRUE at LOCALE_DIR = locale
+-SUBDIRS = admin src lisp-utils tests doc interfaces share demo plotting $(LOCALE_DIR)
++SUBDIRS = admin src lisp-utils tests interfaces share demo plotting $(LOCALE_DIR)
+ EXTRA_DIST = \
+ common.mk maxima.iss.in \
+ README.lisps README.rpms README.i18n README.external \
diff --git a/maxima.spec b/maxima.spec
index 56cc94c..5db454d 100644
--- a/maxima.spec
+++ b/maxima.spec
@@ -4,11 +4,16 @@
%undefine desktop_vendor
%endif
+## f19/texinfo-5.0 is busted, https://bugzilla.redhat.com/913274
+%if 0%{?fedora} < 19
+%define texinfo 1
+%endif
+
Summary: Symbolic Computation Program
Name: maxima
Version: 5.29.1
-Release: 4%{?dist}
+Release: 5%{?dist}
License: GPLv2
Group: Applications/Engineering
URL: http://maxima.sourceforge.net/
@@ -17,6 +22,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
ExclusiveArch: %{ix86} x86_64 ppc sparcv9
+# don't build doc/ by default
+Patch1: maxima-5.29.1-no_doc.patch
+
## upstreamable patches
# https://bugzilla.redhat.com/show_bug.cgi?id=837142
# https://sourceforge.net/tracker/?func=detail&aid=3539587&group_id=4933&atid=104933
@@ -33,7 +41,7 @@ Patch50: maxima-5.28.0-clisp-noreadline.patch
%define default_lisp sbcl
%define _enable_sbcl --enable-sbcl
%if 0%{?fedora}
-%define _enable_clisp --enable-clisp
+%define _enable_clisp --enable-clisp
%define _enable_gcl --enable-gcl
%define _enable_ecl --enable-ecl
%endif
@@ -44,7 +52,7 @@ Patch50: maxima-5.28.0-clisp-noreadline.patch
%define _enable_sbcl --enable-sbcl
%if 0%{?fedora}
# clisp: http://bugzilla.redhat.com/166347 (resolved) - clisp/ppc (still) awol.
-#define _enable_clisp --enable-clisp
+#define _enable_clisp --enable-clisp
%define _enable_gcl --enable-gcl
%endif
%endif
@@ -91,11 +99,11 @@ Obsoletes: %{name}-lang-pt_BR-utf8 < %{version}-%{release}
BuildRequires: desktop-file-utils
BuildRequires: time
+%if 0%{?texinfo}
# texi2dvi
-%if 0%{?fedora} > 5 || 0%{?rhel} > 4
BuildRequires: texinfo-tex
-%else
-BuildRequires: texinfo
+Requires(post): /sbin/install-info
+Requires(postun): /sbin/install-info
%endif
BuildRequires: tex(latex)
%if 0%{?fedora} > 17
@@ -107,8 +115,6 @@ BuildRequires: tk
Requires: %{name}-runtime%{?default_lisp:-%{default_lisp}} = %{version}-%{release}
Requires: gnuplot
Requires: rlwrap
-Requires(post): /sbin/install-info
-Requires(postun): /sbin/install-info
%description
Maxima is a full symbolic computation program. It is full featured
@@ -215,6 +221,7 @@ Maxima compiled with Embeddable Common-Lisp (ecl).
%prep
%setup -q -n %{name}%{!?cvs:-%{version}%{?beta}}
+%patch1 -p1 -b .no_doc
%patch50 -p1 -b .clisp-noreadline
# Extra docs
@@ -229,7 +236,7 @@ sed -i -e \
interfaces/emacs/emaxima/maxima.el
# remove CVS crud
-find -name CVS -type d | xargs --no-run-if-empty rm -r
+find -name CVS -type d | xargs --no-run-if-empty rm -rv
%build
@@ -248,6 +255,10 @@ make %{?_smp_mflags}
# docs
install -D -p -m644 %{SOURCE11} doc/maximabook/maxima.pdf
+make html -C doc
+%if 0%{?texinfo}
+make info -C doc
+%endif
# Allow ecl to "require" maxima. This is required by sagemath ecl runtime.
%if "x%{?_enable_ecl:1}" == "x1"
@@ -263,15 +274,16 @@ popd
%endif
-%check
-make -k check
-
-
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
+make install-html -C doc
+%if 0%{?texinfo}
+make instal-info -C doc
+%endif
+
%if "x%{?_enable_ecl:1}" == "x1"
install -D -m755 src/maxima.system.fasb $RPM_BUILD_ROOT%{ecllib}/maxima.system.fas
%endif
@@ -311,13 +323,28 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/maxima/%{maxima_ver}/doc/{contributors,impleme
touch debugfiles.list
+%check
+make -k check
+
+
+%if ! 0%{?texinfo}
+%pre
+if [ $1 -gt 0 ]; then
+/sbin/install-info --delete %{_infodir}/maxima.info %{_infodir}/dir > /dev/null 2>&1 ||:
+fi
+%endif
+
%post
+%if 0%{?texinfo}
/sbin/install-info %{_infodir}/maxima.info %{_infodir}/dir ||:
+%endif
[ -x /usr/bin/texhash ] && /usr/bin/texhash 2> /dev/null ||:
%postun
if [ $1 -eq 0 ]; then
+%if 0%{?texinfo}
/sbin/install-info --delete %{_infodir}/maxima.info %{_infodir}/dir ||:
+%endif
[ -x /usr/bin/texhash ] && /usr/bin/texhash 2> /dev/null ||:
fi
@@ -402,11 +429,13 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_libdir}/maxima/
%dir %{_libdir}/maxima/%{maxima_ver}/
%{_libexecdir}/maxima
+%if 0%{?texinfo}
%{_infodir}/*maxima*
%lang(es) %{_infodir}/es*
%lang(pt) %{_infodir}/pt/
%lang(pt) %{_infodir}/pt.utf8/
%lang(pt_BR) %{_infodir}/pt_BR*
+%endif
%{_mandir}/man1/maxima.*
%dir %{_datadir}/maxima/%{maxima_ver}/emacs
%{_datadir}/maxima/%{maxima_ver}/emacs/emaxima.*
@@ -463,6 +492,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Feb 26 2013 Rex Dieter <rdieter at fedoraproject.org> 5.29.1-5
+- avoid texinfo on f19+ (#913274)
+
* Wed Feb 20 2013 Rex Dieter <rdieter at fedoraproject.org> 5.29.1-4
- rebuild (sbcl)
More information about the scm-commits
mailing list