Hello community,

here is the log from the commit of package rstudio for openSUSE:Factory checked 
in at 2020-01-27 20:18:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rstudio (Old)
 and      /work/SRC/openSUSE:Factory/.rstudio.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "rstudio"

Mon Jan 27 20:18:57 2020 rev:3 rq:767798 version:1.2.5033

Changes:
--------
--- /work/SRC/openSUSE:Factory/rstudio/rstudio.changes  2020-01-20 
22:54:08.943313609 +0100
+++ /work/SRC/openSUSE:Factory/.rstudio.new.26092/rstudio.changes       
2020-01-27 20:19:14.776588779 +0100
@@ -1,0 +2,24 @@
+Mon Jan 27 13:27:43 UTC 2020 - Dan Čermák <dcer...@suse.com>
+
+- Add rstudio-server and rstudio-desktop subpackages
+
+- Rebase patches:
+  * 0001-First-pass-at-Boost-1.70-support.patch
+  * 0002-Bump-bundled-gwt-version.patch
+  * 0003-Remove-boost-signals-from-the-required-Boost-librari.patch
+  * 0004-Unbundle-mathjax-and-pandoc.patch
+  * 0005-Use-find_program-to-find-qmake-if-it-is-not-in-the-p.patch
+  * 0006-Use-std-thread-instead-of-QThread-for-Qt-5.10-suppor.patch
+  * 0007-Add-explicit-include-mutex-for-gcc-7-to-DesktopWebpa.patch
+  * 0008-Remove-PauseChanged-related-handler-from-DownloadHel.patch
+  * 0009-Don-t-install-pandoc-and-mathjax.patch
+  * 0010-Fix-rstudio-exec-path.patch
+
+-------------------------------------------------------------------
+Tue Jan 21 08:48:05 UTC 2020 - Marco Varlese <marco.varl...@suse.com>
+
+- Added 0010-Fix-rstudio-exec-path.patch:
+  Fix an issue with R-Studio when being executed in an AppImage
+  scope due to the use of absolute path.
+
+-------------------------------------------------------------------

New:
----
  0010-Fix-rstudio-exec-path.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ rstudio.spec ++++++
--- /var/tmp/diff_new_pack.KXmvSE/_old  2020-01-27 20:19:17.580590491 +0100
+++ /var/tmp/diff_new_pack.KXmvSE/_new  2020-01-27 20:19:17.580590491 +0100
@@ -18,22 +18,19 @@
 
 %global bundled_gwt_version 2.8.2
 %global bundled_gin_version 2.1.2
-
 # !no longer bundled!
 # but upstream expects them in specific locations, so we keep these macros 
around
 %global bundled_mathjax_version 2.6.1
 %global bundled_mathjax_short_version 26
-
 %global rstudio_version_major 1
 %global rstudio_version_minor 2
 %global rstudio_version_patch 5033
 # commit of the tag belonging to %%{version}
 %global rstudio_git_revision_hash 330255ddec489e7a147ace3e8a9a3e4157d8d5ad
-
 Name:           rstudio
 Version:        
%{rstudio_version_major}.%{rstudio_version_minor}.%{rstudio_version_patch}
 Release:        0
-Summary:        R-Studio Desktop
+Summary:        RStudio base package
 # R-Studio: AGPL 3.0
 # GWT: Apache License 2.0
 # gin: Apache License 2.0
@@ -41,7 +38,6 @@
 License:        AGPL-3.0-only AND Apache-2.0 AND MPL-1.1 AND LGPL-2.1-or-later 
AND GPL-2.0-only
 URL:            https://github.com/%{name}/
 Source0:        %{URL}/%{name}/archive/v%{version}.tar.gz
-
 # these appear to have been taken from Chromium's source code, see:
 # 
https://raw.githubusercontent.com/rstudio/rstudio/master/dependencies/tools/sync-hunspell-dictionaries
 # upstream source:
