rpms/nx/FC-5 .cvsignore,1.5,1.6 nx.spec,1.8,1.9 sources,1.5,1.6

[Richard A. Stout (zipsonic)]

Author: zipsonic

Update of /cvs/extras/rpms/nx/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19614/FC-5

Modified Files:
	.cvsignore nx.spec sources 
Log Message:
auto-import nx-2.0.0-4.fc5 on branch FC-5 from nx-2.0.0-4.fc5.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nx/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	13 Jul 2006 23:45:07 -0000	1.5
+++ .cvsignore	28 Aug 2006 06:46:55 -0000	1.6
@@ -5,5 +5,6 @@
 nxdesktop-2.0.0-50.tar.gz
 nxproxy-2.0.0-2.tar.gz
 nxscripts-2.0.0-2.tar.gz
-nxagent-2.0.0-89.tar.gz
 nxviewer-2.0.0-15.tar.gz
+nxagent-2.0.0-93.tar.gz
+nxssh-2.0.0-12.tar.gz


Index: nx.spec
===================================================================
RCS file: /cvs/extras/rpms/nx/FC-5/nx.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- nx.spec	13 Jul 2006 23:45:07 -0000	1.8
+++ nx.spec	28 Aug 2006 06:46:55 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           nx
 Version:        2.0.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Proxy system for X11
 
 Group:          Applications/Internet
@@ -10,10 +10,11 @@
 Source1:	nxcomp-%{version}-81.tar.gz
 Source2:	nxcompext-%{version}-33.tar.gz
 Source3:	nx-X11-%{version}-31.tar.gz
-Source4:	nxagent-%{version}-89.tar.gz
+Source4:	nxagent-%{version}-93.tar.gz
 Source5:	nxviewer-%{version}-15.tar.gz
 Source6:	nxdesktop-%{version}-50.tar.gz
 Source7:	nxscripts-%{version}-2.tar.gz
+Source8:	nxssh-%{version}-12.tar.gz
 Source9:	nxagent
 Source10:	docs.tar.bz2
 Source11:	nxfind-provides.sh
@@ -39,7 +40,7 @@
 NX provides a proxy system for the X Window System.
 
 %prep
-%setup -q -T -c %{name}-%{version} -a0 -a1 -a2 -a3 -a4 -a5 -a6 -a7
+%setup -q -T -c %{name}-%{version} -a0 -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8
 %patch0 -p0
 pushd nx-X11
 %patch1 -p0
@@ -80,6 +81,10 @@
 pushd nxcompext
   ./configure; make
 popd
+# build nxssh
+pushd nxssh
+  ./configure; make
+popd
 # build RFB Agent
 pushd nxviewer
   xmkmf -a
@@ -112,6 +117,12 @@
 cp -a nxcompext/libXcompext.so.* %{buildroot}/%{_libdir}/NX/lib
 install -m 755 nxproxy/nxproxy %{buildroot}/%{_libdir}/NX
 ln -snf nxagent %{buildroot}/%{_bindir}/nxproxy
+# install nxssh
+pushd nxssh
+  cp -a nxssh %{buildroot}/%{_libdir}/NX
+  ln -snf nxagent %{buildroot}/%{_bindir}/nxssh
+  chmod 755 %{buildroot}/%{_bindir}/nxssh
+popd
 # install RFB Agent
 pushd nxviewer
   make install DESTDIR=%{buildroot}
@@ -150,11 +161,6 @@
 %{_sbindir}/semanage fcontext -f -- -a -t textrel_shlib_t '%{_libdir}/NX/lib/libXcompext.so.%{version}' 2>/dev/null || :
 %{_bindir}/chcon -t textrel_shlib_t %{_libdir}/NX/lib/libXcomp.so.%{version} 2>/dev/null || :
 %{_bindir}/chcon -t textrel_shlib_t %{_libdir}/NX/lib/libXcompext.so.%{version} 2>/dev/null || :
-if [ ! -e /usr/X11R6/lib/X11 ]
-then
-	mkdir -p /usr/X11R6/lib 2>/dev/null || :
-	ln -snf /usr/share/X11 /usr/X11R6/lib/X11 2>/dev/null || :
-fi
 
 %postun
 if [ $1 -eq 0 ]; then
@@ -178,6 +184,12 @@
 %endif
 
 %changelog
+* Mon Aug 28 2006 Rick Stout <zipsonic[AT]gmail.com> - 2.0.0-4
+- upped release for rebuild request
+- removed link in post for /usr/X11R6/lib/X11 as it is now
+  handled in freenx
+- updated to maintenance release 2
+- added nxssh component for future qtnx client
 * Thu Jul 13 2006 Rick Stout <zipsonic[AT]gmail.com> - 2.0.0-3
 - updated to 2.0.0 Maintenance release 1
 * Tue Jul 11 2006 Rick Stout <zipsonic[AT]gmail.com> - 2.0.0-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nx/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	13 Jul 2006 23:45:07 -0000	1.5
+++ sources	28 Aug 2006 06:46:55 -0000	1.6
@@ -5,5 +5,6 @@
 f55dc97544a061dfa0f099329dcc3f53  nxdesktop-2.0.0-50.tar.gz
 b078c19372c82e85667cbbac880fa688  nxproxy-2.0.0-2.tar.gz
 f02c316e88e63a69139105bbfb2e77e8  nxscripts-2.0.0-2.tar.gz
-3db40a9a63d55da95b66794da51eb5e4  nxagent-2.0.0-89.tar.gz
 0e4b1d546b4b8a0224cd0d200ec88827  nxviewer-2.0.0-15.tar.gz
+d08f5872a88902ccecd17312e4255aab  nxagent-2.0.0-93.tar.gz
+a651351524f0c146794f403632b6b401  nxssh-2.0.0-12.tar.gz