rpms/openssh/devel openssh.spec,1.200,1.201

[Jan F. Chadima]

Author: jfch2222

Update of /cvs/pkgs/rpms/openssh/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv5705

Modified Files:
	openssh.spec 
Log Message:
* Fri Mar 12 2010 Jan F. Chadima <jchadima at redhat.com> - 5.4p1-3 + 0.9.2-25
- repair configure script of pam_ssh_agent
- repair error mesage in ssh-keygen



Index: openssh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/openssh.spec,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -p -r1.200 -r1.201
--- openssh.spec	19 Mar 2010 20:21:36 -0000	1.200
+++ openssh.spec	20 Mar 2010 04:06:11 -0000	1.201
@@ -67,13 +67,8 @@
 %endif
 
 # Do not forget to bump pam_ssh_agent_auth release if you rewind the main package release to 1
-<<<<<<< openssh.spec
 %define openssh_rel 3
-%define pam_ssh_agent_rel 24
-=======
-%define openssh_rel 2
 %define pam_ssh_agent_rel 25
->>>>>>> 1.199
 %define pam_ssh_agent_ver 0.9.2
 
 Summary: An open source implementation of SSH protocol versions 1 and 2