rstudio: update to 1.1.412

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

r/rstudio/rstudio-vl.spec

@@ -1,5 +1,5 @@
-%define pkg_version 0.99.1274
-%define pkg_release 2%{?_dist_release}
+%define pkg_version 1.1.412
+%define pkg_release 1%{?_dist_release}
 
 Summary:     An integrated development environment (IDE) for R
 Summary(ja): Rのための統合開発環境
@@ -18,22 +18,28 @@ Source3: rsconnect_0.4.3.tar.gz
 Source4: rmarkdown_1.0.9002.tar.gz
 
 # patch to avoid download necessary files
-Patch1: dependencies_common.patch
-# patch to use system qt5
-Patch2: desktop_CMakeLists.txt.patch
+Patch1: rstudio-dependencies_common_not_download.patch
+
 # patches to use system pandoc
-Patch3: rsession-dev.conf.patch
-Patch4: SessionOptions.cpp.patch
-Patch5: session_CMakeLists.txt.patch
+Patch2: rstudio-rsession-dev.conf.patch
+Patch3: rstudio-SessionOptions.cpp.patch
+Patch4: rstudio-session_CMakeLists.txt.patch
+
+# patch to use system qt5
+Patch5: rstudio-desktop_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: gcc-gfortran
+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
@@ -42,50 +48,37 @@ 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
+
+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
+
 BuildRequires: qt5-qtbase-devel
 BuildRequires: qt5-qtlocation-devel
 BuildRequires: qt5-qtsensors-devel
 BuildRequires: qt5-qtsvg-devel
 BuildRequires: qt5-qtxmlpatterns-devel
+BuildRequires: qt5-qtwebchannel-devel
 BuildRequires: qt5-qtwebkit-devel
 
-Requires: R >= 2.11.1
-Requires: R-rgl
+Requires: R >= 3.4
 Requires: pandoc pandoc-citeproc
-Requires: java-1.7.0-openjdk
+Requires: java >= 1.7
 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
-Requires: qt5-qtbase
-Requires: qt5-qtlocation
-Requires: qt5-qtsensors
-Requires: qt5-qtsvg
-Requires: qt5-qtxmlpatterns
-Requires: qt5-qtwebkit
+
 
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -107,11 +100,20 @@ RStudio™ はRのための新しい統合開発環境(IDE)です。RStudioは
 %prep
 %{__rm} -rf ${RPM_BUILD_ROOT}
 %setup -q
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
+
+# patch to avoid download necessary files
+%patch1
+
+# patches to use system pandoc
+%patch2
+%patch3
+%patch4
+
+# patch to use system qt5
+%patch5
+
+# patch to change default settings
+%patch10
 
 %{__cp} /usr/src/rstudio-gwt/* \
  %{_builddir}/%{name}-%{version}/dependencies/common
@@ -122,7 +124,7 @@ RStudio™ はRのための新しい統合開発環境(IDE)です。RStudioは
  %{SOURCE1} %{SOURCE2} \
  %{_builddir}/%{name}-%{version}/dependencies/common
 
-(cd dependencies/common;
+pushd dependencies/common
  sh install-gwt;
  sh install-dictionaries;
  sh install-mathjax;
@@ -130,7 +132,7 @@ RStudio™ はRのための新しい統合開発環境(IDE)です。RStudioは
  %{__tar} xzf %{SOURCE3}
  %{__tar} xzf %{SOURCE4}
  sh install-packages;
-)
+popd
 
 cmake . \
       -DRSTUDIO_TARGET=Desktop \
@@ -149,6 +151,10 @@ echo "%{_libdir}/rstudio/bin/rstudio" > ${RPM_BUILD_ROOT}%{_bindir}/rstudio
 %clean
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
+%post -p %{_syssbindir}/ldconfig
+
+%postun -p %{_syssbindir}/ldconfig
+
 
 %files
 %defattr(-, root, root)
@@ -161,6 +167,12 @@ echo "%{_libdir}/rstudio/bin/rstudio" > ${RPM_BUILD_ROOT}%{_bindir}/rstudio
 
 
 %changelog
+* Fri Jan 12 2018 Toshiaki Ara <ara_t@384.jp> 1.1.412-1
+- new upstream release
+- add BuildRequires: libboost-random
+- add BuildRequires: qt5-qtwebchannel-devel
+- update Patches
+
 * Thu Aug 04 2016 Toshiaki Ara <ara_t@384.jp> 0.99.1274-2
   - correct package desctiption