@@ -53,7 +49,6 @@
 Source2:        
https://s3.amazonaws.com/%{name}-buildtools/gwt-%{bundled_gwt_version}.zip
 Source3:        
https://s3.amazonaws.com/%{name}-buildtools/gin-%{bundled_gin_version}.zip
 Source99:       %{name}-rpmlintrc
-
 Patch0:         0003-Remove-boost-signals-from-the-required-Boost-librari.patch
 Patch1:         0005-Use-find_program-to-find-qmake-if-it-is-not-in-the-p.patch
 Patch2:         0002-Bump-bundled-gwt-version.patch
@@ -67,7 +62,7 @@
 Patch7:         0008-Remove-PauseChanged-related-handler-from-DownloadHel.patch
 # shorten the installation time a bit by not installing mathjax
 Patch8:         0009-Don-t-install-pandoc-and-mathjax.patch
-
+Patch9:         0010-Fix-rstudio-exec-path.patch
 BuildRequires:  Mesa-devel
 BuildRequires:  R-core-devel
 BuildRequires:  ant
@@ -77,12 +72,11 @@
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
 BuildRequires:  gcc-fortran
+BuildRequires:  ghc-pandoc-citeproc
 BuildRequires:  glibc-devel
-BuildRequires:  java
-BuildRequires:  memory-constraints
 # for dir ownership of /usr/share/icons/hicolor/*
 BuildRequires:  hicolor-icon-theme
-
+BuildRequires:  java
 BuildRequires:  libboost_atomic-devel
 BuildRequires:  libboost_chrono-devel
 BuildRequires:  libboost_date_time-devel
@@ -95,20 +89,13 @@
 BuildRequires:  libboost_system-devel
 BuildRequires:  libboost_thread-devel
 BuildRequires:  libqt5-qtbase-devel
-BuildRequires:  pkgconfig(bzip2)
-BuildRequires:  pkgconfig(libxslt)
-BuildRequires:  pkgconfig(openssl)
-BuildRequires:  pkgconfig(uuid)
-
-BuildRequires:  ghc-pandoc-citeproc
 BuildRequires:  make
 BuildRequires:  mathjax
+BuildRequires:  memory-constraints
 BuildRequires:  pam-devel
 BuildRequires:  pandoc
+BuildRequires:  pkgconfig
 BuildRequires:  unzip
-BuildRequires:  pkgconfig(pango)
-BuildRequires:  pkgconfig(zlib)
-
 BuildRequires:  pkgconfig(Qt5Core)
 BuildRequires:  pkgconfig(Qt5DBus)
 BuildRequires:  pkgconfig(Qt5Gui)
@@ -128,23 +115,54 @@
 BuildRequires:  pkgconfig(Qt5Widgets)
 BuildRequires:  pkgconfig(Qt5Xml)
 BuildRequires:  pkgconfig(Qt5XmlPatterns)
-
-Provides:       bundled(gin) = %{bundled_gin_version}
-Provides:       bundled(gwt) = %{bundled_gwt_version}
-
+BuildRequires:  pkgconfig(bzip2)
+BuildRequires:  pkgconfig(libxslt)
+BuildRequires:  pkgconfig(openssl)
+BuildRequires:  pkgconfig(pango)
+BuildRequires:  pkgconfig(uuid)
+BuildRequires:  pkgconfig(zlib)
 Requires:       R-base
 Requires:       R-core-libs
 Requires:       ghc-pandoc-citeproc
 Requires:       mathjax
 Requires:       pandoc
+Suggests:       rstudio-desktop
+Suggests:       rstudio-server
+Provides:       bundled(gin) = %{bundled_gin_version}
+Provides:       bundled(gwt) = %{bundled_gwt_version}
 
 %description
-RStudio is a set of integrated tools designed to help you be more productive
-with R.
+This package provides the common files of RStudio Desktop and RStudio server.
 
