SPECS: nx.spec - put libs in /usr/lib/NX - ldconfig symlinks properly so th...

[aredridel]

Author: aredridel                    Date: Sat Aug 16 21:28:06 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- put libs in /usr/lib/NX
- ldconfig symlinks properly so that freenx PATH_LIB can handle the rest

---- Files affected:
SPECS:
   nx.spec (1.25 -> 1.26) 

---- Diffs:

================================================================
Index: SPECS/nx.spec
diff -u SPECS/nx.spec:1.25 SPECS/nx.spec:1.26
--- SPECS/nx.spec:1.25	Sat Aug 16 16:51:18 2008
+++ SPECS/nx.spec	Sat Aug 16 23:28:01 2008
@@ -98,12 +98,10 @@
 %install
 
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_libdir}/pkgconfig,%{_bindir}}
+install -d $RPM_BUILD_ROOT{%{_libdir}/{pkgconfig,NX},%{_bindir}}
 
 # X11
-install nx-X11/lib/X11/libX11.so.6.2 $RPM_BUILD_ROOT%{_libdir}/libX11-nx.so.6.2
-install nx-X11/lib/Xext/libXext.so.6.4 $RPM_BUILD_ROOT%{_libdir}/libXext-nx.so.6.4
-install nx-X11/lib/Xrender/libXrender.so.1.2.2 $RPM_BUILD_ROOT%{_libdir}/libXrender-nx.so.1.2.2
+install nx-X11/lib/X11/libX11.so.6.2 nx-X11/lib/Xext/libXext.so.6.4 nx-X11/lib/Xrender/libXrender.so.1.2.2 $RPM_BUILD_ROOT%{_libdir}/NX
 install nx-X11/programs/Xserver/nxagent $RPM_BUILD_ROOT%{_bindir}
 
 # proxy
@@ -112,13 +110,17 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post	-p /sbin/ldconfig
-%postun	-p /sbin/ldconfig
+%post
+/sbin/ldconfig %{_libdir}/NX
+
+%postun	
+/sbin/ldconfig %{_libdir}/NX
 
 %files
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/*.so.*
+%dir %{_libdir}/NX
+%attr(755,root,root) %{_libdir}/NX/*.so.*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -126,6 +128,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.26  2008/08/16 21:28:01  aredridel
+- put libs in /usr/lib/NX
+- ldconfig symlinks properly so that freenx PATH_LIB can handle the rest
+
 Revision 1.25  2008/08/16 14:51:18  aredridel
 - some re-arrangement, though doesn't work with freenx-server yet without
   mv on some binaries.
================================================================

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