rpms/nx/devel nxcomp-3.2.0-gcc43.patch, NONE, 1.1 nxcompshad-3.2.0-gcc43.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 nx.spec, 1.20, 1.21 sources, 1.13, 1.14 NX-noansi.diff, 1.2, NONE nx-2.1.0-fixes.patch, 1.1, NONE nxagent-64bit-clean.diff, 1.1, NONE p_XFree86-4.3-ppc64.diff, 1.1, NONE
Axel Thimm (athimm)
fedora-extras-commits at redhat.com
Sat Apr 12 14:04:49 UTC 2008
Author: athimm
Update of /cvs/extras/rpms/nx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8429/devel
Modified Files:
.cvsignore nx.spec sources
Added Files:
nxcomp-3.2.0-gcc43.patch nxcompshad-3.2.0-gcc43.patch
Removed Files:
NX-noansi.diff nx-2.1.0-fixes.patch nxagent-64bit-clean.diff
p_XFree86-4.3-ppc64.diff
Log Message:
nxcomp-3.2.0-gcc43.patch:
--- NEW FILE nxcomp-3.2.0-gcc43.patch ---
--- nxcomp/Split.cpp.gcc43 2007-09-09 22:05:59.000000000 +0200
+++ nxcomp/Split.cpp 2008-04-12 11:02:11.000000000 +0200
@@ -15,13 +15,15 @@
/* */
/**************************************************************************/
-#include <fstream.h>
+#include <fstream>
#include <unistd.h>
-#include <string.h>
+#include <cstring>
#include <sys/stat.h>
#include <sys/types.h>
#include <utime.h>
+using namespace std;
+
#include "Split.h"
#include "Control.h"
--- nxcomp/Proxy.cpp.gcc43 2008-01-06 02:12:34.000000000 +0100
+++ nxcomp/Proxy.cpp 2008-04-12 11:00:21.000000000 +0200
@@ -15,13 +15,15 @@
/* */
/**************************************************************************/
-#include <stdio.h>
+#include <cstdio>
#include <unistd.h>
-#include <stdlib.h>
-#include <fstream.h>
+#include <cstdlib>
+#include <fstream>
#include <sys/types.h>
#include <sys/stat.h>
+using namespace std;
+
#if defined(__CYGWIN32__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__sun)
#include <netinet/in_systm.h>
#endif
--- nxcomp/Misc.cpp.gcc43 2007-06-11 05:27:08.000000000 +0200
+++ nxcomp/Misc.cpp 2008-04-12 10:58:01.000000000 +0200
@@ -15,15 +15,17 @@
/* */
/**************************************************************************/
-#include <iostream.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <stdlib.h>
+#include <iostream>
+#include <cstdio>
+#include <cctype>
+#include <cstdlib>
#include <unistd.h>
-#include <signal.h>
+#include <csignal>
-#include <errno.h>
-#include <string.h>
+#include <cerrno>
+#include <cstring>
+
+using namespace std;
#include "NXproto.h"
--- nxcomp/Misc.h.gcc43 2007-06-04 15:01:46.000000000 +0200
+++ nxcomp/Misc.h 2008-04-12 10:52:03.000000000 +0200
@@ -18,11 +18,13 @@
#ifndef Misc_H
#define Misc_H
-#include <iostream.h>
-#include <fstream.h>
+#include <iostream>
+#include <fstream>
-#include <errno.h>
-#include <string.h>
+#include <cerrno>
+#include <cstring>
+
+using namespace std;
//
// This is MD5 length.
--- nxcomp/Loop.cpp.gcc43 2008-03-20 13:43:47.000000000 +0100
+++ nxcomp/Loop.cpp 2008-04-12 10:56:17.000000000 +0200
@@ -15,23 +15,25 @@
/* */
/**************************************************************************/
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
#include <unistd.h>
-#include <errno.h>
-#include <signal.h>
-#include <setjmp.h>
+#include <cerrno>
+#include <csignal>
+#include <csetjmp>
-#include <math.h>
-#include <ctype.h>
-#include <string.h>
+#include <cmath>
+#include <cctype>
+#include <cstring>
#include <dirent.h>
#include <pwd.h>
-#include <fstream.h>
+#include <fstream>
#include <fcntl.h>
+using namespace std;
+
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/wait.h>
--- nxcomp/BlockCacheSet.cpp.gcc43 2007-06-04 15:02:20.000000000 +0200
+++ nxcomp/BlockCacheSet.cpp 2008-04-12 11:12:10.000000000 +0200
@@ -15,7 +15,8 @@
/* */
/**************************************************************************/
-#include <iostream.h>
+#include <iostream>
+using namespace std;
#include "BlockCacheSet.h"
--- nxcomp/Message.cpp.gcc43 2007-06-04 15:02:24.000000000 +0200
+++ nxcomp/Message.cpp 2008-04-12 11:01:14.000000000 +0200
@@ -15,10 +15,12 @@
/* */
/**************************************************************************/
-#include <stdio.h>
-#include <fstream.h>
+#include <cstdio>
+#include <fstream>
#include <unistd.h>
-#include <string.h>
+#include <cstring>
+
+using namespace std;
#include <algorithm>
nxcompshad-3.2.0-gcc43.patch:
--- NEW FILE nxcompshad-3.2.0-gcc43.patch ---
--- nxcompshad/Misc.h~ 2007-06-04 13:39:49.000000000 +0200
+++ nxcompshad/Misc.h 2008-04-12 12:46:24.000000000 +0200
@@ -18,10 +18,12 @@
#ifndef Misc_H
#define Misc_H
-#include <iostream.h>
+#include <iostream>
-#include <errno.h>
-#include <string.h>
+#include <cerrno>
+#include <cstring>
+
+using namespace std;
//
// Error handling macros.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nx/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore 6 Apr 2008 13:31:28 -0000 1.12
+++ .cvsignore 12 Apr 2008 14:04:11 -0000 1.13
@@ -1,9 +1,11 @@
-nxauth-3.1.0-1.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
-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
+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
+nxproxy-3.2.0-1.tar.gz
+nxscripts-3.2.0-1.tar.gz
+nxssh-3.2.0-1.tar.gz
Index: nx.spec
===================================================================
RCS file: /cvs/extras/rpms/nx/devel/nx.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- nx.spec 6 Apr 2008 13:31:28 -0000 1.20
+++ nx.spec 12 Apr 2008 14:04:11 -0000 1.21
@@ -7,23 +7,23 @@
Summary: Proxy system for X11
Name: nx
-Version: 3.1.0
-Release: 26%{?dist}
+Version: 3.2.0
+Release: 27%{?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
+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
-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
+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}-2.tar.gz
+Source4: http://64.34.161.181/download/%{version}/sources/nxcompshad-%{version}-1.tar.gz
# X11 Support Programs and Libraries
-Source5: http://64.34.161.181/download/%{version}/sources/nx-X11-%{version}-4.tar.gz
+Source5: http://64.34.161.181/download/%{version}/sources/nx-X11-%{version}-1.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}-7.tar.gz
+Source7: http://64.34.161.181/download/%{version}/sources/nxagent-%{version}-3.tar.gz
# NX Example Scripts
Source8: http://64.34.161.181/download/%{version}/sources/nxscripts-%{version}-1.tar.gz
@@ -32,6 +32,9 @@
Source11: nxfind-provides.sh
+Patch0: nxcomp-3.2.0-gcc43.patch
+Patch1: nxcompshad-3.2.0-gcc43.patch
+
%define _use_internal_dependency_generator 0
%define __find_provides sh %{SOURCE11}
@@ -53,6 +56,8 @@
%prep
%setup -q -c %{name}-%{version} -T -a0 -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8
+%patch0 -p0
+%patch1 -p0
export CFLAGS="%{optflags}"
%ifarch x86_64 ppc64
grep -rl -- -fPIC . | xargs perl -pi -e's,-fPIC,-fPIC -DPIC,'
@@ -167,6 +172,9 @@
%{_pkglibexecdir}
%changelog
+* Sat Apr 12 2008 Axel Thimm <Axel.Thimm at ATrpms.net> - 3.2.0-27
+- Update to 3.2.0.
+
* Sat Apr 5 2008 Axel Thimm <Axel.Thimm at ATrpms.net> - 3.1.0-26
- Update to maintenance release #2.
- Add nxssh.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nx/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources 6 Apr 2008 13:31:28 -0000 1.13
+++ sources 12 Apr 2008 14:04:11 -0000 1.14
@@ -1,11 +1,11 @@
-75ee1a4140322645fcd2a8303cd306c7 nxauth-3.1.0-1.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
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
+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
+ac31e8f2f112e3720f3c00cec67c0734 nxproxy-3.2.0-1.tar.gz
+bb0b1e65e6504ab053fe63367bc2497d nxscripts-3.2.0-1.tar.gz
+6d4955376ea1dfcb6971b2b46d31ece1 nxssh-3.2.0-1.tar.gz
--- NX-noansi.diff DELETED ---
--- nx-2.1.0-fixes.patch DELETED ---
--- nxagent-64bit-clean.diff DELETED ---
--- p_XFree86-4.3-ppc64.diff DELETED ---
More information about the fedora-extras-commits
mailing list