SPECS: nx.spec - some re-arrangement, though doesn't work with freenx-serve...

aredridel aredridel at pld-linux.org
Sat Aug 16 16:51:24 CEST 2008


Author: aredridel                    Date: Sat Aug 16 14:51:23 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- some re-arrangement, though doesn't work with freenx-server yet without 
  mv on some binaries.

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

---- Diffs:

================================================================
Index: SPECS/nx.spec
diff -u SPECS/nx.spec:1.24 SPECS/nx.spec:1.25
--- SPECS/nx.spec:1.24	Wed Aug 13 09:25:13 2008
+++ SPECS/nx.spec	Sat Aug 16 16:51:18 2008
@@ -44,6 +44,9 @@
 BuildRequires:	xorg-cf-files
 BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	xorg-lib-libXt-devel
+BuildRequires:	xorg-lib-libXdamage-devel
+BuildRequires:	xorg-lib-libXrandr-devel
+BuildRequires:	xorg-lib-libXtst-devel
 BuildRequires:	xorg-util-imake
 Requires:	nxcomp >= %{version}.%{_comp_minor}
 Requires:	nxcompext >= %{version}.%{_compext_minor}
@@ -95,20 +98,13 @@
 %install
 
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_libdir}/pkgconfig,%{_bindir},%{_includedir}/nxcompsh}
+install -d $RPM_BUILD_ROOT{%{_libdir}/pkgconfig,%{_bindir}}
 
 # X11
-install nx-X11/lib/X11/libX11.so \
-	nx-X11/lib/Xext/libXext.so \
-	nx-X11/lib/Xrender/libXrender.so \
-	$RPM_BUILD_ROOT%{_libdir}
+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/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}
-
-# install Compression Libraries and Proxy
-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}
@@ -122,7 +118,6 @@
 %files
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/*.so
 %attr(755,root,root) %{_libdir}/*.so.*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -131,6 +126,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+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.
+
 Revision 1.24  2008/08/13 07:25:13  paszczus
 - small cleanup
 
================================================================

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



More information about the pld-cvs-commit mailing list