- make option defaults really defaults - fix PAM support

openssh/openssh.spec

@@ -23,9 +23,16 @@
 ##  SUCH DAMAGE.
 ##
 
-%define       with_pam            yes
+#   package options
-%define       with_pcre           no
+%ifndef       with_pam
-%define       with_skey           no
+%define       with_pam     yes
+%endif
+%ifndef       with_pcre
+%define       with_pcre    no
+%endif
+%ifndef       with_skey
+%define       with_skey    no
+%endif
 
 #   package information
 Name:         openssh
@@ -37,7 +44,7 @@ Distribution: OpenPKG [REL]
 Group:        Cryptography
 License:      BSD
 Version:      3.1p1
-Release:      20020311
+Release:      20020312
 
 #   list of sources
 Source0:      ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
@@ -211,9 +218,13 @@ AutoReqProv:  no
     fi
 
     #   add PAM configuration entry
+%if "%{with_pam}" == "yes"
     $RPM_INSTALL_PREFIX/sbin/pamtool -a -s -n "openssh"
+%endif
 
 %preun
     #   remove PAM configuration entry
+%if "%{with_pam}" == "yes"
     $RPM_INSTALL_PREFIX/sbin/pamtool -r -s -n "openssh"
+%endif