old conditionals inherited
This commit is contained in:
parent
a6bef8ca8a
commit
9c187a8b46
25
R.spec
25
R.spec
@ -36,6 +36,17 @@
|
||||
%global modern 1
|
||||
%endif
|
||||
|
||||
# default to 0.
|
||||
%global texi2any 0
|
||||
|
||||
%if 0%{?fedora} >= 20
|
||||
%global texi2any 1
|
||||
%endif
|
||||
|
||||
%if 0%{?rhel} >= 7
|
||||
%global texi2any 1
|
||||
%endif
|
||||
|
||||
%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
|
||||
|
||||
Name: R
|
||||
@ -399,6 +410,11 @@ export FCFLAGS="%{optflags}"
|
||||
%ifnarch %{arm}
|
||||
--enable-lto \
|
||||
%endif
|
||||
%endif
|
||||
%if %{texi2any}
|
||||
MAKEINFO=texi2any \
|
||||
%else
|
||||
MAKEINFO=makeinfo \
|
||||
%endif
|
||||
rdocdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} \
|
||||
rincludedir=%{_includedir}/R \
|
||||
@ -417,7 +433,11 @@ cp doc/manual/R-intro.texi doc/manual/R-intro.texi.spot
|
||||
sed -i 's|@eqn|@math|g' doc/manual/R-exts.texi
|
||||
sed -i 's|@eqn|@math|g' doc/manual/R-intro.texi
|
||||
%endif
|
||||
make info
|
||||
%if %{texi2any}
|
||||
make MAKEINFO=texi2any info
|
||||
%else
|
||||
make MAKEINFO=makeinfo info
|
||||
%endif
|
||||
|
||||
# Convert to UTF-8
|
||||
for i in doc/manual/R-intro.info doc/manual/R-FAQ.info doc/FAQ doc/manual/R-admin.info doc/manual/R-exts.info-1; do
|
||||
@ -932,6 +952,9 @@ R CMD javareconf \
|
||||
* Mon May 04 2015 Jakub Čajka <jcajka@redhat.com> - 3.2.0-2
|
||||
- valgrind is available only on selected arches, fixes build on s390
|
||||
|
||||
* Thu Apr 30 2015 Tom Callaway <spot@fedoraproject.org>
|
||||
- conditionalize MAKEINFO for ancient things (rhel 6 or older)
|
||||
|
||||
* Sun Apr 26 2015 Tom Callaway <spot@fedoraproject.org> - 3.2.0-1
|
||||
- update to 3.2.0
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user