|
|
@@ -1,7 +1,7 @@
|
|
|
-%define pkg_version 1.1.463
|
|
|
+%define pkg_version 1.2.5001
|
|
|
%define pkg_release 1%{?_dist_release}
|
|
|
|
|
|
-Summary: An integrated development environment (IDE) for R
|
|
|
+Summary:Summary: An integrated development environment (IDE) for R
|
|
|
Summary(ja): Rのための統合開発環境（サーバ版）
|
|
|
Name: rstudio-server
|
|
|
Version: %{pkg_version}
|
|
|
@@ -16,31 +16,25 @@ Source2: rsession.conf
|
|
|
|
|
|
Source11: core-dictionaries.zip
|
|
|
Source12: mathjax-26.zip
|
|
|
-# Source13: rsconnect_0.4.3.tar.gz
|
|
|
-# Source14: rmarkdown_1.0.9002.tar.gz
|
|
|
|
|
|
# patch to avoid download necessary files
|
|
|
-Patch1: rstudio-dependencies_common_not_download.patch
|
|
|
+Patch1: rstudio-1.2-dependencies_common_not_download.patch
|
|
|
|
|
|
# patches to use system pandoc
|
|
|
-Patch2: rstudio-rsession-dev.conf.patch
|
|
|
-Patch3: rstudio-SessionOptions.cpp.patch
|
|
|
-Patch4: rstudio-session_CMakeLists.txt.patch
|
|
|
-
|
|
|
-# patch to change default settings
|
|
|
-Patch10: rstudio-change_default_settings.patch
|
|
|
+Patch2: rstudio-1.2-rsession-dev.conf.patch
|
|
|
+Patch3: rstudio-1.2-SessionOptions.cpp.patch
|
|
|
+Patch4: rstudio-1.2-session_CMakeLists.txt.patch
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
|
|
|
|
-BuildRequires: rstudio-gwt
|
|
|
-BuildRequires: rstudio-chromedriver
|
|
|
BuildRequires: cmake
|
|
|
-BuildRequires: R >= 3.4
|
|
|
+BuildRequires: rstudio-gwt >= 1.2
|
|
|
+BuildRequires: R >= 3.6
|
|
|
BuildRequires: pandoc pandoc-citeproc
|
|
|
|
|
|
-# java-1.7.0-openjdk-devel is needed
|
|
|
-BuildRequires: java-1.7.0-openjdk-devel
|
|
|
-BuildRequires: ant
|
|
|
+# java-1.8.0-openjdk-devel is needed
|
|
|
+BuildRequires: java-1.8.0-openjdk-devel
|
|
|
+BuildRequires: ant >= 1.9
|
|
|
BuildRequires: xml-commons-apis
|
|
|
BuildRequires: libuuid-devel
|
|
|
BuildRequires: openssl-devel
|
|
|
@@ -48,6 +42,7 @@ BuildRequires: pam-devel
|
|
|
BuildRequires: pango-devel
|
|
|
BuildRequires: bzip2-devel zlib-devel
|
|
|
|
|
|
+# libboost >= 1.63.0
|
|
|
BuildRequires: libboost-devel
|
|
|
BuildRequires: libboost
|
|
|
BuildRequires: libboost-atomic
|
|
|
@@ -62,13 +57,10 @@ BuildRequires: libboost-system
|
|
|
BuildRequires: libboost-thread
|
|
|
BuildRequires: libboost-chrono
|
|
|
|
|
|
-Requires: R >= 3.4
|
|
|
+Requires: R
|
|
|
Requires: pandoc pandoc-citeproc
|
|
|
-Requires: java >= 1.7.0
|
|
|
-Requires: libuuid
|
|
|
-Requires: openssl
|
|
|
-Requires: pam
|
|
|
-Requires: pango
|
|
|
+Requires: java-1.8.0-openjdk
|
|
|
+
|
|
|
|
|
|
Vendor: Project Vine
|
|
|
Distribution: Vine Linux
|
|
|
@@ -112,13 +104,8 @@ Rのバージョンに対してブラウザベースのインタフェイス(the
|
|
|
%patch3
|
|
|
%patch4
|
|
|
|
|
|
-# patch to change default settings
|
|
|
-%patch10
|
|
|
-
|
|
|
%{__cp} /usr/src/rstudio-gwt/* \
|
|
|
%{_builddir}/rstudio-%{version}/dependencies/common
|
|
|
-%{__cp} /usr/src/rstudio-chromedriver/* \
|
|
|
- %{_builddir}/rstudio-%{version}/dependencies/common
|
|
|
|
|
|
%{__cp} \
|
|
|
%{SOURCE11} %{SOURCE12} \
|
|
|
@@ -128,20 +115,22 @@ pushd dependencies/common
|
|
|
sh install-gwt;
|
|
|
sh install-dictionaries;
|
|
|
sh install-mathjax;
|
|
|
- sh install-libclang;
|
|
|
- # %{__tar} xzf %{SOURCE13}
|
|
|
- # %{__tar} xzf %{SOURCE14}
|
|
|
- sh install-packages;
|
|
|
popd
|
|
|
|
|
|
-cmake . \
|
|
|
+%build
|
|
|
+%{__mkdir_p} build
|
|
|
+pushd build
|
|
|
+cmake .. \
|
|
|
-DRSTUDIO_TARGET=Server \
|
|
|
-DCMAKE_BUILD_TYPE=Release \
|
|
|
-DCMAKE_INSTALL_PREFIX=%{_libdir}/rstudio-server
|
|
|
%{__make} %{?_smp_mflags}
|
|
|
+popd
|
|
|
|
|
|
%install
|
|
|
+pushd build
|
|
|
%{make_install}
|
|
|
+popd
|
|
|
|
|
|
# make symbolic link
|
|
|
%{__mkdir_p} ${RPM_BUILD_ROOT}%{_sbindir}
|
|
|
@@ -198,6 +187,9 @@ fi
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Mon Oct 28 2019 Toshiaki Ara <ara_t@384.jp> 1.2.5000-1
|
|
|
+- update to 1.2.5001
|
|
|
+
|
|
|
* Fri Nov 16 2018 Toshiaki Ara <ara_t@384.jp> 1.1.463-1
|
|
|
- new upstream release
|
|
|
|
ara_t