provide/obsolete x2godesktopsharing [release 4.1.0.3-2mamba;Fri Nov 08 2019]

x2goserver-4.1.0.0-openmamba-enable.patch

@@ -1,11 +1,11 @@
---- x2goserver-4.0.1.19/x2goserver-xsession/etc/Xsession.orig	2016-04-08 01:06:59.309430045 +0200
+--- x2goserver-4.1.0.0/x2goserver-xsession/etc/Xsession.orig	2018-03-21 16:19:28.269044678 +0100
-+++ x2goserver-4.0.1.19/x2goserver-xsession/etc/Xsession	2016-04-08 01:07:29.785415078 +0200
++++ x2goserver-4.1.0.0/x2goserver-xsession/etc/Xsession	2018-03-21 21:36:45.510832023 +0100
-@@ -130,7 +130,7 @@
+@@ -145,7 +145,7 @@
  		done
  		set -e
  	fi
--elif [ -f /etc/redhat-release ] || [ -f /etc/gentoo-release ] || [ -f /etc/SUSE-brand ] || [ -f /etc/SuSE-release ]; then
+-elif [ -f /etc/redhat-release ] || [ -f /etc/gentoo-release ] || [ -f /etc/SUSE-brand ] || [ -f /etc/SuSE-release ] || [ -f /etc/os-rt-release ]; then
-+elif [ -f /etc/openmamba-release ] || [ -f /etc/redhat-release ] || [ -f /etc/gentoo-release ] || [ -f /etc/SUSE-brand ] || [ -f /etc/SuSE-release ]; then
++elif [ -f /etc/openmamba-release ] || [ -f /etc/redhat-release ] || [ -f /etc/gentoo-release ] || [ -f /etc/SUSE-brand ] || [ -f /etc/SuSE-release ] || [ -f /etc/os-rt-release ]; then
  
  	# define a fallback... (should never be needed). The XSESSION_EXEC var gets set in
  	# X2Go's x2goruncommand script and can be used with obsolete switchdesk or with

x2goserver.spec

@@ -4,8 +4,8 @@
 %define x2goprint_gid 65058
 
 Name:          x2goserver
-Version:       4.0.1.20
+Version:       4.1.0.3
-Release:       1mamba
+Release:       2mamba
 Summary:       A Remote Desktop server
 Group:         System/Servers
 Vendor:        openmamba
@@ -15,7 +15,7 @@ URL:           http://wiki.x2go.org/
 Source:        http://code.x2go.org/releases/source/x2goserver/x2goserver-%{version}.tar.gz
 Patch0:        x2goserver-x86_64-lib-nx.patch
 Patch1:        x2goserver-4.0.1.19-kde-path.patch
-Patch2:        x2goserver-4.0.1.19-openmamba-enable.patch
+Patch2:        x2goserver-4.1.0.0-openmamba-enable.patch
 Patch3:        x2goserver-4.0.1.19-fix-local-desktop.patch
 License:       GPL
 ## AUTOBUILDREQ-BEGIN
@@ -30,7 +30,10 @@ BuildRequires: perl-devel
 ## AUTOBUILDREQ-END
 BuildRequires: man2html
 Requires:      perl-DBD-SQLite
-Requires:      nx-libs
+Requires:      x2goagent
+Provides:      x2godesktopsharing
+Obsoletes:     x2godesktopsharing
+#Requires:      nx-libs
 Requires:      sshfs
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 
@@ -59,6 +62,8 @@ X2Go is a Remote Desktop server.
 install -d -m0775 %{buildroot}/var/lib/x2go
 install -d -m0770 %{buildroot}/var/spool/x2goprint
 
+rm -f %{buildroot}%{_bindir}/x2goagent
+
 %clean
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 
@@ -77,7 +82,11 @@ exit 0
 
 %post
 if [ $1 -ge 1 ]; then
