update to 3.3.2-3

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

R/R/R-vl.spec

@@ -1,6 +1,6 @@
 %define pkg_name    R
 %define pkg_version 3.3.2
-%define pkg_release 1%{?_dist_release}
+%define pkg_release 3%{?_dist_release}
 
 Summary:     A language for data analysis and graphics
 Summary(ja): データ解析・グラフィック化の言語
@@ -13,14 +13,20 @@ 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
+# Source1:     R.desktop
 # Patch0:      R-release.diff.gz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: gcc-c++
 BuildRequires: gcc-gfortran libgfortran
 BuildRequires: texinfo
+%if %{?_dist_release} == "vl6"
+# BuildRequires: tcl tk
+BuildRequires: tcl85-devel tk85-devel
+%endif
+%if %{?_dist_release} >= "vl7"
 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
@@ -33,14 +39,26 @@ BuildRequires: texlive-common
 BuildRequires: texlive-collection-basic
 BuildRequires: texlive-collection-latexextra
 BuildRequires: texlive-collection-fontsextra
+%if %{?_dist_release} == "vl6"
+BuildRequires: texlive-collection-texinfo
+%endif
+%if %{?_dist_release} >= "vl7"
 BuildRequires: texlive-collection-plainextra
 BuildRequires: texlive-collection-fontsrecommended
-
+%endif
 BuildRequires: java-devel
 
 Requires: libgfortran
 Requires: libicu
+# Requires: tcl tk
+%if %{?_dist_release} == "vl6"
+Requires: tcl85 tk85
+%endif
+%if %{?_dist_release} >= "vl7"
 Requires: tcl tk
+%endif
+
+Conflicts: R-devel < %{version}-%{release}
 
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -71,24 +89,24 @@ Rは、条件分岐や反復計算などの制御構造を持つ正真正銘の
 また、計算量が多いときにはC、 C++、Fortranなどのコードとリンクさせて
 使用することができる。
 
-%package devel
-Summary:          files for development of R packages.
-Summary(ja):      Rパッケージ開発用ファイル
-Group:            Development/Libraries
-Requires:         R = %{version}-%{release}
+# %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.
+# %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.
+# 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パッケージを
-開発するための助けになるでしょう。
+# %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
@@ -132,12 +150,30 @@ from the R project.  This package provides the static libRmath library.
 %setup -q
 # %patch0 -p1
 
+cat > R.desktop <<EOF
+[Desktop Entry]
+Name=GNU R
+Comment=A language for data analysis and graphics
+TryExec=/usr/bin/R
+Exec=/usr/bin/R
+Icon=/usr/share/icons/logo.jpg
+Terminal=true
+Type=Application
+Categories=Education;Science;
+StartupNotify=false
+EOF
+
 %build
 export R_PDFVIEWER="%{_bindir}/xdg-open"
 export R_PRINTCMD="lpr"
 export R_BROWSER="%{_bindir}/xdg-open"
 
-%{configure} --enable-R-shlib --with-tcltk
+# %{configure} --enable-R-shlib --with-tcltk
+%{configure} --enable-R-shlib --with-tcltk \
+%if %{?_dist_release} == "vl6"
+ --with-tcl-config=%{_libdir}/tclConfig85.sh \
+ --with-tk-config=%{_libdir}/tkConfig85.sh
+%endif
 
 %{__make} %{?_smp_mflags}
 (cd src/nmath/standalone; %{__make} %{?_smp_mflags})
@@ -170,9 +206,14 @@ echo "%{_libdir}/R/lib" > \
 # add R into menu
 %{__mkdir_p} ${RPM_BUILD_ROOT}%{_datadir}/applications
 %{__mkdir_p} ${RPM_BUILD_ROOT}%{_datadir}/icons
-%{__cp} -a %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/applications/
+%{__cp} -a R.desktop ${RPM_BUILD_ROOT}%{_datadir}/applications/
 %{__cp} -a doc/html/logo.jpg ${RPM_BUILD_ROOT}%{_datadir}/icons/
 
+# move PDF manuals
+%{__mkdir_p} ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}
+%{__mv} ${RPM_BUILD_ROOT}%{_libdir}/%{name}/doc/manual/*.pdf \
+ ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}
+
 %clean
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
@@ -220,11 +261,12 @@ echo "%{_libdir}/R/lib" > \
 %{_datadir}/icons/*
 %{?INFO:%{_infodir}/R-*.info*}
 %{_mandir}/man1/*
-/etc/ld.so.conf.d/*
+%{_docdir}/%{name}-%{version}/*
+%{_sysconfdir}/ld.so.conf.d/*
 
-%files devel
-%defattr(-, root, root)
-%doc doc/manual/R-exts.pdf
+# %files devel
+# %defattr(-, root, root)
+# %doc doc/manual/R-exts.pdf
 
 %files -n libRmath
 %defattr(-, root, root)
@@ -241,6 +283,17 @@ echo "%{_libdir}/R/lib" > \
 
 
 %changelog
+* Thu Nov 17 2016 Toshiaki Ara <ara_t@384.jp> 3.3.2-3
+- use tcl-8.5/tk-8.5 for Vine6.5
+  - BuildRequires to tcl85-devel/tk85-devel
+  - Requires to tcl85/tk85
+
+* Tue Nov 15 2016 Toshiaki Ara <ara_t@384.jp> 3.3.2-2
+- merge SPEC file for Vine6
+- drop devel package
+- move PDF manuals to /usr/share/doc/R-%%{version}
+- revert logo of menu item to logo.jpg
+
 * Mon Oct 31 2016 Toshiaki Ara <ara_t@384.jp> 3.3.2-1
 - Updated to 3.3.2