SPECS: nx.spec - fixed trashing xorg deps to system - but pkg itself still ...

[glen]

Author: glen                         Date: Wed Nov 12 22:43:11 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fixed trashing xorg deps to system
- but pkg itself still broken; rel 4

---- Files affected:
SPECS:
   nx.spec (1.29 -> 1.30) 

---- Diffs:

================================================================
Index: SPECS/nx.spec
diff -u SPECS/nx.spec:1.29 SPECS/nx.spec:1.30
--- SPECS/nx.spec:1.29	Wed Oct 15 19:47:37 2008
+++ SPECS/nx.spec	Wed Nov 12 23:43:05 2008
@@ -1,8 +1,6 @@
 # $Revision$, $Date$
 # TODO
-# - this is bad?
-#  "libX11.so.6()(64bit)" is provided by following packages:
-#  a) nx-3.2.0-3.x86_64
+# - the x11 libraires packaged to %{_libdir}/NX aren't used, still links (without rpath) to system xorg libs
 %define		_agent_minor	10
 %define		_auth_minor	1
 %define		_comp_minor	7
@@ -15,7 +13,7 @@
 Summary(pl.UTF-8):	NoMachine NX to schemat kompresji nowej generacji dla X
 Name:		nx
 Version:	3.2.0
-Release:	3
+Release:	4
 License:	GPL
 Group:		Libraries
 #SourceDownload: http://www.nomachine.com/sources.php
@@ -61,6 +59,12 @@
 Provides:	nx-X11
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# don't satisfy xorg deps for the rest of the distro
+%define		_noautoprovfiles	%{_libdir}/NX
+
+# and as we don't provide them, don't require either
+%define		_noautoreq libX11.so libXext.so libXrender.so
+
 %description
 NoMachine NX is the next-generation X compression and roundtrip
 suppression scheme. It can operate remote X11 sessions over 56k modem
@@ -82,17 +86,15 @@
 
 # build Compression Library and Proxy
 for i in nxcomp nxproxy nxcompshad; do
-cd $i
-%configure
-%{__make}
-cd ..
+	cd $i
+	%configure
+	%{__make}
+	cd ..
 done
 
 # build X11 Support Libraries and Agents
 
-cd nx-X11
-%{__make} World
-cd ..
+%{__make} -C nx-X11 World
 
 # build Extended Compression Library
 cd nxcompext
@@ -100,7 +102,6 @@
 %{__make}
 
 %install
-
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_libdir}/{pkgconfig,NX},%{_bindir}}
 
@@ -132,6 +133,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.30  2008/11/12 22:43:05  glen
+- fixed trashing xorg deps to system
+- but pkg itself still broken; rel 4
+
 Revision 1.29  2008/10/15 17:47:37  glen
 - provides X11 libs. bad?
 
================================================================

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