SPECS: nx.spec - small cleanup

[paszczus]

Author: paszczus                     Date: Wed Aug 13 07:25:18 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- small cleanup

---- Files affected:
SPECS:
   nx.spec (1.23 -> 1.24) 

---- Diffs:

================================================================
Index: SPECS/nx.spec
diff -u SPECS/nx.spec:1.23 SPECS/nx.spec:1.24
--- SPECS/nx.spec:1.23	Wed Aug 13 09:19:22 2008
+++ SPECS/nx.spec	Wed Aug 13 09:25:13 2008
@@ -5,6 +5,7 @@
 %define		_compext_minor	1
 %define	 	_compshad_minor	3
 %define		_proxy_minor	1
+%define		_win_minor	4
 %define		_X11_minor	2
 Summary:	NoMachine NX is the next-generation X compression scheme
 Summary(pl.UTF-8):	NoMachine NX to schemat kompresji nowej generacji dla X
@@ -28,12 +29,8 @@
 # Source5-md5:	cd1296ebd24b1d7c4f82537a395ad6e8
 Source6:	http://web04.nomachine.com/download/%{version}/sources/%{name}compshad-%{version}-%{_compshad_minor}.tar.gz
 # Source6-md5:	6edfa4f65f579306f05af2451249c2bf
-Patch0:		%{name}-X11-libs.patch
-Patch1:		%{name}compext-libs.patch
-Patch2:		%{name}viewer.patch
-Patch3:		%{name}-gcc-4.1.patch
-Patch4:		%{name}-fonts.patch
-Patch5:		%{name}-system-nxcomp.patch
+Source7:	http://web04.nomachine.com/download/%{version}/sources/%{name}win-%{version}-%{_compshad_minor}.tar.gz
+# Source7-md5:	30ee1c2ae1c1a46bb130e84ae4646a42
 URL:		http://www.nomachine.com/
 #BuildRequires:	Xaw3d-devel
 BuildRequires:	autoconf
@@ -67,13 +64,7 @@
 zdalnych sesjach X11 nawet przy prędkosci 56k albo większej.
 
 %prep
-%setup -q -c -a1 -a2 -a3 -a4 -a5 -a6
-#%patch0 -p1
-#%patch1
-#%patch2 -p1
-#%patch3 -p1
-#%patch4 -p0
-#%patch5 -p1
+%setup -q -c -a1 -a2 -a3 -a4 -a5 -a6 -a7
 
 %build
 export CFLAGS="%{rpmcflags} -fPIC"
@@ -112,12 +103,12 @@
 	nx-X11/lib/Xrender/libXrender.so \
 	$RPM_BUILD_ROOT%{_libdir}
 install nx-X11/programs/Xserver/nxagent $RPM_BUILD_ROOT%{_bindir}
-rm -f $RPM_BUILD_ROOT%{_libdir}/libX{11-nx.so.6,ext-nx.so.6,render-nx.so.1}
+#rm -f $RPM_BUILD_ROOT%{_libdir}/libX{11-nx.so.6,ext-nx.so.6,render-nx.so.1}
 
 # install Compression Libraries and Proxy
-cp -a nxcomp/libXcomp.so.* $RPM_BUILD_ROOT%{_libdir}
-cp -a nxcompext/libXcompext.so.* $RPM_BUILD_ROOT%{_libdir}
-cp -a nxcompshad/libXcompshad.so.* $RPM_BUILD_ROOT%{_libdir}
+install nxcomp/libXcomp.so.* $RPM_BUILD_ROOT%{_libdir}
+install nxcompext/libXcompext.so.* $RPM_BUILD_ROOT%{_libdir}
+install nxcompshad/libXcompshad.so.* $RPM_BUILD_ROOT%{_libdir}
 
 # proxy
 install nxproxy/nxproxy $RPM_BUILD_ROOT%{_bindir}
@@ -140,6 +131,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.24  2008/08/13 07:25:13  paszczus
+- small cleanup
+
 Revision 1.23  2008/08/13 07:19:22  paszczus
 - added more Requires
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/nx.spec?r1=1.23&r2=1.24&f=u