-It includes a console, syntax-highlighting editor that supports direct code
-execution, and a variety of robust tools for plotting, viewing history,
-debugging and managing your workspace.
+%package        desktop
+Summary:        Integrated development environment for the R programming 
language
+%requires_eq    %{name}
+
+%description    desktop
+RStudio is an integrated development environment (IDE) for the R programming
+language. Some of its features include:
+
+- Customizable workbench with all of the tools required to work with R in one
+  place (console, source, plots, workspace, help, history, etc.).
+- Syntax highlighting editor with code completion.
+- Execute code directly from the source editor (line, selection, or file).
+- Full support for authoring Sweave and TeX documents.
+
+%package        server
+Summary:        Access RStudio via a web browser running on a remote server
+%requires_eq    %{name}
+
+%description    server
+RStudio Server enables you to provide a browser-based interface (the RStudio
+IDE) to a version of R running on a remote Linux server. Deploying R and 
RStudio
+on a server has a number of benefits, including:
+
+- The ability to access your R workspace from any computer in any location
+- Easy sharing of code, data, and other files with colleagues
+- Allowing multiple users to share access to the more powerful compute 
resources
+  (memory, processors, etc.) available on a well-equipped server
+- Centralized installation and configuration of R, R packages, TeX, and other
+  supporting libraries
 
 %prep
 %autosetup -N
@@ -153,6 +171,7 @@
 %patch2 -p1
 %patch4 -p1
 %patch8 -p1
+%patch9 -p1
 
 # TW & Leap 15.2 specific patches
 %if 0%{?suse_version} > 1500 || 0%{?sle_version} == 150200
@@ -182,7 +201,7 @@
 export RSTUDIO_VERSION_PATCH=%{rstudio_version_patch}
 export RSTUDIO_GIT_REVISION_HASH=%{rstudio_git_revision_hash}
 export GIT_COMMIT=%{rstudio_git_revision_hash}
-%cmake -DRSTUDIO_TARGET=Desktop -DCMAKE_BUILD_TYPE=Release 
-DRSTUDIO_BOOST_SIGNALS_VERSION=2 -DCMAKE_INSTALL_PREFIX=%{_libexecdir}/rstudio
+%cmake -DRSTUDIO_TARGET=Desktop -DRSTUDIO_SERVER=TRUE 
-DCMAKE_BUILD_TYPE=Release -DRSTUDIO_BOOST_SIGNALS_VERSION=2 
-DCMAKE_INSTALL_PREFIX=%{_libexecdir}/%{name}
 
 # dirty hack:
 # gwtc compilation runs via make -> ant -> java and something in that chain
@@ -194,14 +213,17 @@
 # is not enough to OOM the machine. We don't add an addional make call here,
 # because the gwt compilation is *always* re-run on make (i.e. it will run 
again
 # in %%cmake_install), so adding that would be a waste of resources.
-%make_build rstudio rsession rpostback rstudio-core rstudio-monitor rstudio-r 
rstudio-session-workers diagnostics
+%make_build rstudio rsession rpostback rstudio-core rstudio-monitor rstudio-r 
rstudio-session-workers diagnostics rserver rserver-pam
 
 %install
 # fun fact: this recompiles gwt…
 %cmake_install
 
+# create /usr/bin/rstudio-desktop, /usr/bin/rserver, /usr/bin/rserver-pam
 install -d -m 0755 %{buildroot}%{_bindir}
-ln -s %{_libexecdir}/%{name}/bin/%{name} %{buildroot}%{_bindir}/%{name}
+for binary in %{name} rserver rserver-pam; do
+    ln -s %{_libexecdir}/%{name}/bin/${binary} %{buildroot}%{_bindir}/${binary}
+done
 
 # symlink the location where the bundled mathjax should be to
 # /usr/share/javascript/mathjax as mathjax-%%{bundled_mathjax_short_version}
@@ -225,7 +247,7 @@
 BASH_PATH=$(which bash)
 for f in postback/askpass-passthrough postback/rpostback-askpass 
