[CentOS-devel] Updated nx/freenx packages

[Tru Huynh]

On Thu, Sep 30, 2010 at 02:44:25PM -0700, Akemi Yagi wrote:
> CentOS devs (perhaps Tru?),
> 
Hi,


> I have an updated version of nx/freenx ready. The srpms are:
> 
> http://centos.toracat.org/misc/nx-freenx/5/SRPMS/freenx-0.7.3-6.el5.centos.ay.src.rpm
> http://centos.toracat.org/misc/nx-freenx/5/SRPMS/nx-3.4.0-6.el5.centos.ay.src.rpm
I pulled both and had a quick look :P
> 
> Two tarballs (nxagent and nx-X11) in nx have been update to the
> current version (as of Sept 2010).
> 
ack'ed md5sums from http://www.nomachine.com/sources.php confirmed :)

> One main change done in this update is addition of support for
> RHEL6(beta). For example,
> 
> rpmbuild -bb --target x86_64 --define 'dist .el6.centos' --define
> "centos_ver 6" freenx.spec

that will not work since freenx-0.7.2-centos-el6-diffs.patch is not provided in
http://centos.toracat.org/misc/nx-freenx/5/SRPMS/freenx-0.7.3-6.el5.centos.ay.src.rpm
<quote>
%if "%centos_ver" == "5"
Patch1:         freenx-0.7.2-centos-diffs.patch
%endif
%if "%centos_ver" == "6"
Patch1:         freenx-0.7.2-centos-el6-diffs.patch
%endif
</quote>
to only one of them is included in the src.rpm :P

attached a proposed fix

Cheers,

Tru

-- 
Tru Huynh (mirrors, CentOS-3 i386/x86_64 Package Maintenance)
http://pgp.mit.edu:11371/pks/lookup?op=get&search=0xBEFA581B
-------------- next part --------------
--- freenx.spec.ori	2010-10-01 15:20:36.000000000 +0200
+++ freenx.spec	2010-10-01 15:23:58.000000000 +0200
@@ -21,12 +21,7 @@
 Source2:        nxserver.logrotate
 Patch631:       freenx-0.7.3-r631.patch
 Patch0:		freenx-0.7.1-nxnode-fullscreen.patch
-%if "%centos_ver" == "5"
 Patch1:         freenx-0.7.2-centos-diffs.patch
-%endif
-%if "%centos_ver" == "6"
-Patch1:		freenx-0.7.2-centos-el6-diffs.patch
-%endif
 Patch2:		freenx-0.7.2-initd-script.patch
 Patch3:		freenx-0.7.2-mswindows-sessreg.patch
 Patch4:		freenx-0.7.3-centos-nxserver.patch
@@ -36,6 +31,7 @@
 Patch8:		freenx-0.7.3-centos-space-in-passwd-bug4274.patch
 Patch9:		freenx-0.7.3-centos-leading-dash-in-passwd-bug4275.patch
 Patch10:	freenx-0.7.3-centos-md5sum-bug4360.patch
+Patch11:	freenx-0.7.2-centos-el6-diffs.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: openssh-server nc expect dbus-x11 perl xorg-x11-server-utils
@@ -69,7 +65,12 @@
 
 %patch631 -p1
 %patch0 -p1
+%if "%centos_ver" == "5"
 %patch1 -p1
+%endif
+%if "%centos_ver" == "6"
+%patch11 -p1
+%endif
 %patch2 -p1
 
 %if "%centos_ver" == "4"
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <http://lists.centos.org/pipermail/centos-devel/attachments/20101001/0dfc7d92/attachment.sig>