rpms/nx/F-8 .cvsignore, 1.11, 1.12 nx.spec, 1.17, 1.18 sources, 1.12, 1.13
Axel Thimm (athimm)
fedora-extras-commits at redhat.com
Sun Apr 6 13:31:58 UTC 2008
Author: athimm
Update of /cvs/extras/rpms/nx/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19260/F-8
Modified Files:
.cvsignore nx.spec sources
Log Message:
Update to maintenance release #2., add nxssh, mv nxwrapper to the libexec dir.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nx/F-8/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore 23 Feb 2008 11:04:56 -0000 1.11
+++ .cvsignore 6 Apr 2008 13:31:06 -0000 1.12
@@ -1,8 +1,9 @@
-nxagent-3.1.0-2.tar.gz
nxauth-3.1.0-1.tar.gz
-nxcomp-3.1.0-4.tar.gz
nxcompext-3.1.0-2.tar.gz
nxcompshad-3.1.0-2.tar.gz
nxproxy-3.1.0-2.tar.gz
nxscripts-3.1.0-1.tar.gz
-nx-X11-3.1.0-1.tar.gz
+nxssh-3.1.0-2.tar.gz
+nxcomp-3.1.0-6.tar.gz
+nx-X11-3.1.0-4.tar.gz
+nxagent-3.1.0-7.tar.gz
Index: nx.spec
===================================================================
RCS file: /cvs/extras/rpms/nx/F-8/nx.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- nx.spec 23 Feb 2008 11:58:47 -0000 1.17
+++ nx.spec 6 Apr 2008 13:31:06 -0000 1.18
@@ -8,26 +8,27 @@
Summary: Proxy system for X11
Name: nx
Version: 3.1.0
-Release: 25.1%{?dist}
+Release: 26%{?dist}
License: GPL, MIT/X11 for X11 bits
Group: Applications/Internet
URL: http://www.nomachine.com
# Compression Libraries and Proxy Sources
Source0: http://64.34.161.181/download/%{version}/sources/nxproxy-%{version}-2.tar.gz
-Source1: http://64.34.161.181/download/%{version}/sources/nxcomp-%{version}-4.tar.gz
+Source1: http://64.34.161.181/download/%{version}/sources/nxcomp-%{version}-6.tar.gz
Source2: http://64.34.161.181/download/%{version}/sources/nxcompext-%{version}-2.tar.gz
+Source3: http://64.34.161.181/download/%{version}/sources/nxssh-%{version}-2.tar.gz
# Shadowing Libraries
-Source3: http://64.34.161.181/download/%{version}/sources/nxcompshad-%{version}-2.tar.gz
+Source4: http://64.34.161.181/download/%{version}/sources/nxcompshad-%{version}-2.tar.gz
# X11 Support Programs and Libraries
-Source4: http://64.34.161.181/download/%{version}/sources/nx-X11-%{version}-1.tar.gz
-Source5: http://64.34.161.181/download/%{version}/sources/nxauth-%{version}-1.tar.gz
+Source5: http://64.34.161.181/download/%{version}/sources/nx-X11-%{version}-4.tar.gz
+Source6: http://64.34.161.181/download/%{version}/sources/nxauth-%{version}-1.tar.gz
# X11 Agent Sources
-Source6: http://64.34.161.181/download/%{version}/sources/nxagent-%{version}-2.tar.gz
+Source7: http://64.34.161.181/download/%{version}/sources/nxagent-%{version}-7.tar.gz
# NX Example Scripts
-Source7: http://64.34.161.181/download/%{version}/sources/nxscripts-%{version}-1.tar.gz
+Source8: http://64.34.161.181/download/%{version}/sources/nxscripts-%{version}-1.tar.gz
-Source8: nxwrapper.in
-Source9: docs.tar.bz2
+Source9: nxwrapper.in
+Source10: docs.tar.bz2
Source11: nxfind-provides.sh
@@ -36,7 +37,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: gcc-c++, redhat-release
+BuildRequires: gcc-c++, libstdc++-devel, redhat-release
BuildRequires: expat-devel, audiofile-devel, openssl-devel, libjpeg-devel, libpng-devel
BuildRequires: libXt-devel, xorg-x11-proto-devel, libXp-devel, imake
# Better mention what we really require on a file basis.
@@ -51,7 +52,7 @@
NX provides a proxy system for the X Window System.
%prep
-%setup -q -c %{name}-%{version} -T -a0 -a1 -a2 -a3 -a4 -a5 -a6 -a7
+%setup -q -c %{name}-%{version} -T -a0 -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8
export CFLAGS="%{optflags}"
%ifarch x86_64 ppc64
grep -rl -- -fPIC . | xargs perl -pi -e's,-fPIC,-fPIC -DPIC,'
@@ -85,16 +86,30 @@
%endif
export CXXFLAGS="$CFLAGS"
+# The commented parts show how the build would proceed step by step.
+# This information is important in case someone wants to split this package
+# (which would be the proper thing to do).
+# Within the commented area the make World invocation does all for
+# you. It isn't placed by accident in the middle of the commented
+# build instructions, as this is where the X11 libs would be built
+
+%if 0
# build Compression Library and Proxy
-#for i in nxcomp nxcompshad nxproxy; do
-# pushd $i; ./configure; make CCFLAGS="$CFLAGS"; popd
-#done
+for i in nxcomp nxcompshad nxproxy; do
+ pushd $i; ./configure; make CCFLAGS="$CFLAGS"; popd
+done
+%endif
# build X11 Support Libraries and Agents
make -C nx-X11 World
+%if 0
# build Extended Compression Library
-#pushd nxcompext
-# ./configure; make
-#popd
+pushd nxcompext
+ ./configure; make
+popd
+%endif
+pushd nxssh
+./configure --without-zlib-version-check; make
+popd
pushd nxproxy
./configure
make CCFLAGS="$CFLAGS"
@@ -118,20 +133,22 @@
# nxwrapper
sed -e's, at PKGLIBDIR@,%{_pkglibdir},g' \
-e's, at PKGLIBEXECDIR@,%{_pkglibexecdir},g' \
- < %{SOURCE8} > %{buildroot}%{_bindir}/nxwrapper
-chmod 0755 %{buildroot}%{_bindir}/nxwrapper
-ln -s nxwrapper %{buildroot}%{_bindir}/nxagent
+ < %{SOURCE9} > %{buildroot}%{_pkglibexecdir}/nxwrapper
+chmod 0755 %{buildroot}%{_pkglibexecdir}/nxwrapper
+ln -s %{_pkglibexecdir}/nxwrapper %{buildroot}%{_bindir}/nxagent
# install Compression Libraries and Proxy
install -p -m 0755 nxcomp/libXcomp.so.* %{buildroot}%{_pkglibdir}
install -p -m 0755 nxcompext/libXcompext.so.* %{buildroot}%{_pkglibdir}
install -p -m 0755 nxcompshad/libXcompshad.so.* %{buildroot}%{_pkglibdir}
+install -p -m 0755 nxssh/nxssh %{buildroot}%{_pkglibexecdir}
+ln -s %{_pkglibexecdir}/nxwrapper %{buildroot}%{_bindir}/nxssh
install -p -m 0755 nxproxy/nxproxy %{buildroot}%{_pkglibexecdir}
-ln -s nxwrapper %{buildroot}%{_bindir}/nxproxy
+ln -s %{_pkglibexecdir}/nxwrapper %{buildroot}%{_bindir}/nxproxy
# install scripts
mkdir -p %{buildroot}%{_defaultdocdir}/%{name}-%{version}
cp -a nxscripts %{buildroot}%{_defaultdocdir}/%{name}-%{version}
# documentation and license
-tar xjf %{SOURCE9} -C %{buildroot}%{_defaultdocdir}/%{name}-%{version}
+tar xjf %{SOURCE10} -C %{buildroot}%{_defaultdocdir}/%{name}-%{version}
install -m 644 nxcomp/LICENSE %{buildroot}%{_defaultdocdir}/%{name}-%{version}
for i in nxcomp; do
mkdir %{buildroot}%{_defaultdocdir}/%{name}-%{version}/$i
@@ -150,6 +167,11 @@
%{_pkglibexecdir}
%changelog
+* Sat Apr 5 2008 Axel Thimm <Axel.Thimm at ATrpms.net> - 3.1.0-26
+- Update to maintenance release #2.
+- Add nxssh.
+- mv nxwrapper to the libexec dir.
+
* Wed Jan 2 2008 Axel Thimm <Axel.Thimm at ATrpms.net> - 3.1.0-25
- Update to 3.1.0.
- add nxcompshad, nxauth; remove nxviewer, nxdesktop.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nx/F-8/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 23 Feb 2008 11:04:56 -0000 1.12
+++ sources 6 Apr 2008 13:31:06 -0000 1.13
@@ -1,10 +1,11 @@
-e14977404b8abeb5de137bf16bf234a2 nxagent-3.1.0-2.tar.gz
75ee1a4140322645fcd2a8303cd306c7 nxauth-3.1.0-1.tar.gz
-83b1d33085b04b338ec46f0c86ed5c1e nxcomp-3.1.0-4.tar.gz
746c2a65978a622d301eb2c5bea0b94c nxcompext-3.1.0-2.tar.gz
167af862593a494237a1a0b4adbbb600 nxcompshad-3.1.0-2.tar.gz
6e2abffa850d89586c8df922e2f218bd nxproxy-3.1.0-2.tar.gz
8a059c0c188fe5618955086730d11460 nxscripts-3.1.0-1.tar.gz
-e3abbf75152037ac02b61bf991a2dfcc nx-X11-3.1.0-1.tar.gz
0511072ee377316879bb91a75153ed47 docs.tar.bz2
477190c6f366dfe2f5ce76978e52238a nxfind-provides.sh
+1f2e1a4f4e21be43137859bfa4c77a48 nxssh-3.1.0-2.tar.gz
+a0da437e6538be3b3b2b97fd3f983e54 nxcomp-3.1.0-6.tar.gz
+0ae903bf3610111709e6101f0903d31f nx-X11-3.1.0-4.tar.gz
+5bb84644637cf2a7d332f1d8939438cc nxagent-3.1.0-7.tar.gz
More information about the fedora-extras-commits
mailing list