SPECS (AC-branch): nx.spec - merge changes in 1.10 (perl -> sed)

[aredridel]

Author: aredridel                    Date: Wed Jun  7 19:41:42 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merge changes in 1.10 (perl -> sed)

---- Files affected:
SPECS:
   nx.spec (1.9 -> 1.9.2.1) 

---- Diffs:

================================================================
Index: SPECS/nx.spec
diff -u SPECS/nx.spec:1.9 SPECS/nx.spec:1.9.2.1
--- SPECS/nx.spec:1.9	Thu Jan 26 22:08:23 2006
+++ SPECS/nx.spec	Wed Jun  7 21:41:36 2006
@@ -38,14 +38,15 @@
 Patch1:		%{name}compext-libs.patch
 Patch2:		%{name}viewer.patch
 URL:		http://www.nomachine.com/
-BuildRequires:	Xaw3d-devel
 BuildRequires:	XFree86-devel
+BuildRequires:	Xaw3d-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	libjpeg-devel
 BuildRequires:	libpng-devel
 BuildRequires:	libstdc++-devel
 BuildRequires:	openssl-devel
+BuildRequires:	sed >= 4.0
 BuildRequires:	which
 Requires:	XFree86
 Provides:	nx-X11
@@ -78,7 +79,7 @@
 
 cd ../nxcompext
 %configure
-perl -pi -e "s|LDFLAGS     = |LDFLAGS = -fPIC -L/usr/X11R6/%{_lib}|" Makefile
+sed -i -e "s|LDFLAGS     = |LDFLAGS = -fPIC -L/usr/X11R6/%{_lib}|" Makefile
 %{__make} \
 	CC="%{__cc}"
 
@@ -91,9 +92,9 @@
 ./configure \
 	--prefix=%{_prefix} \
 	--exec-prefix=%{_prefix}
-perl -pi -e "s|/usr/NX|%{_prefix}|" Makefile
-perl -pi -e "s|-lX11|-lX11-nx|" Makefile
-perl -pi -e "s|-lXext|-lXext -L/usr/X11R6/%{_lib}|" Makefile
+sed -i -e "s|/usr/NX|%{_prefix}|" Makefile
+sed -i -e "s|-lX11|-lX11-nx|" Makefile
+sed -i -e "s|-lXext|-lXext -L/usr/X11R6/%{_lib}|" Makefile
 %{__make}
 
 cd ../nxviewer
@@ -141,9 +142,8 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
+%post	-p /sbin/ldconfig
+%postun	-p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
@@ -156,11 +156,17 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9.2.1  2006/06/07 19:41:36  aredridel
+- merge changes in 1.10 (perl -> sed)
+
+Revision 1.10  2006/01/26 22:00:26  glen
+- use sed for inline edits (as perl does not return errors on failures)
+
 Revision 1.9  2006/01/26 21:08:23  arekm
 - rel 1
 
 Revision 1.8  2006/01/26 18:52:47  arekm
-__cc bugfix
+- __cc bugfix
 
 Revision 1.7  2006/01/26 18:37:29  arekm
 - updated
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/nx.spec?r1=1.9&r2=1.9.2.1&f=u