update to 3.3.0

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

R/R/R-vl.spec

@@ -1,18 +1,18 @@
-%define pkg_version 3.2.4
-%define pkg_release 3%{?_dist_release}
+%define pkg_name    R
+%define pkg_version 3.3.0
+%define pkg_release 1%{?_dist_release}
 
 Summary:     A language for data analysis and graphics
 Summary(ja): データ解析・グラフィック化の言語
-Name:        R
+Name:        %{pkg_name}
 Version:     %{pkg_version}
 Release:     %{pkg_release}
 
-License:     GPLv
+License:     GPLv2
 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
-Source0:     ftp://cran.r-project.org/pub/R/src/base/R-3/%{name}-%{version}-revised.tar.gz
+Source0:     ftp://cran.r-project.org/pub/R/src/base/R-3/%{name}-%{version}.tar.gz
 Source1:     R.desktop
 # Patch0:      R-release.diff.gz
 
@@ -20,17 +20,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: gcc-c++
 BuildRequires: gcc-gfortran libgfortran
 BuildRequires: texinfo
-
-%if %{?_dist_release} == "vl6"
-BuildRequires: tcl tk
-%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
+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
@@ -39,16 +33,9 @@ BuildRequires: texlive-common
 BuildRequires: texlive-collection-basic
 BuildRequires: texlive-collection-latexextra
 BuildRequires: texlive-collection-fontsextra
-
-%if %{?_dist_release} == "vl6"
-BuildRequires: texlive-collection-texinfo
-BuildRequires: java-1.6.0-openjdk-devel
-%endif
-%if %{?_dist_release} == "vl7"
 BuildRequires: texlive-collection-plainextra
 BuildRequires: texlive-collection-fontsrecommended
 BuildRequires: java-1.7.0-openjdk-devel
-%endif
 
 Requires: libgfortran
 Requires: libicu
@@ -56,7 +43,8 @@ Requires: tcl tk
 
 Vendor: Project Vine
 Distribution: Vine Linux
-Packager: Toshiaki Ara <ara_t@384.jp>
+Packager: ara_t
+
 
 %description
 'GNU S' - A language and environment for statistical computing and
@@ -102,9 +90,9 @@ Rパッケージを開発したりコンパイルする場合には、このR-de
 開発するための助けになるでしょう。
 
 %package -n libRmath
-Summary:     standalone math library from the R project
-Summary(ja): 単独で動作するRプロジェクトの数理ライブラリ
-Group:       System Environment/Libraries
+Summary:          standalone math library from the R project
+Summary(ja):      単独で動作するRプロジェクトの数理ライブラリ
+Group:            System Environment/Libraries
 
 %description -n libRmath
 A standalone library of mathematical and statistical functions derived
@@ -115,10 +103,10 @@ from the R project.  This packages provides the shared libRmath library.
 共有ライブラリを提供する。
 
 %package -n libRmath-devel
-Summary:     standalone math library from the R project
-Summary(ja): libRmathの開発ライブラリ
-Group:       Development/Libraries
-Requires:    libRmath = %{version}-%{release}
+Summary:          standalone math library from the R project
+Summary(ja):      libRmathの開発ライブラリ
+Group:            Development/Libraries
+Requires:         libRmath = %{version}-%{release}
 
 %description -n libRmath-devel
 A standalone library of mathematical and statistical functions derived
@@ -128,10 +116,10 @@ from the R project.  This packages provides the header files.
 libRmathのヘッダファイル（Rmath.h）
 
 %package -n libRmath-static
-Summary:     Static R Standalone math library
+Summary: Static R Standalone math library
 Summary(ja): libRmath の静的ライブラリ
-Group:       Development/Libraries
-Requires:    libRmath-devel = %{version}-%{release}
+Group: Development/Libraries
+Requires: libRmath-devel = %{version}-%{release}
 
 %description -n libRmath-static
 A standalone library of mathematical and statistical functions derived
@@ -140,8 +128,7 @@ from the R project.  This package provides the static libRmath library.
 
 %prep
 %{__rm} -rf ${RPM_BUILD_ROOT}
-# %setup -q
-%setup -q -n R-revised
+%setup -q
 # %patch0 -p1
 
 %build
@@ -184,7 +171,7 @@ echo "%{_libdir}/R/lib" > \
 %{__mkdir_p} ${RPM_BUILD_ROOT}%{_datadir}/applications
 %{__mkdir_p} ${RPM_BUILD_ROOT}%{_datadir}/icons
 %{__cp} -a %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/applications/
-%{__cp} -a doc/html/logosm.jpg ${RPM_BUILD_ROOT}%{_datadir}/icons/
+%{__cp} -a doc/html/Rlogo.svg ${RPM_BUILD_ROOT}%{_datadir}/icons/
 
 %clean
 %{__rm} -rf ${RPM_BUILD_ROOT}
@@ -254,6 +241,11 @@ echo "%{_libdir}/R/lib" > \
 
 
 %changelog
+* Tue May 03 2016 Toshiaki Ara <ara_t@384.jp> 3.3.0-1vl7
+- Updated to 3.3.0
+- add BuildRequires: pcre-devel xz-devel
+- change logo of menu item to Rlogo.svg
+
 * Sun Apr 10 2016 Toshiaki Ara <ara_t@384.jp> 3.2.4-3
 - correct SPEC file