From 19f3550d59841ccf6bc8c9d550f3deeba63d34f7 Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Sat, 6 Jan 2024 07:47:58 +0100
Subject: [PATCH] added nxproxy and x2goagent packages; fix ldconfig problems
 [release 3.5.0.13-2mamba;Thu Mar 24 2016]

---
 nx-libs.spec | 53 ++++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 43 insertions(+), 10 deletions(-)

diff --git a/nx-libs.spec b/nx-libs.spec
index 31ccd62..4a4cc3d 100644
--- a/nx-libs.spec
+++ b/nx-libs.spec
@@ -1,6 +1,7 @@
+%define sover %(echo %version | cut -d. -f1-3)
 Name:          nx-libs
 Version:       3.5.0.13
-Release:       1mamba
+Release:       2mamba
 Summary:       NX X11 protocol compression libraries redistributed by X2Go dev team
 Group:         System/X11
 Vendor:        openmamba
@@ -21,12 +22,30 @@ BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 %description
 NX X11 protocol compression libraries redistributed by X2Go dev team.
 
+%package -n nxproxy
+Group:         System/Tools
+Summary:       X2GO Client proxy component
+Requires:      libnx = %{?epoch:%epoch:}%{version}-%{release}
+
+%description -n nxproxy
+X2GO Client proxy component.
+
+%package -n x2goagent
+Group:         System/Libraries
+Summary:       X2GO Server Agent component
+Requires:      libnx = %{?epoch:%epoch:}%{version}-%{release}
+Provides:      nx-libs
+Obsoletes:     nx-libs
+
+%description -n x2goagent
+X2GO Server Agent component.
+
 %package -n libnx
 Group:         System/Libraries
-Summary:       Shared libraries for %{name}
+Summary:       NX X11 protocol compression libraries redistributed by X2Go dev team.
 
 %description -n libnx
-This package contains shared libraries for %{name}.
+NX X11 protocol compression libraries redistributed by X2Go dev team.
 
 %package -n libnx-devel
 Group:         Development/Libraries
@@ -109,6 +128,10 @@ _EOF
 # Fix permissions on shared libraries
 chmod 755 %{buildroot}%{_libdir}/lib*.so*
 
+# Fix '/usr/lib64/nx/libXcompext.so.3 is not a symbolic link'
+rm -f %{buildroot}%{_libdir}/nx/libXcompext.so.3
+ln -s libXcompext.so.%{sover} %{buildroot}%{_libdir}/nx/libXcompext.so.3
+
 # Needed for Xinerama support
 install -d -m0755 %{buildroot}%{_libdir}/nx/X11/Xinerama/
 ln -s -f ../../../../%{_lib}/libX11.so.6 %{buildroot}%{_libdir}/nx/X11/Xinerama/libNX_X11.so.6
@@ -120,10 +143,20 @@ ln -s -f ../../../../%{_lib}/libNX_Xinerama.so.1 %{buildroot}%{_libdir}/nx/X11/X
 %clean
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 
-%post -n libnx -p /sbin/ldconfig
-%postun -n libnx -p /sbin/ldconfig
+%post -n libnx
+/sbin/ldconfig
+:
 
-%files -f %{name}.lang
+%postun -n libnx
+/sbin/ldconfig
+:
+
+%files -n nxproxy
+%defattr(-,root,root)
+%{_bindir}/nxproxy
+%{_mandir}/man1/nxproxy.1*
+
+%files -n x2goagent
 %defattr(-,root,root)
 %{_bindir}/x2goagent
 #%{_sysconfdir}/X11/xkb/compiled
@@ -134,11 +167,8 @@ ln -s -f ../../../../%{_lib}/libNX_Xinerama.so.1 %{buildroot}%{_libdir}/nx/X11/X
 %{_prefix}/lib/NX3/bin/*
 %dir %{_prefix}/lib/NX3/lib
 %{_prefix}/lib/NX3/lib/*
-%dir %{_prefix}/lib/NX3/include
-%{_bindir}/nxproxy
-%{_mandir}/man1/nxproxy.1*
 
-%files -n libnx
+%files -n libnx -f %{name}.lang
 %defattr(-,root,root)
 %{_sysconfdir}/ld.so.conf.d/%{name}.conf
 %{_libdir}/libNX_FS.so.*
@@ -226,5 +256,8 @@ ln -s -f ../../../../%{_lib}/libNX_Xinerama.so.1 %{buildroot}%{_libdir}/nx/X11/X
 %{_libdir}/pkgconfig/xrender.pc
 
 %changelog
+* Thu Mar 24 2016 Silvan Calarco <silvan.calarco@mambasoft.it> 3.5.0.13-2mamba
+- added nxproxy and x2goagent packages; fix ldconfig problems
+
 * Thu Nov 26 2015 Silvan Calarco <silvan.calarco@mambasoft.it> 3.5.0.13-1mamba
 - package created using the webbuild interface