R 2.15.2-1

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

R/R/R-vl.spec

@@ -1,5 +1,5 @@
-%define pkg_version 2.13.1
+%define pkg_version 2.15.2
-%define pkg_release 2%{?_dist_release}
+%define pkg_release 1%{?_dist_release}
 
 Summary:          A language for data analysis and graphics
 Summary(ja):      データ解析・グラフィック化の言語
@@ -8,22 +8,21 @@ Version:          %{pkg_version}
 Release:          %{pkg_release}
 
 License:          GPLv2+
-Group:            Applications/Engineering
+Group:            Applications/Edutainment
 URL:              http://www.r-project.org
 
 Source0:          ftp://cran.r-project.org/pub/R/src/base/R-2/%{name}-%{version}.tar.gz
+Source1:          R.desktop
 #Patch0:           R-release.diff.gz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: gcc-c++
 BuildRequires: gcc-gfortran libgfortran
-%if %{?_dist_release} == "vl5"
-BuildRequires: tetex
-%else
 BuildRequires: texlive
-BuildRequires: texlive-collection-basic 
+BuildRequires: texlive-common
+BuildRequires: texlive-collection-basic
 BuildRequires: texlive-collection-texinfo
-%endif
+BuildRequires: texlive-collection-fontsextra
 BuildRequires: texinfo tcl tk
 BuildRequires: libpng-devel libjpeg-devel libtiff-devel
 BuildRequires: readline-devel libtermcap-devel
@@ -70,9 +69,9 @@ 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
+This is just a stub package containing the documentation on
-Extensions".  However, installing it will ensure that the build
+"Writing R Extensions".  However, installing it will ensure that
-environment for R packages is correct.
+the build environment for R packages is correct.
 
 %description -l ja devel
 Rパッケージを開発したりコンパイルする場合には、このR-develを
@@ -119,14 +118,16 @@ from the R project.  This package provides the static libRmath library.
 
 %prep
 %{__rm} -rf ${RPM_BUILD_ROOT}
-%setup -q 
+%setup -q
-#%patch0 -p1 
+#%patch0 -p1
 
 %build
 export R_PDFVIEWER="%{_bindir}/xdg-open"
 export R_PRINTCMD="lpr"
 export R_BROWSER="%{_bindir}/xdg-open"
+
 %configure --enable-R-shlib
+
 %{__make} %{?_smp_mflags}
 (cd src/nmath/standalone; %{__make} %{?_smp_mflags})
 LANG=C make check-all
@@ -154,32 +155,13 @@ sed -e "s@R_HOME_DIR=.*@R_HOME_DIR=%{_libdir}/R@" bin/R \
   > ${RPM_BUILD_ROOT}%{_bindir}/R
 chmod 755 ${RPM_BUILD_ROOT}%{_bindir}/R
 
+# add R into menu
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/applications
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/icons
 
-%files
+cp -a %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/applications/
-%defattr(-, root, root)
+cp -a doc/html/logosm.jpg ${RPM_BUILD_ROOT}%{_datadir}/icons/
-%{_bindir}/R
-%{_bindir}/Rscript
-%{_libdir}/R
-%{?INFO:%{_infodir}/R-*.info*}
-%{_mandir}/man1/*
-/etc/ld.so.conf.d/*
-
-%files devel
-%defattr(-, root, root)
-%doc doc/manual/R-exts.pdf
-
-%files -n libRmath
-%defattr(-, root, root)
-%{_libdir}/libRmath.so
-
-%files -n libRmath-devel
-%defattr(-, root, root)
-%{_libdir}/pkgconfig/*.pc
-%{_includedir}/Rmath.h
 
-%files -n libRmath-static
-%defattr(-, root, root)
-%{_libdir}/libRmath.a
 
 %clean
 %{__rm} -rf ${RPM_BUILD_ROOT}
@@ -198,6 +180,7 @@ chmod 755 ${RPM_BUILD_ROOT}%{_bindir}/R
 %endif
 %{_syssbindir}/ldconfig
 
+
 %preun 
 %if 0%{?INFO}
    if [ $1 = 0 ]; then
@@ -218,7 +201,65 @@ chmod 755 ${RPM_BUILD_ROOT}%{_bindir}/R
 %postun -n libRmath -p %{_syssbindir}/ldconfig
 
 
+%files
+%defattr(-, root, root)
+%{_bindir}/R
+%{_bindir}/Rscript
+%{_libdir}/R
+%{_datadir}/applications/*
+%{_datadir}/icons/*
+%{?INFO:%{_infodir}/R-*.info*}
+%{_mandir}/man1/*
+/etc/ld.so.conf.d/*
+
+%files devel
+%defattr(-, root, root)
+%doc doc/manual/R-exts.pdf
+
+%files -n libRmath
+%defattr(-, root, root)
+%{_libdir}/libRmath.so
+
+%files -n libRmath-devel
+%defattr(-, root, root)
+%{_libdir}/pkgconfig/*.pc
+%{_includedir}/Rmath.h
+
+%files -n libRmath-static
+%defattr(-, root, root)
+%{_libdir}/libRmath.a
+
+
 %changelog
+* Mon Oct 29 2012 Toshiaki Ara <ara_t@384.jp> 2.15.2-1
+- Updated to 2.15.2
+
+* Sat Sep 08 2012 Toshiaki Ara <ara_t@384.jp> 2.15.1-2
+- changed group to Applications/Edutainment
+- added R to menu
+
+* Sat Jun 25 2012 Toshiaki Ara <ara_t@384.jp> 2.15.1-1
+- Updated to 2.15.1
+
+* Sat Mar 31 2012 Toshiaki Ara <ara_t@384.jp> 2.15.0-1
+- Updated to 2.15.0
+
+* Thu Mar 01 2012 Toshiaki Ara <ara_t@384.jp> 2.14.2-1
+- Updated to 2.14.2
+
+* Sat Dec 24 2011 Toshiaki Ara <ara_t@384.jp> 2.14.1-1
+- Updated to 2.14.1
+
+* Tue Nov 01 2011 Toshiaki Ara <ara_t@384.jp> 2.14.0-1
+- Updated to 2.14.0
+- add BuildRequires: texlive-collection-fontsextra
+
+* Thu Oct 27 2011 Toshiaki Ara <ara_t@384.jp> 2.13.2-1
+- Updated to 2.13.2
+- add BuildRequires: texlive-common
+- use texlive instead of tetex on Vine5 because of failure to create R-exts.pdf
+- removed --enable-R-shlib option to %%configure on Vine5 because of segmentation fault
+
 * Sat Sep  3 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.13.1-2
 - synchronized to VinePlus/5 package
   * Sat Jul 09 2011 Toshiaki Ara <ara_t@384.jp> 2.13.1-1vl5