[R/f19] conditionalize hack

Tom Callaway spot at fedoraproject.org
Sat May 18 19:25:31 UTC 2013


commit 0a7c20509d687dfb3d69b4ca80add99a5e04586c
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Sat May 18 15:25:06 2013 -0400

    conditionalize hack

 R.spec |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/R.spec b/R.spec
index 45a16bf..a798c2c 100644
--- a/R.spec
+++ b/R.spec
@@ -17,7 +17,7 @@
 
 Name: R
 Version: 3.0.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
 Source0: ftp://cran.r-project.org/pub/R/src/base/R-3/R-%{version}.tar.gz
@@ -312,12 +312,14 @@ make
 (cd src/nmath/standalone; make)
 #make check-all
 make pdf
+%if 0%{?fedora} >= 19
 # What a hack.
 # Current texinfo doesn't like @eqn. Use @math instead where stuff breaks.
 cp doc/manual/R-exts.texi doc/manual/R-exts.texi.spot
 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
 
 # Convert to UTF-8
@@ -329,8 +331,10 @@ done
 %install
 make DESTDIR=${RPM_BUILD_ROOT} install install-info
 # And now, undo the hack. :P
+%if 0%{?fedora} >= 19
 mv doc/manual/R-exts.texi.spot doc/manual/R-exts.texi
 mv doc/manual/R-intro.texi.spot doc/manual/R-intro.texi
+%endif
 make DESTDIR=${RPM_BUILD_ROOT} install-pdf
 
 rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
@@ -806,6 +810,9 @@ R CMD javareconf \
 %postun -n libRmath -p /sbin/ldconfig
 
 %changelog
+* Sat May 18 2013 Tom Callaway <spot at fedoraproject.org> - 3.0.1-2
+- conditionalize the ugly hack for fedora 19+
+
 * Fri May 17 2013 Tom Callaway <spot at fedoraproject.org> - 3.0.1-1
 - update to 3.0.1
 


More information about the scm-commits mailing list