SPECS (AC-branch): freenx.spec - merge patches from HEAD

[aredridel]

Author: aredridel                    Date: Tue May 23 05:30:00 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merge patches from HEAD

---- Files affected:
SPECS:
   freenx.spec (1.17.2.1 -> 1.17.2.2) 

---- Diffs:

================================================================
Index: SPECS/freenx.spec
diff -u SPECS/freenx.spec:1.17.2.1 SPECS/freenx.spec:1.17.2.2
--- SPECS/freenx.spec:1.17.2.1	Tue May 23 07:14:55 2006
+++ SPECS/freenx.spec	Tue May 23 07:29:55 2006
@@ -9,6 +9,7 @@
 Group:		X11/Applications/Networking
 Source0:	http://debian.tu-bs.de/knoppix/nx/snapshots/freenx-%{version}-test-%{cvs}.tar.gz
 # Source0-md5:	db02370347fc31dd190db047f4481022
+Patch0:	freenx-node-conf.patch
 URL:		http://debian.tu-bs.de/knoppix/nx/
 BuildRequires:	sed >= 4.0
 Requires:	expect
@@ -39,6 +40,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}-test-%{cvs}
+%patch0 -p1
 
 #%build
 # THIS ALL IS BROKEN. create .patch next time.
@@ -84,21 +86,17 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.17.2.1  2006/05/23 05:14:55  aredridel
-- up to 0.5.0 test
+Revision 1.17.2.2  2006/05/23 05:29:55  aredridel
+- merge patches from HEAD
 
-Revision 1.19  2006/05/23 05:12:45  aredridel
-- add default config
-
-Revision 1.18  2006/05/23 05:12:02  aredridel
+Revision 1.17.2.1  2006/05/23 05:14:55  aredridel
 - up to 0.5.0 test
-- Xorg deps
 
 Revision 1.17  2006/01/27 21:23:40  arekm
-R: xinitrc-ng
+- R: xinitrc-ng
 
 Revision 1.16  2006/01/26 19:25:07  arekm
-nxclient requires XFree86-tools (xmessage)
+- nxclient requires XFree86-tools (xmessage)
 
 Revision 1.15  2006/01/08 05:20:30  aredridel
 - up to pre-0.4.3 CVS 20060107
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/freenx.spec?r1=1.17.2.1&r2=1.17.2.2&f=u