SPECS (AC-branch): openssh.spec - paths are already substituted by...

[glen]

Author: glen                         Date: Tue Dec 11 20:13:24 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- paths are already substituted by Makefile; rel 2
- gotar you suck

---- Files affected:
SPECS:
   openssh.spec (1.286.2.2 -> 1.286.2.3) 

---- Diffs:

================================================================
Index: SPECS/openssh.spec
diff -u SPECS/openssh.spec:1.286.2.2 SPECS/openssh.spec:1.286.2.3
--- SPECS/openssh.spec:1.286.2.2	Mon Oct 22 08:59:36 2007
+++ SPECS/openssh.spec	Tue Dec 11 21:13:19 2007
@@ -17,7 +17,7 @@
 # gtk2-based gnome-askpass means no gnome1-based
 %{?with_gtk:%undefine with_gnome}
 #
-%define		_rel	1
+%define		_rel	2
 #
 Summary:	OpenSSH free Secure Shell (SSH) implementation
 Summary(de.UTF-8):	OpenSSH - freie Implementation der Secure Shell (SSH)
@@ -549,10 +549,10 @@
 install contrib/gnome-ssh-askpass2 $RPM_BUILD_ROOT%{_libexecdir}/ssh/ssh-askpass
 %endif
 %if %{with gnome} || %{with gtk}
-cat << EOF >$RPM_BUILD_ROOT/etc/env.d/GNOME_SSH_ASKPASS_GRAB_SERVER
+cat << 'EOF' >$RPM_BUILD_ROOT/etc/env.d/GNOME_SSH_ASKPASS_GRAB_SERVER
 #GNOME_SSH_ASKPASS_GRAB_SERVER="true"
 EOF
-cat << EOF >$RPM_BUILD_ROOT/etc/env.d/GNOME_SSH_ASKPASS_GRAB_POINTER
+cat << 'EOF' >$RPM_BUILD_ROOT/etc/env.d/GNOME_SSH_ASKPASS_GRAB_POINTER
 #GNOME_SSH_ASKPASS_GRAB_POINTER="true"
 EOF
 ln -s %{_libexecdir}/ssh/ssh-askpass $RPM_BUILD_ROOT%{_libexecdir}/ssh-askpass
@@ -563,10 +563,6 @@
 
 touch $RPM_BUILD_ROOT/etc/security/blacklist.sshd
 
-%if "%{_lib}" != "lib"
-find $RPM_BUILD_ROOT%{_sysconfdir} -type f -print0 | xargs -0 sed -i -e 's#%{_prefix}/lib#%{_libdir}#'
-%endif
-
 cat << 'EOF' > $RPM_BUILD_ROOT/etc/env.d/SSH_ASKPASS
 #SSH_ASKPASS="%{_libexecdir}/ssh-askpass"
 EOF
@@ -685,6 +681,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.286.2.3  2007-12-11 20:13:19  glen
+- paths are already substituted by Makefile; rel 2
+- gotar you suck
+
 Revision 1.286.2.2  2007-10-22 06:59:36  hawk
 - updated to 4.7p1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/openssh.spec?r1=1.286.2.2&r2=1.286.2.3&f=u