-   [ -e /var/lib/x2go/x2go_sessions ] || x2godbadmin --createdb
+   if [ -e /var/lib/x2go/x2go_sessions ]; then
+      x2godbadmin --createdb
+   else
+      x2godbadmin --updatedb
+   fi
 fi
 exit 0
 
@@ -93,6 +102,7 @@ exit 0
 %files
 %defattr(-,root,root)
 %{_sysconfdir}/logcheck/ignore.d.server/x2goserver
+%{_sysconfdir}/x2go/desktopsharing/settings
 %attr(0440,root,root) %{_sysconfdir}/sudoers.d/x2goserver
 %dir %{_sysconfdir}/x2go
 %config %{_sysconfdir}/x2go/Xresources
@@ -100,17 +110,23 @@ exit 0
 %config %{_sysconfdir}/x2go/x2go_logout
 %config %{_sysconfdir}/x2go/x2go_logout.d/010_userscripts.sh
 %config %{_sysconfdir}/x2go/x2goagent.options
+%config %{_sysconfdir}/x2go/keystrokes.cfg
+%config %{_sysconfdir}/x2go/x2goagent.keyboard
 %config(noreplace) %{_sysconfdir}/x2go/x2goserver.conf
 %config %{_sysconfdir}/x2go/x2gosql/sql
 %{_bindir}/x2go*
 %attr(2755,root,x2goprint) %{_bindir}/x2goprint
+%{_tmpfilesdir}/x2goserver.conf
 %dir %{_prefix}/lib/x2go
 %dir %{_prefix}/lib/x2go/extensions
-%{_prefix}/lib/x2go/extensions*/
+%{_prefix}/lib/x2go/extensions/*
 %{_prefix}/lib/x2go/x2go*
-%attr(2755,root,x2gouser) %{_prefix}/lib/x2go/x2gosqlitewrapper
+%{_prefix}/lib/x2go/libx2go-server-db-sqlite3-wrapper*
+%{_prefix}/lib/nx/bin/x2goagent
+#%attr(2755,root,x2gouser) %{_prefix}/lib/x2go/x2gosqlitewrapper
 %{_sbindir}/x2go*
 %{_datadir}/applications/x2gofm.desktop
+%{_datadir}/pixmaps/x2goagent.xpm
 %{_mandir}/man5/x2goserver.conf.5*
 %{_mandir}/man8/x2go*.8*
 %{_datadir}/mime/packages/sshfs-x2go.xml
@@ -118,11 +134,28 @@ exit 0
 %{_datadir}/x2go/versions/VERSION.x2goserver*
 %dir %{_datadir}/x2go/x2gofeature.d
 %{_datadir}/x2go/x2gofeature.d/x2goserver*
+%dir %{perl_vendorlib}/X2Go
+%{perl_vendorlib}/X2Go/*
+%{perl_vendorarch}/auto/x2goserver/.packlist
+%{_mandir}/man1/x2goagent.1*
+%{_mandir}/man3/X2Go*.3pm*
 %attr(0770,x2goprint,x2goprint) /var/spool/x2goprint
 %attr(0770,x2gouser,x2gouser) /var/lib/x2go
 %doc COPYING
 
 %changelog
+* Fri Nov 08 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 4.1.0.3-2mamba
+- provide/obsolete x2godesktopsharing
+
+* Fri Dec 28 2018 Automatic Build System <autodist@mambasoft.it> 4.1.0.3-1mamba
+- automatic version update by autodist
+
+* Mon Aug 20 2018 Silvan Calarco <silvan.calarco@mambasoft.it> 4.1.0.2-2mamba
+- provide/obsolete x2goagent
+
+* Mon Aug 13 2018 Automatic Build System <autodist@mambasoft.it> 4.1.0.2-1mamba
+- automatic version update by autodist
+
 * Thu Dec 15 2016 Automatic Build System <autodist@mambasoft.it> 4.0.1.20-1mamba
 - automatic version update by autodist