postback/rpostback-editfile postback/rpostback-gitssh 
postback/rpostback-pdfviewer r-ldpath rstudio-backtrace.sh; do
     full_path=%{buildroot}%{_libexecdir}/%{name}/bin/$f
-    sed -i.orig 's:^#\!/usr/bin/env\s\+bash\s\?$:#\!'"${BASH_PATH}"':' 
$full_path
+    sed -i.orig 's:^#\!%{_bindir}/env\s\+bash\s\?$:#\!'"${BASH_PATH}"':' 
$full_path
     touch -r $full_path.orig $full_path
     rm $full_path.orig
 done
@@ -233,12 +255,18 @@
 %files
 %license COPYING
 %doc NOTICE README.md
+%{_libexecdir}/rstudio
+
+%files desktop
 %{_bindir}/%{name}
-%{_libexecdir}/%{name}
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/*
 %{_datadir}/icons/hicolor/*/mimetypes/*
 %{_datadir}/mime/packages/%{name}.xml
 %{_datadir}/pixmaps/%{name}.png
 
+%files server
+%{_bindir}/rserver
+%{_bindir}/rserver-pam
+
 %changelog

++++++ 0001-First-pass-at-Boost-1.70-support.patch ++++++
--- /var/tmp/diff_new_pack.KXmvSE/_old  2020-01-27 20:19:17.596590501 +0100
+++ /var/tmp/diff_new_pack.KXmvSE/_new  2020-01-27 20:19:17.600590503 +0100
@@ -1,7 +1,7 @@
 From 1fb2258dc456ecbbdecc9b366ba4a6758e4e0421 Mon Sep 17 00:00:00 2001
 From: Kevin Ushey <kevinus...@gmail.com>
 Date: Tue, 3 Sep 2019 13:23:23 -0700
-Subject: [PATCH 1/9] First pass at Boost 1.70 support
+Subject: [PATCH 01/10] First pass at Boost 1.70 support
 
 ---
  src/cpp/core/include/core/http/TcpIpAsyncConnector.hpp |  6 ++++--
@@ -104,5 +104,5 @@
          m_state = READY;
  
 -- 
-2.24.1
+2.25.0
 

++++++ 0002-Bump-bundled-gwt-version.patch ++++++
--- /var/tmp/diff_new_pack.KXmvSE/_old  2020-01-27 20:19:17.608590508 +0100
+++ /var/tmp/diff_new_pack.KXmvSE/_new  2020-01-27 20:19:17.608590508 +0100
@@ -1,7 +1,7 @@
 From 6ec5616ce3dbbd059aff4012599f2706f6e6fb1a Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcer...@suse.com>
 Date: Mon, 13 Jan 2020 10:43:27 +0100
-Subject: [PATCH 2/9] Bump bundled gwt version
+Subject: [PATCH 02/10] Bump bundled gwt version
 
 ---
  src/gwt/build.xml | 2 +-
@@ -21,5 +21,5 @@
     <property name="gwt.extra.args" value=""/>
     <property name="gwt.main.module" value="org.rstudio.studio.RStudio"/>
 -- 
-2.24.1
+2.25.0
 

++++++ 0003-Remove-boost-signals-from-the-required-Boost-librari.patch ++++++
--- /var/tmp/diff_new_pack.KXmvSE/_old  2020-01-27 20:19:17.616590513 +0100
+++ /var/tmp/diff_new_pack.KXmvSE/_new  2020-01-27 20:19:17.616590513 +0100
@@ -1,7 +1,7 @@
 From 933b8de98363f190033b78febe6c0fce0845c592 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcer...@suse.com>
 Date: Mon, 13 Jan 2020 10:45:46 +0100
-Subject: [PATCH 3/9] Remove boost-signals from the required Boost libraries
+Subject: [PATCH 03/10] Remove boost-signals from the required Boost libraries
 
 ---
  src/cpp/CMakeLists.txt | 1 -
@@ -20,5 +20,5 @@
     thread
  )
 -- 
-2.24.1
+2.25.0
 

++++++ 0004-Unbundle-mathjax-and-pandoc.patch ++++++
--- /var/tmp/diff_new_pack.KXmvSE/_old  2020-01-27 20:19:17.624590518 +0100
+++ /var/tmp/diff_new_pack.KXmvSE/_new  2020-01-27 20:19:17.624590518 +0100
@@ -1,7 +1,7 @@
 From 281a613295988be038f61b4198b6f513aad9f963 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcer...@suse.com>
 Date: Mon, 13 Jan 2020 11:27:06 +0100
-Subject: [PATCH 4/9] Unbundle mathjax and pandoc
+Subject: [PATCH 04/10] Unbundle mathjax and pandoc
 
 Use find_file() & find_program() functions to find the dependencies in the
 dependencies/ subdirectory first. If they are not there, use the system paths
@@ -71,5 +71,5 @@
             PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ 
GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
             DESTINATION  ${RSTUDIO_INSTALL_BIN}/pandoc)
 -- 
-2.24.1
+2.25.0
 

++++++ 0005-Use-find_program-to-find-qmake-if-it-is-not-in-the-p.patch ++++++
--- /var/tmp/diff_new_pack.KXmvSE/_old  2020-01-27 20:19:17.632590523 +0100
+++ /var/tmp/diff_new_pack.KXmvSE/_new  2020-01-27 20:19:17.632590523 +0100
@@ -1,7 +1,7 @@
 From aa586f80119eb0ba639bf620c8b4eb426df456c7 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcer...@suse.com>
 Date: Mon, 13 Jan 2020 13:08:59 +0100
-Subject: [PATCH 5/9] Use find_program to find qmake if it is not in the
+Subject: [PATCH 05/10] Use find_program to find qmake if it is not in the
  predefined path in /opt/
 
 ---
@@ -27,5 +27,5 @@
     message(STATUS "Found Qt: ${QT_QMAKE_EXECUTABLE}")
  else()
 -- 
-2.24.1
+2.25.0
 

++++++ 0006-Use-std-thread-instead-of-QThread-for-Qt-5.10-suppor.patch ++++++
--- /var/tmp/diff_new_pack.KXmvSE/_old  2020-01-27 20:19:17.640590528 +0100
+++ /var/tmp/diff_new_pack.KXmvSE/_new  2020-01-27 20:19:17.640590528 +0100
@@ -1,7 +1,8 @@
 From abe4dd26e0cbfbf0811a59b04d018c0786ea18b4 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcer...@suse.com>
 Date: Mon, 13 Jan 2020 15:05:12 +0100
-Subject: [PATCH 6/9] Use std::thread instead of QThread for Qt < 5.10 support
+Subject: [PATCH 06/10] Use std::thread instead of QThread for Qt < 5.10
+ support
 
 ---
  src/cpp/desktop/DesktopInfo.cpp | 12 ++++++------
@@ -54,5 +55,5 @@
  #endif
  }
 -- 
-2.24.1
+2.25.0
 

++++++ 0007-Add-explicit-include-mutex-for-gcc-7-to-DesktopWebpa.patch ++++++
--- /var/tmp/diff_new_pack.KXmvSE/_old  2020-01-27 20:19:17.652590535 +0100
+++ /var/tmp/diff_new_pack.KXmvSE/_new  2020-01-27 20:19:17.652590535 +0100
@@ -1,7 +1,7 @@
 From fa95348822ab87aee7a6504fac64a707bc415493 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcer...@suse.com>
 Date: Mon, 13 Jan 2020 15:22:35 +0100
-Subject: [PATCH 7/9] Add explicit #include <mutex> for gcc 7 to
+Subject: [PATCH 07/10] Add explicit #include <mutex> for gcc 7 to
  DesktopWebpage.cpp
 
 ---
@@ -21,5 +21,5 @@
  #include <QFileDialog>
  #include <QWebEngineSettings>
 -- 
-2.24.1
+2.25.0
 

++++++ 0008-Remove-PauseChanged-related-handler-from-DownloadHel.patch ++++++
--- /var/tmp/diff_new_pack.KXmvSE/_old  2020-01-27 20:19:17.660590540 +0100
+++ /var/tmp/diff_new_pack.KXmvSE/_new  2020-01-27 20:19:17.660590540 +0100
@@ -1,7 +1,7 @@
 From 3d0059cf41e5dbb30d809b6b5fb5ff121e4403d8 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcer...@suse.com>
 Date: Mon, 13 Jan 2020 15:48:54 +0100
-Subject: [PATCH 8/9] Remove PauseChanged related handler from DownloadHelper
+Subject: [PATCH 08/10] Remove PauseChanged related handler from DownloadHelper
  for Qt < 5.10
 
 ---
@@ -47,5 +47,5 @@
     
  private:
 -- 
-2.24.1
+2.25.0
 

++++++ 0009-Don-t-install-pandoc-and-mathjax.patch ++++++
--- /var/tmp/diff_new_pack.KXmvSE/_old  2020-01-27 20:19:17.668590545 +0100
+++ /var/tmp/diff_new_pack.KXmvSE/_new  2020-01-27 20:19:17.668590545 +0100
@@ -1,7 +1,7 @@
 From 7a76822069916fb2f9d733fed925c46603dc3a6e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcer...@suse.com>
 Date: Tue, 14 Jan 2020 14:20:40 +0100
-Subject: [PATCH 9/9] Don't install pandoc and mathjax
+Subject: [PATCH 09/10] Don't install pandoc and mathjax
 
 Because we use the system wide version, there's no need to waste time 
installing
 the files.
@@ -35,5 +35,5 @@
     # file(GLOB RMARKDOWN_PACKAGE 
"${RSTUDIO_DEPENDENCIES_DIR}/common/rmarkdown*.tar.gz")
     # install(FILES ${RMARKDOWN_PACKAGE}
 -- 
-2.24.1
+2.25.0
 

++++++ 0010-Fix-rstudio-exec-path.patch ++++++
>From bfd42aef8759252d4fb2f620c8869fc85e0a6684 Mon Sep 17 00:00:00 2001
From: Marco Varlese <marco.varl...@suse.com>
Date: Mon, 27 Jan 2020 14:29:40 +0100
Subject: [PATCH 10/10] Fix rstudio exec path

Fix the path to the rstudio executable in the rstudio.desktop file.
---
 src/cpp/desktop/resources/freedesktop/rstudio.desktop.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cpp/desktop/resources/freedesktop/rstudio.desktop.in 
b/src/cpp/desktop/resources/freedesktop/rstudio.desktop.in
index 0a1a387fd2..e8f68277e2 100644
--- a/src/cpp/desktop/resources/freedesktop/rstudio.desktop.in
+++ b/src/cpp/desktop/resources/freedesktop/rstudio.desktop.in
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=${CMAKE_INSTALL_PREFIX}/${RSTUDIO_INSTALL_BIN}/rstudio %F
+Exec=rstudio %F
 Icon=rstudio
 Type=Application
 Terminal=false
-- 
2.25.0




++++++ rstudio-rpmlintrc ++++++
--- /var/tmp/diff_new_pack.KXmvSE/_old  2020-01-27 20:19:17.728590581 +0100
+++ /var/tmp/diff_new_pack.KXmvSE/_new  2020-01-27 20:19:17.732590584 +0100
@@ -1,2 +1,3 @@
 # this is a template and can stay in the main package
 
addFilter(".*devel-file-in-non-devel-package.*/usr/lib/rstudio/resources/templates/rcpp.cpp")
+addFilter("name-repeated-in-summary.*")


Reply via email to