|
|
@@ -1,5 +1,5 @@
|
|
|
-%define pkg_version 3.2.2
|
|
|
-%define pkg_release 2%{?_dist_release}
|
|
|
+%define pkg_version 3.2.4
|
|
|
+%define pkg_release 3%{?_dist_release}
|
|
|
|
|
|
Summary: A language for data analysis and graphics
|
|
|
Summary(ja): データ解析・グラフィック化の言語
|
|
|
@@ -11,7 +11,8 @@ License: GPLv
|
|
|
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}.tar.gz
|
|
|
+Source0: ftp://cran.r-project.org/pub/R/src/base/R-3/%{name}-%{version}-revised.tar.gz
|
|
|
Source1: R.desktop
|
|
|
# Patch0: R-release.diff.gz
|
|
|
|
|
|
@@ -33,6 +34,7 @@ BuildRequires: zlib-devel bzip2-devel
|
|
|
BuildRequires: libSM-devel libX11-devel libICE-devel libXt-devel libXmu-devel
|
|
|
BuildRequires: cairo-devel pango-devel
|
|
|
BuildRequires: libicu-devel
|
|
|
+BuildRequires: curl-devel
|
|
|
BuildRequires: texlive-common
|
|
|
BuildRequires: texlive-collection-basic
|
|
|
BuildRequires: texlive-collection-latexextra
|
|
|
@@ -100,9 +102,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
|
|
|
@@ -113,10 +115,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
|
|
|
@@ -126,10 +128,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
|
|
|
@@ -138,7 +140,8 @@ from the R project. This package provides the static libRmath library.
|
|
|
|
|
|
%prep
|
|
|
%{__rm} -rf ${RPM_BUILD_ROOT}
|
|
|
-%setup -q
|
|
|
+# %setup -q
|
|
|
+%setup -q -n R-revisedw
|
|
|
# %patch0 -p1
|
|
|
|
|
|
%build
|
|
|
@@ -146,7 +149,7 @@ 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
|
|
|
|
|
|
%{__make} %{?_smp_mflags}
|
|
|
(cd src/nmath/standalone; %{__make} %{?_smp_mflags})
|
|
|
@@ -157,37 +160,37 @@ LANG=C %{__make} check
|
|
|
|
|
|
|
|
|
%install
|
|
|
-%{__make} install DESTDIR=${RPM_BUILD_ROOT} install-pdf %{?INFO:install-info}
|
|
|
+%{make_ install}
|
|
|
+%{__make} install-pdf %{?INFO:install-info}
|
|
|
%{__rm} -f ${RPM_BUILD_ROOT}%{_infodir}/dir
|
|
|
%{__rm} -f ${RPM_BUILD_ROOT}%{_infodir}/dir.old
|
|
|
|
|
|
#Install libRmath files
|
|
|
-(cd src/nmath/standalone; %{__make} install DESTDIR=${RPM_BUILD_ROOT})
|
|
|
+(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
|
|
|
+%{__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
|
|
|
-sed -e "s@R_HOME_DIR=.*@R_HOME_DIR=%{_libdir}/R@" bin/R \
|
|
|
+%{__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
|
|
|
-sed -e "s@R_HOME_DIR=.*@R_HOME_DIR=%{_libdir}/R@" bin/R \
|
|
|
+%{__chmod} 755 ${RPM_BUILD_ROOT}%{_libdir}/R/bin/R
|
|
|
+%{__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
|
|
|
+%{__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
|
|
|
-
|
|
|
-cp -a %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/applications/
|
|
|
-cp -a doc/html/logosm.jpg ${RPM_BUILD_ROOT}%{_datadir}/icons/
|
|
|
-
|
|
|
+%{__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/
|
|
|
|
|
|
%clean
|
|
|
%{__rm} -rf ${RPM_BUILD_ROOT}
|
|
|
|
|
|
|
|
|
-%post
|
|
|
+%post
|
|
|
%if 0%{?INFO}
|
|
|
# Create directory entries for info files
|
|
|
# (optional doc files, so we must check that they are installed)
|
|
|
@@ -201,7 +204,7 @@ cp -a doc/html/logosm.jpg ${RPM_BUILD_ROOT}%{_datadir}/icons/
|
|
|
%{_syssbindir}/ldconfig
|
|
|
|
|
|
|
|
|
-%preun
|
|
|
+%preun
|
|
|
%if 0%{?INFO}
|
|
|
if [ $1 = 0 ]; then
|
|
|
# Delete directory entries for info files (if they were installed)
|
|
|
@@ -251,6 +254,23 @@ cp -a doc/html/logosm.jpg ${RPM_BUILD_ROOT}%{_datadir}/icons/
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Sun Apr 10 2016 Toshiaki Ara <ara_t@384.jp> 3.2.4-3
|
|
|
+- correct SPEC file
|
|
|
+
|
|
|
+* Thu Mar 17 2016 Toshiaki Ara <ara_t@384.jp> 3.2.4-2
|
|
|
+- Updated to 3.2.4-revised
|
|
|
+
|
|
|
+* Fri Mar 11 2016 Toshiaki Ara <ara_t@384.jp> 3.2.4-1
|
|
|
+- Updated to 3.2.4
|
|
|
+- fixed build error in src/extra/xz
|
|
|
+
|
|
|
+* Fri Jan 01 2016 Toshiaki Ara <ara_t@384.jp> 3.2.3-2
|
|
|
+- add BuildRequires: curl-devel
|
|
|
+- add BuildRequires: libgomp
|
|
|
+
|
|
|
+* Sun Dec 13 2015 Toshiaki Ara <ara_t@384.jp> 3.2.3-1
|
|
|
+- Updated to 3.2.3
|
|
|
+
|
|
|
* Mon Nov 09 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.2.2-2
|
|
|
- rebuild with icu-56.1
|
|
|
|
ara_t