R: update to 3.4.1

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

R/R/R-vl.spec

@@ -1,5 +1,5 @@
 %define pkg_name    R
-%define pkg_version 3.4.0
+%define pkg_version 3.4.1
 %define pkg_release 1%{?_dist_release}
 
 Summary:     A language for data analysis and graphics
@@ -13,7 +13,6 @@ Group:       Applications/Edutainment
 URL:         http://www.r-project.org
 
 Source0:     ftp://cran.r-project.org/pub/R/src/base/R-3/%{name}-%{version}.tar.gz
-# Source1:     R.desktop
 # Patch0:      R-release.diff.gz
 
 # To avoid 'make check error'
@@ -25,16 +24,16 @@ BuildRequires: gcc-c++
 BuildRequires: gcc-gfortran libgfortran
 BuildRequires: texinfo
 %if %{?_dist_release} == "vl6"
-# BuildRequires: tcl tk
+BuildRequires: R-pcre-devel
 BuildRequires: tcl85-devel tk85-devel
 %endif
 %if %{?_dist_release} >= "vl7"
+BuildRequires: pcre-devel
 BuildRequires: tcl-devel tk-devel
 %endif
 BuildRequires: libpng-devel libjpeg-turbo-devel libtiff-devel
 BuildRequires: readline-devel ncurses-devel
 BuildRequires: zlib-devel bzip2-devel xz-devel
-BuildRequires: pcre-devel
 BuildRequires: libSM-devel libX11-devel libICE-devel libXt-devel libXmu-devel
 BuildRequires: cairo-devel pango-devel
 BuildRequires: libicu-devel
@@ -47,16 +46,17 @@ BuildRequires: texlive-collection-fontsextra
 BuildRequires: texlive-collection-texinfo
 %endif
 %if %{?_dist_release} >= "vl7"
-BuildRequires: texlive-collection-plainextra
+BuildRequires: texlive-collection-plaingeneric
 BuildRequires: texlive-collection-fontsrecommended
 %endif
 BuildRequires: java-devel
 
+Requires: gcc-gfortran
 Requires: libgfortran
 Requires: libicu
-# Requires: tcl tk
 %if %{?_dist_release} == "vl6"
 Requires: tcl85 tk85
+Requires: R-pcre
 %endif
 %if %{?_dist_release} >= "vl7"
 Requires: tcl tk
@@ -93,25 +93,6 @@ Rは、条件分岐や反復計算などの制御構造を持つ正真正銘の
 また、計算量が多いときにはC、 C++、Fortranなどのコードとリンクさせて
 使用することができる。
 
-# %package devel
-# Summary:          files for development of R packages.
-# Summary(ja):      Rパッケージ開発用ファイル
-# Group:            Development/Libraries
-# Requires:         R = %{version}-%{release}
-
-# %description devel
-# Install R-devel if you are going to develop or compile R packages.
-
-# This is just a stub package containing the documentation on
-# "Writing R Extensions".  However, installing it will ensure that
-# the build environment for R packages is correct.
-
-# %description -l ja devel
-# Rパッケージを開発したりコンパイルする場合には、このR-develを
-# インストールします。R-exts.pdf ("Writing R Extensions": 英文)
-# が含まれているだけのサブパッケージですが、正しくRパッケージを
-# 開発するための助けになるでしょう。
-
 %package -n libRmath
 Summary:          standalone math library from the R project
 Summary(ja):      単独で動作するRプロジェクトの数理ライブラリ
@@ -173,17 +154,20 @@ EOF
 export R_PDFVIEWER="%{_bindir}/xdg-open"
 export R_PRINTCMD="lpr"
 export R_BROWSER="%{_bindir}/xdg-open"
-export TZ="Asia/Tokyo"
+%if %{?_dist_release} == "vl6"
+export LD_LIBRARY_PATH=%{_libdir}/R/lib
+%endif
 
 %{configure} --enable-R-shlib --with-tcltk \
 %if %{?_dist_release} == "vl6"
  --with-tcl-config=%{_libdir}/tclConfig85.sh \
- --with-tk-config=%{_libdir}/tkConfig85.sh
+ --with-tk-config=%{_libdir}/tkConfig85.sh \
+ CPPFLAGS="-I%{_libdir}/R/include" \
+ LDFLAGS="-L%{_libdir}/R/lib"
 %endif
 
 %{__make} %{?_smp_mflags}
 (cd src/nmath/standalone; %{__make} %{?_smp_mflags})
-LANG=C %{__make} check
 %{__make} pdf
 
 %install
@@ -213,10 +197,15 @@ echo "%{_libdir}/R/lib" > \
 %{__cp} -a R.desktop ${RPM_BUILD_ROOT}%{_datadir}/applications/
 %{__cp} -a doc/html/logo.jpg ${RPM_BUILD_ROOT}%{_datadir}/icons/
 
-# move PDF manuals
+# move manuals
 %{__mkdir_p} ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}
-%{__mv} ${RPM_BUILD_ROOT}%{_libdir}/%{name}/doc/manual/*.pdf \
- ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}
+%{__mv} ${RPM_BUILD_ROOT}%{_libdir}/%{name}/doc/* \
+ ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/
+%{__rm} -rf ${RPM_BUILD_ROOT}%{_libdir}/%{name}/doc
+
+%check
+export TZ="Asia/Tokyo"
+LANG=C %{__make} check
 
 %clean
 %{__rm} -rf ${RPM_BUILD_ROOT}
@@ -242,10 +231,6 @@ echo "%{_libdir}/R/lib" > \
 %{_docdir}/%{name}-%{version}/*
 %{_sysconfdir}/ld.so.conf.d/*
 
-# %files devel
-# %defattr(-, root, root)
-# %doc doc/manual/R-exts.pdf
-
 %files -n libRmath
 %defattr(-, root, root)
 %{_libdir}/libRmath.so
@@ -261,6 +246,13 @@ echo "%{_libdir}/R/lib" > \
 
 
 %changelog
+* Sat Jul 01 2017 Toshiaki Ara <ara_t@384.jp> 3.4.1-1
+- Updated to 3.4.1
+- rebuild under R-pcre (pcre-8.39) for Vine6
+- add Requires: gcc-gfortran
+- change to BuildRequires: texlive-collection-plaingeneric
+- delete unnecessary descriptions
+
 * 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