rpms/nx/F-10 nx-gcc44.patch, NONE, 1.1 .cvsignore, 1.16, 1.17 nx.spec, 1.27, 1.28 sources, 1.17, 1.18

[Axel Thimm]

Author: athimm

Update of /cvs/extras/rpms/nx/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10869/F-10

Modified Files:
	.cvsignore nx.spec sources 
Added Files:
	nx-gcc44.patch 
Log Message:
Update to latest maintenance sources.

nx-gcc44.patch:

--- NEW FILE nx-gcc44.patch ---
--- nx-3.3.0/nxcomp/Loop.cpp.orig	2009-05-17 12:22:19.000000000 +0200
+++ nx-3.3.0/nxcomp/Loop.cpp	2009-05-17 12:22:43.000000000 +0200
@@ -10979,7 +10979,7 @@
                                       packMethod == PACK_LOSSLESS ||
                                           packMethod == PACK_ADAPTIVE)
   {
-    char *dash = rindex(opt, '-');
+    const char *dash = rindex(opt, '-');
 
     if (dash != NULL && strlen(dash) == 2 &&
             *(dash + 1) >= '0' && *(dash + 1) <= '9')


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nx/F-10/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	1 Mar 2009 06:52:17 -0000	1.16
+++ .cvsignore	7 Jun 2009 08:02:08 -0000	1.17
@@ -1,11 +1,11 @@
 docs.tar.bz2
 nxfind-provides.sh
-nxagent-3.3.0-10.tar.gz
 nxauth-3.3.0-1.tar.gz
-nxcomp-3.3.0-3.tar.gz
-nxcompext-3.3.0-3.tar.gz
 nxcompshad-3.3.0-3.tar.gz
 nxproxy-3.3.0-2.tar.gz
 nxscripts-3.3.0-1.tar.gz
 nxssh-3.3.0-1.tar.gz
-nx-X11-3.3.0-5.tar.gz
+nx-X11-3.3.0-6.tar.gz
+nxcompext-3.3.0-4.tar.gz
+nxcomp-3.3.0-4.tar.gz
+nxagent-3.3.0-13.tar.gz


Index: nx.spec
===================================================================
RCS file: /cvs/extras/rpms/nx/F-10/nx.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- nx.spec	1 Mar 2009 06:52:17 -0000	1.27
+++ nx.spec	7 Jun 2009 08:02:08 -0000	1.28
@@ -8,23 +8,23 @@
 Summary: Proxy system for X11
 Name: nx
 Version: 3.3.0
-Release: 33%{?dist}
+Release: 35%{?dist}
 # MIT on the X11 bits
 License: GPLv2 and MIT
 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}-3.tar.gz
-Source2: http://64.34.161.181/download/%{version}/sources/nxcompext-%{version}-3.tar.gz
+Source1: http://64.34.161.181/download/%{version}/sources/nxcomp-%{version}-4.tar.gz
+Source2: http://64.34.161.181/download/%{version}/sources/nxcompext-%{version}-4.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}-3.tar.gz
 # X11 Support Programs and Libraries
-Source5: http://64.34.161.181/download/%{version}/sources/nx-X11-%{version}-5.tar.gz
+Source5: http://64.34.161.181/download/%{version}/sources/nx-X11-%{version}-6.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}-10.tar.gz
+Source7: http://64.34.161.181/download/%{version}/sources/nxagent-%{version}-13.tar.gz
 # NX Example Scripts
 Source8: http://64.34.161.181/download/%{version}/sources/nxscripts-%{version}-1.tar.gz
 
@@ -32,6 +32,8 @@ Source9: nxwrapper.in
 Source10: docs.tar.bz2
 
 Source11: nxfind-provides.sh
+# Sent via upstream web form on 2009/05/17 (enquiry ID DE05C00477).
+Patch0: nx-gcc44.patch
 
 %define _use_internal_dependency_generator 0
 %define __find_provides sh %{SOURCE11}
@@ -55,6 +57,7 @@ NX provides a proxy system for the X Win
 
 %prep
 %setup -q -c %{name}-%{version} -T -a0 -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8
+%patch0 -p1 -b .gcc44
 perl -pi -e's,-L/usr/X11R6/lib,-L%{_x_libraries},' nxcompshad/Makefile.in
 export CFLAGS="%{optflags}"
 %ifarch x86_64 ppc64
@@ -168,6 +171,12 @@ rm -rf %{buildroot}
 %{_pkglibexecdir}
 
 %changelog
+* Sat Jun  6 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 3.3.0-35
+- Update to latest maintenance sources.
+
+* Sun May 17 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 3.3.0-34
+- Fix FTBFS: added nx-gcc44.patch.
+
 * Sat Feb 14 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 3.3.0-33
 - Update to 3.3.0.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nx/F-10/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	1 Mar 2009 06:52:17 -0000	1.17
+++ sources	7 Jun 2009 08:02:08 -0000	1.18
@@ -1,11 +1,11 @@
 0511072ee377316879bb91a75153ed47  docs.tar.bz2
 477190c6f366dfe2f5ce76978e52238a  nxfind-provides.sh
-7abd7812428aebcc48b996bcb5f1970b  nxagent-3.3.0-10.tar.gz
 6d59de2cbf61430ac513ddfa6b05bc76  nxauth-3.3.0-1.tar.gz
-2327cca8e6116fd6a96345566336d81d  nxcomp-3.3.0-3.tar.gz
-f138420fc7a005495675146a1e1539f2  nxcompext-3.3.0-3.tar.gz
 02f051366c4aae96bfefda60d701d8b4  nxcompshad-3.3.0-3.tar.gz
 047206e5a811b915aac4ae09bddef207  nxproxy-3.3.0-2.tar.gz
 4a36b323efbb731f8672758438a8a5c6  nxscripts-3.3.0-1.tar.gz
 e9bb4c1cd61c42db9626894845fcf3f7  nxssh-3.3.0-1.tar.gz
-6dae2fddc8081d30530f68e806105fd7  nx-X11-3.3.0-5.tar.gz
+954de7b8a3d1e6cd24bdc96db2857f1b  nx-X11-3.3.0-6.tar.gz
+421398e9f8878a9956aebbf9452ec40a  nxcompext-3.3.0-4.tar.gz
+0eb3866f1173767f185a1d62dd51dba0  nxcomp-3.3.0-4.tar.gz
+052091391a7340007db764025f36750a  nxagent-3.3.0-13.tar.gz