Browse Source

rstudio(-server): update to 1.1.456

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@11770 ec354946-7b23-47d6-9f5a-488ba84defc7
ara_t 5 years ago
parent
commit
6082103c04
2 changed files with 20 additions and 12 deletions
  1. 9 5
      r/rstudio-server/rstudio-server-vl.spec
  2. 11 7
      r/rstudio/rstudio-vl.spec

+ 9 - 5
r/rstudio-server/rstudio-server-vl.spec

@@ -1,4 +1,4 @@
-%define pkg_version 1.1.412
+%define pkg_version 1.1.456
 %define pkg_release 1%{?_dist_release}
 
 Summary:     An integrated development environment (IDE) for R
@@ -16,8 +16,8 @@ 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
+# 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
@@ -129,8 +129,8 @@ pushd dependencies/common
  sh install-dictionaries;
  sh install-mathjax;
  sh install-libclang;
- %{__tar} xzf %{SOURCE13}
- %{__tar} xzf %{SOURCE14}
+ # %{__tar} xzf %{SOURCE13}
+ # %{__tar} xzf %{SOURCE14}
  sh install-packages;
 popd
 
@@ -198,6 +198,10 @@ fi
 
 
 %changelog
+* Sun Aug 19 2018 Toshiaki Ara <ara_t@384.jp> 1.1.456-1
+- new upstream release
+- drop SOURCE13 and SOURCE14
+
 * Fri Jan 12 2018 Toshiaki Ara <ara_t@384.jp> 1.1.412-1
 - new upstream release
 - add BuildRequires: libboost-random

+ 11 - 7
r/rstudio/rstudio-vl.spec

@@ -1,4 +1,4 @@
-%define pkg_version 1.1.412
+%define pkg_version 1.1.456
 %define pkg_release 1%{?_dist_release}
 
 Summary:     An integrated development environment (IDE) for R
@@ -14,8 +14,8 @@ Source0: rstudio-%{version}.tar.gz
 
 Source1: core-dictionaries.zip
 Source2: mathjax-26.zip
-Source3: rsconnect_0.4.3.tar.gz
-Source4: rmarkdown_1.0.9002.tar.gz
+# Source3: rsconnect_0.4.3.tar.gz
+# Source4: rmarkdown_1.0.9002.tar.gz
 
 # patch to avoid download necessary files
 Patch1: rstudio-dependencies_common_not_download.patch
@@ -129,8 +129,8 @@ pushd dependencies/common
  sh install-dictionaries;
  sh install-mathjax;
  sh install-libclang;
- %{__tar} xzf %{SOURCE3}
- %{__tar} xzf %{SOURCE4}
+ # %{__tar} xzf %{SOURCE3}
+ # %{__tar} xzf %{SOURCE4}
  sh install-packages;
 popd
 
@@ -167,6 +167,10 @@ echo "%{_libdir}/rstudio/bin/rstudio" > ${RPM_BUILD_ROOT}%{_bindir}/rstudio
 
 
 %changelog
+* Sun Aug 19 2018 Toshiaki Ara <ara_t@384.jp> 1.1.456-1
+- new upstream release
+- drop SOURCE13 and SOURCE14
+
 * Fri Jan 12 2018 Toshiaki Ara <ara_t@384.jp> 1.1.412-1
 - new upstream release
 - add BuildRequires: libboost-random
@@ -174,8 +178,8 @@ echo "%{_libdir}/rstudio/bin/rstudio" > ${RPM_BUILD_ROOT}%{_bindir}/rstudio
 - update Patches
 
 * Thu Aug 04 2016 Toshiaki Ara <ara_t@384.jp> 0.99.1274-2
-  - correct package desctiption
+- correct package desctiption
 
 * Thu Aug 04 2016 Toshiaki Ara <ara_t@384.jp> 0.99.1274-1
-  - new package
+- new package