packages: openssh/openssh.spec - build AC version from HEAD as well

glen glen at pld-linux.org
Mon Apr 5 15:18:03 CEST 2010


Author: glen                         Date: Mon Apr  5 13:18:03 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- build AC version from HEAD as well

---- Files affected:
packages/openssh:
   openssh.spec (1.328 -> 1.329) 

---- Diffs:

================================================================
Index: packages/openssh/openssh.spec
diff -u packages/openssh/openssh.spec:1.328 packages/openssh/openssh.spec:1.329
--- packages/openssh/openssh.spec:1.328	Sun Mar 28 22:19:59 2010
+++ packages/openssh/openssh.spec	Mon Apr  5 15:17:58 2010
@@ -1,4 +1,7 @@
 # $Revision$, $Date$
+# TODO
+# - configure: WARNING: unrecognized options: --with-dns, --disable-suid-ssh
+#
 # Conditional build:
 %bcond_with	gnome		# with gnome-askpass (GNOME 1.x) utility
 %bcond_without	gtk		# without GTK+ (2.x)
@@ -11,6 +14,12 @@
 # gtk2-based gnome-askpass means no gnome1-based
 %{?with_gtk:%undefine with_gnome}
 
+%if "%{pld_release}" == "ac"
+%define		pam_ver	0.79.0
+%else
+%define		pam_ver	0.99.7.1
+%endif
+
 Summary:	OpenSSH free Secure Shell (SSH) implementation
 Summary(de.UTF-8):	OpenSSH - freie Implementation der Secure Shell (SSH)
 Summary(es.UTF-8):	Implementación libre de SSH
@@ -37,6 +46,7 @@
 Source5:	ssh-agent.sh
 Source6:	ssh-agent.conf
 Source7:	%{name}-lpk.schema
+Patch100:	%{name}-heimdal.patch
 Patch0:		%{name}-no_libnsl.patch
 Patch2:		%{name}-pam_misc.patch
 Patch3:		%{name}-sigpipe.patch
@@ -65,12 +75,18 @@
 BuildRequires:	openssl-devel >= 0.9.7d
 BuildRequires:	pam-devel
 %{?with_gtk:BuildRequires:	pkgconfig}
+BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpmbuild(macros) >= 1.318
 BuildRequires:	zlib-devel
+%if "%{pld_release}" == "ac"
+Requires:	filesystem >= 2.0-1
+Requires:	pam >= 0.79.0
+%else
 Requires:	filesystem >= 3.0-11
-Requires:	pam >= 0.99.7.1
+Requires:	pam >= %{pam_ver}
 Suggests:	openssh-blacklist
 Suggests:	xorg-app-xauth
+%endif
 Obsoletes:	ssh
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -305,14 +321,14 @@
 Summary(ru.UTF-8):	OpenSSH - сервер протокола Secure Shell (sshd)
 Summary(uk.UTF-8):	OpenSSH - сервер протоколу Secure Shell (sshd)
 Group:		Networking/Daemons
-Requires(post):	chkconfig >= 0.9
+Requires(post):	/sbin/chkconfig
 Requires(post):	grep
 Requires(post,preun):	/sbin/chkconfig
 Requires(postun):	/usr/sbin/userdel
 Requires(pre):	/bin/id
 Requires(pre):	/usr/sbin/useradd
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires:	pam >= 0.99.7.1
+Requires:	pam >= %{pam_ver}
 Requires:	rc-scripts >= 0.4.1.23
 Requires:	util-linux
 Suggests:	/bin/login
@@ -457,6 +473,7 @@
 
 %prep
 %setup -q
+%{?with_kerberos5:%patch100 -p1}
 %patch0 -p1
 %patch2 -p1
 %patch3 -p1
@@ -489,7 +506,11 @@
 	%{?with_kerberos5:--with-kerberos5=/usr} \
 	--with-privsep-path=%{_privsepdir} \
 	--with-pid-dir=%{_localstatedir}/run \
+%if "%{pld_release}" == "ac"
+	--with-xauth=/usr/X11R6/bin/xauth \
+%else
 	--with-xauth=/usr/bin/xauth \
+%endif
 	--enable-utmpx \
 	--enable-wtmpx
 
@@ -691,6 +712,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.329  2010/04/05 13:17:58  glen
+- build AC version from HEAD as well
+
 Revision 1.328  2010/03/28 20:19:59  arekm
 - rel 1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openssh/openssh.spec?r1=1.328&r2=1.329&f=u



More information about the pld-cvs-commit mailing list