rpms/nx/devel .cvsignore, 1.13, 1.14 nx.spec, 1.22, 1.23 sources, 1.14, 1.15

Axel Thimm (athimm) fedora-extras-commits at redhat.com
Tue Aug 12 04:11:26 UTC 2008


Author: athimm

Update of /cvs/extras/rpms/nx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16811/devel

Modified Files:
	.cvsignore nx.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nx/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	12 Apr 2008 14:04:11 -0000	1.13
+++ .cvsignore	12 Aug 2008 04:10:55 -0000	1.14
@@ -1,11 +1,11 @@
 docs.tar.bz2
-nxfind-provides.sh
-nx-X11-3.2.0-1.tar.gz
-nxagent-3.2.0-3.tar.gz
 nxauth-3.2.0-1.tar.gz
-nxcomp-3.2.0-6.tar.gz
 nxcompext-3.2.0-1.tar.gz
-nxcompshad-3.2.0-1.tar.gz
+nxfind-provides.sh
 nxproxy-3.2.0-1.tar.gz
 nxscripts-3.2.0-1.tar.gz
 nxssh-3.2.0-1.tar.gz
+nx-X11-3.2.0-2.tar.gz
+nxagent-3.2.0-8.tar.gz
+nxcomp-3.2.0-7.tar.gz
+nxcompshad-3.2.0-3.tar.gz


Index: nx.spec
===================================================================
RCS file: /cvs/extras/rpms/nx/devel/nx.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- nx.spec	21 May 2008 20:10:27 -0000	1.22
+++ nx.spec	12 Aug 2008 04:10:55 -0000	1.23
@@ -9,22 +9,21 @@
 Name: nx
 Version: 3.2.0
 Release: 28%{?dist}
-# Some of the X11 bits are under MIT, but the combined work is GPLv2
-License: GPLv2
+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}-1.tar.gz
-Source1: http://64.34.161.181/download/%{version}/sources/nxcomp-%{version}-6.tar.gz
+Source1: http://64.34.161.181/download/%{version}/sources/nxcomp-%{version}-7.tar.gz
 Source2: http://64.34.161.181/download/%{version}/sources/nxcompext-%{version}-1.tar.gz
 Source3: http://64.34.161.181/download/%{version}/sources/nxssh-%{version}-1.tar.gz
 # Shadowing Libraries
-Source4: http://64.34.161.181/download/%{version}/sources/nxcompshad-%{version}-1.tar.gz
+Source4: http://64.34.161.181/download/%{version}/sources/nxcompshad-%{version}-3.tar.gz
 # X11 Support Programs and Libraries
-Source5: http://64.34.161.181/download/%{version}/sources/nx-X11-%{version}-1.tar.gz
+Source5: http://64.34.161.181/download/%{version}/sources/nx-X11-%{version}-2.tar.gz
 Source6: http://64.34.161.181/download/%{version}/sources/nxauth-%{version}-1.tar.gz
 # X11 Agent Sources
-Source7: http://64.34.161.181/download/%{version}/sources/nxagent-%{version}-3.tar.gz
+Source7: http://64.34.161.181/download/%{version}/sources/nxagent-%{version}-8.tar.gz
 # NX Example Scripts
 Source8: http://64.34.161.181/download/%{version}/sources/nxscripts-%{version}-1.tar.gz
 
@@ -44,21 +43,23 @@
 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
+BuildRequires: libXdamage-devel, libXrandr-devel, libXtst-devel
 # Better mention what we really require on a file basis.
 # Requires: xorg-x11-utils
 
 # Fails with
 # Core.o: relocation R_X86_64_32S against `vtable for CorePoller' can not be used when making a shared object; recompile with -fPIC
 # but Core.o has been built with -fPIC :(
-ExcludeArch: x86_64
+#ExcludeArch: x86_64
 
 %description
 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 -a8
-%patch0 -p0
-%patch1 -p0
+#patch0 -p0
+#patch1 -p0
+perl -pi -e's,-L/usr/X11R6/lib,-L%{_x_libraries},' nxcompshad/Makefile.in
 export CFLAGS="%{optflags}"
 %ifarch x86_64 ppc64
 grep -rl -- -fPIC . | xargs perl -pi -e's,-fPIC,-fPIC -DPIC,'
@@ -99,12 +100,10 @@
 # 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
-%endif
 # build X11 Support Libraries and Agents
 make -C nx-X11 World
 %if 0
@@ -173,8 +172,8 @@
 %{_pkglibexecdir}
 
 %changelog
-* Wed May 21 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 3.2.0-28
-- fix license tag
+* Sun Aug 10 2008 Axel Thimm <Axel.Thimm at ATrpms.net> - 3.2.0-28
+- Upstream updates to nxcomp, nxcompshad, nx-X11, nxagent.
 
 * Sat Apr 12 2008 Axel Thimm <Axel.Thimm at ATrpms.net> - 3.2.0-27
 - Update to 3.2.0.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nx/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	12 Apr 2008 14:04:11 -0000	1.14
+++ sources	12 Aug 2008 04:10:55 -0000	1.15
@@ -1,11 +1,11 @@
 0511072ee377316879bb91a75153ed47  docs.tar.bz2
-477190c6f366dfe2f5ce76978e52238a  nxfind-provides.sh
-abb88a29525e08ccc5c45e4301019686  nx-X11-3.2.0-1.tar.gz
-9b1cdee975d662a200041a89bb9a9dc4  nxagent-3.2.0-3.tar.gz
 18519f2bcf30b10b766a60926fbe1017  nxauth-3.2.0-1.tar.gz
-5b452729e0c960723a174cafa20fe3dc  nxcomp-3.2.0-6.tar.gz
 cd1296ebd24b1d7c4f82537a395ad6e8  nxcompext-3.2.0-1.tar.gz
-1f106094d1d0d35b381faff80bd840af  nxcompshad-3.2.0-1.tar.gz
+477190c6f366dfe2f5ce76978e52238a  nxfind-provides.sh
 ac31e8f2f112e3720f3c00cec67c0734  nxproxy-3.2.0-1.tar.gz
 bb0b1e65e6504ab053fe63367bc2497d  nxscripts-3.2.0-1.tar.gz
 6d4955376ea1dfcb6971b2b46d31ece1  nxssh-3.2.0-1.tar.gz
+0a969199c77a604a488794c56176000f  nx-X11-3.2.0-2.tar.gz
+ab4f771bc522caa0a86317dc882679e8  nxagent-3.2.0-8.tar.gz
+5ea64a557c770d9f5cc4b9a7a9d1343c  nxcomp-3.2.0-7.tar.gz
+6edfa4f65f579306f05af2451249c2bf  nxcompshad-3.2.0-3.tar.gz




More information about the fedora-extras-commits mailing list