Użytkownik Arkadiusz Miskiewicz napisał:

On Thursday 18 of November 2004 18:47, Grzegorz Grasza wrote:



OK - or maybe delete them and include them in nx.spec (as seperate
packages) ?


Why? Do nx needs these two while being build?

We don't merge packages if these can live as separate.


So here is a patch (according to your directions) - it builds well on athlon.
We still have to remove nxcompext.spec - it is outdated, and the new version won't build without nx-X11 .


Index: nx.spec
===================================================================
RCS file: /cvsroot/SPECS/nx.spec,v
retrieving revision 1.2
diff -u -r1.2 nx.spec
--- nx.spec	18 Nov 2004 06:24:22 -0000	1.2
+++ nx.spec	18 Nov 2004 19:22:33 -0000
@@ -7,8 +7,6 @@
 License:	GPL
 Group:		Libraries
 #SourceDownload: http://www.nomachine.com/download/snapshot/nxsources/
-Source0:	http://www.nomachine.com/download/nxsources/nxproxy/%{name}proxy-%{version}-2.tar.gz
-#Source0-md5:	15d89810730c7ed0e669b5525e5f3620
 Source1:	http://www.nomachine.com/download/nxsources/nxcomp/%{name}comp-%{version}-29.tar.gz
 #Source1-md5:	cf17be978269ff0fc69de94c633ec5b2
 Source2:	http://www.nomachine.com/download/nxsources/nxcompext/%{name}compext-%{version}-3.tar.gz
@@ -31,9 +29,11 @@
 BuildRequires:	libpng-devel
 BuildRequires:	libstdc++-devel
 BuildRequires:	openssl-devel
+BuildRequires:	nxcomp-devel
 Provides:	nx-X11
 Requires:	XFree86
-
+Requires:	nxcomp
+Requires:	nxproxy
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -46,18 +46,10 @@
 zdalnych sesjach X11 nawet przy pr�dkosci 56k albo wi�kszej.
 
 %prep
-%setup -q -T -n nxcomp -b0 -b1 -b2 -b3 -b4 -b5 -b6 -b7
+%setup -q -T -n nxcomp -b1 -b2 -b3 -b4 -b5 -b6 -b7
 
 %build
 cd $RPM_BUILD_DIR
-cd nxcomp
-%configure
-%{__make}
-cd ..
-cd nxproxy
-%configure
-%{__make}
-cd ..
 cd nx-X11
 %{__make} World
 cd ..
@@ -88,14 +80,12 @@
 	nxcomp/libXcomp.so.* \
 	nxcompext/libXcompext.so* \
 	$RPM_BUILD_ROOT/%{_libdir}/NX/lib
-cp -a nxproxy/nxproxy \
-	nxviewer/nxviewer/nxviewer \
+cp -a nxviewer/nxviewer/nxviewer \
 	nxviewer/nxpasswd/nxpasswd \
 	nxdesktop/nxdesktop \
 	nx-X11/programs/Xserver/nxagent \
 	$RPM_BUILD_ROOT/%{_bindir}
 chmod 755 $RPM_BUILD_ROOT/%{_bindir}/nxagent \
-	$RPM_BUILD_ROOT/%{_bindir}/nxproxy \
 	$RPM_BUILD_ROOT/%{_bindir}/nxviewer \
 	$RPM_BUILD_ROOT/%{_bindir}/nxpasswd \
 	$RPM_BUILD_ROOT/%{_bindir}/nxdesktop \
_______________________________________________
pld-devel-en mailing list
[EMAIL PROTECTED]
http://lists.pld-linux.org/mailman/listinfo/pld-devel-en

Reply via email to