R: update to 3.4.0

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@11051 ec354946-7b23-47d6-9f5a-488ba84defc7

R/R/R-vl.spec

@@ -1,5 +1,5 @@
 %define pkg_name    R
-%define pkg_version 3.3.3
+%define pkg_version 3.4.0
 %define pkg_release 1%{?_dist_release}
 
 Summary:     A language for data analysis and graphics
@@ -16,6 +16,10 @@ Source0:     ftp://cran.r-project.org/pub/R/src/base/R-3/%{name}-%{version}.tar.
 # Source1:     R.desktop
 # Patch0:      R-release.diff.gz
 
+# To avoid 'make check error'
+Patch1:      reg-tests-3.R.patch
+Patch2:      reg-tests-3.Rout.save.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: gcc-c++
 BuildRequires: gcc-gfortran libgfortran
@@ -149,6 +153,8 @@ from the R project.  This package provides the static libRmath library.
 %{__rm} -rf ${RPM_BUILD_ROOT}
 %setup -q
 # %patch0 -p1
+%patch1
+%patch2
 
 cat > R.desktop <<EOF
 [Desktop Entry]
@@ -167,8 +173,8 @@ EOF
 export R_PDFVIEWER="%{_bindir}/xdg-open"
 export R_PRINTCMD="lpr"
 export R_BROWSER="%{_bindir}/xdg-open"
+export TZ="Asia/Tokyo"
 
-# %{configure} --enable-R-shlib --with-tcltk
 %{configure} --enable-R-shlib --with-tcltk \
 %if %{?_dist_release} == "vl6"
  --with-tcl-config=%{_libdir}/tclConfig85.sh \
@@ -179,23 +185,21 @@ export R_BROWSER="%{_bindir}/xdg-open"
 (cd src/nmath/standalone; %{__make} %{?_smp_mflags})
 LANG=C %{__make} check
 %{__make} pdf
-# We can only "make info" if we have an up to date version of texinfo
-%{?INFO: %{__make} info}
 
 %install
 %{make_install}
-%{__make} install-pdf %{?INFO:install-info} DESTDIR=${RPM_BUILD_ROOT}
+%{__make} install-pdf DESTDIR=${RPM_BUILD_ROOT}
 %{__rm} -f ${RPM_BUILD_ROOT}%{_infodir}/dir
 %{__rm} -f ${RPM_BUILD_ROOT}%{_infodir}/dir.old
 
-#Install libRmath files
+# Install libRmath files
 (cd src/nmath/standalone; %{make_install})
 
 %{__mkdir_p} ${RPM_BUILD_ROOT}/etc/ld.so.conf.d
 echo "%{_libdir}/R/lib" > \
      ${RPM_BUILD_ROOT}/etc/ld.so.conf.d/%{name}-%{_arch}.conf
 
-#Fix lication of R_HOME_DIR in shell wrapper
+# Fix lication of R_HOME_DIR in shell wrapper
 %{__sed} -e "s@R_HOME_DIR=.*@R_HOME_DIR=%{_libdir}/R@" bin/R \
   > ${RPM_BUILD_ROOT}%{_libdir}/R/bin/R
 %{__chmod} 755 ${RPM_BUILD_ROOT}%{_libdir}/R/bin/R
@@ -218,32 +222,7 @@ echo "%{_libdir}/R/lib" > \
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
 
-%post
+%post -p %{_syssbindir}/ldconfig
-%if 0%{?INFO}
-   # Create directory entries for info files
-   # (optional doc files, so we must check that they are installed)
-   for doc in admin data exts FAQ intro lang; do
-      file=%{_infodir}/R-${doc}.info.gz
-      if [ -e $file ]; then
-         /sbin/install-info ${file} %{_infodir}/dir 2>/dev/null
-      fi
-   done
-%endif
-%{_syssbindir}/ldconfig
-
-
-%preun
-%if 0%{?INFO}
-   if [ $1 = 0 ]; then
-      # Delete directory entries for info files (if they were installed)
-      for doc in admin data exts FAQ intro lang; do
-         file=%{_infodir}/R-${doc}.info.gz
-         if [ -e ${file} ]; then
-            /sbin/install-info --delete R-${doc} %{_infodir}/dir 2>/dev/null
-         fi
-      done
-   fi
-%endif
 
 %postun -p %{_syssbindir}/ldconfig
 
@@ -259,7 +238,6 @@ echo "%{_libdir}/R/lib" > \
 %{_libdir}/R
 %{_datadir}/applications/*
 %{_datadir}/icons/*
-%{?INFO:%{_infodir}/R-*.info*}
 %{_mandir}/man1/*
 %{_docdir}/%{name}-%{version}/*
 %{_sysconfdir}/ld.so.conf.d/*
@@ -283,6 +261,12 @@ echo "%{_libdir}/R/lib" > \
 
 
 %changelog
+* Tue May 02 2017 Toshiaki Ara <ara_t@384.jp> 3.4.0-1
+- Updated to 3.4.0
+- add Patch1 and Patch2 to avoid 'make check' error
+- add export TZ="Asia/Tokyo" to avoid 'make check' error
+- delete descrption about info
+
 * Tue Apr 11 2017 Toshiaki Ara <ara_t@384.jp> 3.3.3-1
 - Updated to 3.3.3