fix nx lib dir by passing NXLIBDIR to make [release 4.1.0.6-2mamba;Sat Aug 19 2023]

2024-01-05 19:31:37 +01:00 · 2024-01-05 19:31:37 +01:00 · 6b75f2ffee
commit 6b75f2ffee
parent cda3225b9b
3 changed files with 47 additions and 28 deletions
--- a/x2goserver-4.1.0.0-openmamba-enable.patch
+++ b/x2goserver-4.1.0.0-openmamba-enable.patch
@ -1,11 +0,0 @@
--- x2goserver-4.1.0.0/x2goserver-xsession/etc/Xsession.orig	2018-03-21 16:19:28.269044678 +0100
-+++ x2goserver-4.1.0.0/x2goserver-xsession/etc/Xsession	2018-03-21 21:36:45.510832023 +0100
-@@ -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 ] || [ -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 ] || [ -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
--- a/x2goserver-4.1.0.5-openmamba-enable.patch
+++ b/x2goserver-4.1.0.5-openmamba-enable.patch
@ -0,0 +1,10 @@
+--- x2goserver-4.1.0.5/x2goserver-xsession/etc/Xsession.orig	2023-07-30 23:49:05.003406440 +0200
+++ x2goserver-4.1.0.5/x2goserver-xsession/etc/Xsession	2023-07-30 23:49:27.952280989 +0200
+@@ -168,6 +168,7 @@
+ 		set -e
+ 	fi
+ elif [ -f /etc/redhat-release ] || \
+     [ -f /etc/openmamba-release ] || \
+      [ -f /etc/gentoo-release ] || \
+      { \
+         { [ -e '/usr/lib/os-release' ] && grep 'suse' < '/usr/lib/os-release' 1>'/dev/null' ; } || \
--- a/x2goserver.spec
+++ b/x2goserver.spec
@ -4,18 +4,18 @@
 %define x2goprint_gid 65058

 Name:          x2goserver
-Version:       4.1.0.3
+Version:       4.1.0.6
 Release:       2mamba
 Summary:       A Remote Desktop server
 Group:         System/Servers
 Vendor:        openmamba
 Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
-URL:           http://wiki.x2go.org/
+URL:           https://wiki.x2go.org/doku.php
 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.1.0.0-openmamba-enable.patch
+Patch2:        x2goserver-4.1.0.5-openmamba-enable.patch
 Patch3:        x2goserver-4.0.1.19-fix-local-desktop.patch
 License:       GPL
 ## AUTOBUILDREQ-BEGIN
@ -24,37 +24,46 @@ BuildRequires: libperl
 BuildRequires: perl-Capture-Tiny
 BuildRequires: perl-Config-Simple
 BuildRequires: perl-DBI
+BuildRequires: perl-Encode
+BuildRequires: perl-Encode-Locale
 BuildRequires: perl-File-BaseDir
 BuildRequires: perl-File-Which
+BuildRequires: perl-Scalar-List-Utils
+BuildRequires: perl-Switch
+BuildRequires: perl-Try-Tiny
 BuildRequires: perl-devel
 ## AUTOBUILDREQ-END
 BuildRequires: man2html
 Requires:      perl-DBD-SQLite
 Requires:      x2goagent
 Provides:      x2godesktopsharing
-Obsoletes:     x2godesktopsharing
+Obsoletes:     x2godesktopsharing < 4.1.0.0
 #Requires:      nx-libs
 Requires:      sshfs
-BuildRoot:     %{_tmppath}/%{name}-%{version}-root
+Requires:      iproute

 %description
 X2Go is a Remote Desktop server.

 %prep
 %setup -q
-%ifarch x86_64
-%patch0 -p1
-%endif
-%patch1 -p1
+#%ifarch x86_64
+#%patch 0 -p1
+#%endif
+#%patch 1 -p1
 %patch 2 -p1
 #%patch3 -p1

 %build
-%make PREFIX=%{_prefix}
+%make \
+   PREFIX=%{_prefix} \
+   NXLIBDIR=%{_libdir}/nx

 %install
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
-%makeinstall PREFIX=%{_prefix} \
+%makeinstall \
+   PREFIX=%{_prefix} \
+   NXLIBDIR=%{_libdir}/nx \
   INSTALL_DIR="install -d -m755" \
   INSTALL_FILE="install -m644" \
   INSTALL_PROGRAM="install -m755"
@ -78,7 +87,7 @@ if [ $1 -ge 1 ]; then
      -d /var/spool/x2goprint -g x2goprint -s /bin/false x2goprint 2>/dev/null

 fi
-exit 0
+:

 %post
 if [ $1 -ge 1 ]; then
@ -88,7 +97,7 @@ if [ $1 -ge 1 ]; then
      x2godbadmin --updatedb
   fi
 fi
-exit 0
+:

 %preun
 if [ $1 -eq 0 ]; then
@ -97,7 +106,7 @@ if [ $1 -eq 0 ]; then
   /usr/sbin/groupdel x2goprint 2>/dev/null
   /usr/sbin/userdel x2goprint 2>/dev/null
 fi
-exit 0
+:

 %files
 %defattr(-,root,root)
@ -110,8 +119,9 @@ exit 0
 %config %{_sysconfdir}/x2go/x2go_logout
 %config %{_sysconfdir}/x2go/x2go_logout.d/010_userscripts.sh
 %config %{_sysconfdir}/x2go/x2goagent.options
+%config %{_sysconfdir}/x2go/x2gokdrive.options
 %config %{_sysconfdir}/x2go/keystrokes.cfg
-%config %{_sysconfdir}/x2go/x2goagent.keyboard
+#%config %{_sysconfdir}/x2go/x2goagent.keyboard
 %config(noreplace) %{_sysconfdir}/x2go/x2goserver.conf
 %config %{_sysconfdir}/x2go/x2gosql/sql
 %{_bindir}/x2go*
@ -122,7 +132,7 @@ exit 0
 %{_prefix}/lib/x2go/extensions/*
 %{_prefix}/lib/x2go/x2go*
 %{_prefix}/lib/x2go/libx2go-server-db-sqlite3-wrapper*
-%{_prefix}/lib/nx/bin/x2goagent
+%{_libdir}/nx/bin/x2goagent
 #%attr(2755,root,x2gouser) %{_prefix}/lib/x2go/x2gosqlitewrapper
 %{_sbindir}/x2go*
 %{_datadir}/applications/x2gofm.desktop
@ -138,12 +148,22 @@ exit 0
 %{perl_vendorlib}/X2Go/*
 %{perl_vendorarch}/auto/x2goserver/.packlist
 %{_mandir}/man1/x2goagent.1*
+%{_mandir}/man1/x2gooptionsstring.1*
 %{_mandir}/man3/X2Go*.3pm*
 %attr(0770,x2goprint,x2goprint) /var/spool/x2goprint
 %attr(0770,x2gouser,x2gouser) /var/lib/x2go
 %doc COPYING

 %changelog
+* Sat Aug 19 2023 Silvan Calarco <silvan.calarco@mambasoft.it> 4.1.0.6-2mamba
+- fix nx lib dir by passing NXLIBDIR to make
+
+* Fri Aug 18 2023 Automatic Build System <autodist@mambasoft.it> 4.1.0.6-1mamba
+- automatic version update by autodist
+
+* Tue Aug 01 2023 Automatic Build System <autodist@mambasoft.it> 4.1.0.5-1mamba
+- automatic version update by autodist
+
 * Fri Nov 08 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 4.1.0.3-2mamba
 - provide/obsolete x2godesktopsharing