rstudio-server: update to 1.1.412

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

r/rstudio-server/rstudio-server-vl.spec

@@ -1,4 +1,4 @@
-%define pkg_version 0.99.1274
+%define pkg_version 1.1.412
 %define pkg_release 1%{?_dist_release}
 
 Summary:     An integrated development environment (IDE) for R
@@ -20,19 +20,25 @@ Source13: rsconnect_0.4.3.tar.gz
 Source14: rmarkdown_1.0.9002.tar.gz
 
 # patch to avoid download necessary files
-Patch1: dependencies_common.patch
+Patch1: rstudio-dependencies_common_not_download.patch
+
 # patches to use system pandoc
-Patch2: rsession-dev.conf.patch
-Patch3: SessionOptions.cpp.patch
-Patch4: session_CMakeLists.txt.patch
+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
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 BuildRequires: rstudio-gwt
 BuildRequires: rstudio-chromedriver
-BuildRequires: cmake >= 2.8
-BuildRequires: R >= 2.11.1
+BuildRequires: cmake
+BuildRequires: R >= 3.4
 BuildRequires: pandoc pandoc-citeproc
+
+# java-1.7.0-openjdk-devel is needed
 BuildRequires: java-1.7.0-openjdk-devel
 BuildRequires: ant
 BuildRequires: xml-commons-apis
@@ -41,37 +47,28 @@ BuildRequires: openssl-devel
 BuildRequires: pam-devel
 BuildRequires: pango-devel
 BuildRequires: bzip2-devel zlib-devel
-BuildRequires: libboost-devel >= 1.50
-BuildRequires: libboost >= 1.50
-BuildRequires: libboost-atomic >= 1.50
-BuildRequires: libboost-date-time >= 1.50
-BuildRequires: libboost-filesystem >= 1.50
-BuildRequires: libboost-iostreams >= 1.50
-BuildRequires: libboost-program-options >= 1.50
-BuildRequires: libboost-regex >= 1.50
-BuildRequires: libboost-signals >= 1.50
-BuildRequires: libboost-system >= 1.50
-BuildRequires: libboost-thread >= 1.50
-BuildRequires: libboost-chrono >= 1.50
-
-Requires: R >= 2.11.1
+
+BuildRequires: libboost-devel
+BuildRequires: libboost
+BuildRequires: libboost-atomic
+BuildRequires: libboost-date-time
+BuildRequires: libboost-filesystem
+BuildRequires: libboost-iostreams
+BuildRequires: libboost-program-options
+BuildRequires: libboost-random
+BuildRequires: libboost-regex
+BuildRequires: libboost-signals
+BuildRequires: libboost-system
+BuildRequires: libboost-thread
+BuildRequires: libboost-chrono
+
+Requires: R >= 3.4
 Requires: pandoc pandoc-citeproc
-Requires: java-1.7.0-openjdk
+Requires: java >= 1.7.0
 Requires: libuuid
 Requires: openssl
 Requires: pam
 Requires: pango
-Requires: libboost >= 1.50
-Requires: libboost-atomic >= 1.50
-Requires: libboost-date-time >= 1.50
-Requires: libboost-filesystem >= 1.50
-Requires: libboost-iostreams >= 1.50
-Requires: libboost-program-options >= 1.50
-Requires: libboost-regex >= 1.50
-Requires: libboost-signals >= 1.50
-Requires: libboost-system >= 1.50
-Requires: libboost-thread >= 1.50
-Requires: libboost-chrono >= 1.50
 
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -106,10 +103,17 @@ Rのバージョンに対してブラウザベースのインタフェイス(the
 %prep
 %{__rm} -rf ${RPM_BUILD_ROOT}
 %setup -q -n rstudio-%{version}
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
+
+# patch to avoid download necessary files
+%patch1
+
+# patches to use system pandoc
+%patch2
+%patch3
+%patch4
+
+# patch to change default settings
+%patch10
 
 %{__cp} /usr/src/rstudio-gwt/* \
  %{_builddir}/rstudio-%{version}/dependencies/common
@@ -120,7 +124,7 @@ Rのバージョンに対してブラウザベースのインタフェイス(the
  %{SOURCE11} %{SOURCE12} \
  %{_builddir}/rstudio-%{version}/dependencies/common
 
-(cd dependencies/common;
+pushd dependencies/common
  sh install-gwt;
  sh install-dictionaries;
  sh install-mathjax;
@@ -128,7 +132,7 @@ Rのバージョンに対してブラウザベースのインタフェイス(the
  %{__tar} xzf %{SOURCE13}
  %{__tar} xzf %{SOURCE14}
  sh install-packages;
-)
+popd
 
 cmake . \
       -DRSTUDIO_TARGET=Server \
@@ -185,7 +189,7 @@ fi
 
 %files
 %defattr(-, root, root)
-%doc COPYING NOTICE
+%doc COPYING NOTICE *.md
 %{_sysconfdir}/init.d/rstudio-server
 %{_sysconfdir}/pam.d/rstudio
 %{_sysconfdir}/rstudio/
@@ -194,6 +198,11 @@ fi
 
 
 %changelog
+* Fri Jan 12 2018 Toshiaki Ara <ara_t@384.jp> 1.1.412-1
+- new upstream release
+- add BuildRequires: libboost-random
+- update Patches
+
 * Fri Aug 05 2016 Toshiaki Ara <ara_t@384.jp> 0.99.1274-1
-  - new package
+- new package