fix pamtool usage & Options description syntax

proftpd/proftpd.spec

@@ -38,7 +38,7 @@ Distribution: OpenPKG [BASE]
 Group:        FTP
 License:      GPL
 Version:      1.2.6
-Release:      20020904
+Release:      20020916
 
 #   list of sources
 Source0:      ftp://ftp.proftpd.net/distrib/source/proftpd-%{version}.tar.bz2
@@ -75,7 +75,8 @@ AutoReqProv:  no
     list of some of the sites ProFTPD powers -- many of them handling large
     volumes of traffic on a daily basis.
 
-    Options: with_pam=%{with_pam}
+    Options: 
+    --define 'with_pam %{with_pam}'
 
 %prep
     %setup -q
@@ -168,7 +169,7 @@ AutoReqProv:  no
 %if "%{with_pam}" == "yes"
     #   add PAM configuration entry
     if [ $1 -eq 1 ]; then
-        $RPM_INSTALL_PREFIX/sbin/pamtool -a -s -n "proftpd"
+        $RPM_INSTALL_PREFIX/sbin/pamtool --add --smart --name=proftpd
     fi
 %endif
 
@@ -176,7 +177,7 @@ AutoReqProv:  no
 %if "%{with_pam}" == "yes"
     #   remove PAM configuration entry
     if [ $1 -eq 0 ]; then
-        $RPM_INSTALL_PREFIX/sbin/pamtool -r -s -n "proftpd"
+        $RPM_INSTALL_PREFIX/sbin/pamtool --remove --smart --name=proftpd
     fi
 %endif
     if [ $1 -eq 0 ]; then

pureftpd/pureftpd.spec

@@ -38,7 +38,7 @@ Distribution: OpenPKG [BASE]
 Group:        FTP
 License:      GPL
 Version:      1.1.0
-Release:      20020819
+Release:      20020916
 
 #   list of sources
 Source0:      http://belnet.dl.sourceforge.net/sourceforge/pureftpd/pure-ftpd-%{version}.tar.gz
@@ -67,7 +67,8 @@ AutoReqProv:  no
     protocol, bandwidth throttling, ratios, LDAP, XML and HTML reports,
     support for external programs to post-process uploads and more.
 
-    Options: with_pam=%{with_pam}
+    Options: 
+    --define 'with_pam %{with_pam}'
 
 %prep
     %setup -q -n pure-ftpd-%{version}
@@ -113,7 +114,7 @@ AutoReqProv:  no
 %if "%{with_pam}" == "yes"
     #   add PAM configuration entry
     if [ $1 -eq 1 ]; then
-        $RPM_INSTALL_PREFIX/sbin/pamtool -a -s -n "pureftpd"
+        $RPM_INSTALL_PREFIX/sbin/pamtool --add --smart --name=pureftpd
     fi
 %endif
 
@@ -121,7 +122,7 @@ AutoReqProv:  no
 %if "%{with_pam}" == "yes"
     #   remove PAM configuration entry
     if [ $1 -eq 0 ]; then
-        $RPM_INSTALL_PREFIX/sbin/pamtool -r -s -n "pureftpd"
+        $RPM_INSTALL_PREFIX/sbin/pamtool --remove --smart --name=pureftpd
     fi
 %endif
 

qpopper/qpopper.spec

@@ -38,7 +38,7 @@ Distribution: OpenPKG [BASE]
 Group:        Mail
 License:      GPL
 Version:      4.0.4
-Release:      20020911
+Release:      20020916
 
 #   list of sources
 Source0:      ftp://ftp.qualcomm.com/eudora/servers/unix/popper/qpopper%{version}.tar.gz
@@ -62,7 +62,8 @@ Provides:     POP
 %description
     Qualcom Popper is a full-featured POP3 daemon.
 
-    Options: with_pam=%{with_pam}
+    Options: 
+    --define 'with_pam %{with_pam}'
 
 %prep
     %setup0 -q -c
@@ -151,7 +152,7 @@ Provides:     POP
 %if "%{with_pam}" == "yes"
     #   add PAM configuration entry
     if [ $1 -eq 1 ]; then
-        $RPM_INSTALL_PREFIX/sbin/pamtool -a -s -n "qpopper"
+        $RPM_INSTALL_PREFIX/sbin/pamtool --add --smart --name=qpopper
     fi
 %endif
 
@@ -159,7 +160,7 @@ Provides:     POP
 %if "%{with_pam}" == "yes"
     #   remove PAM configuration entry
     if [ $1 -eq 0 ]; then
-        $RPM_INSTALL_PREFIX/sbin/pamtool -r -s -n "qpopper"
+        $RPM_INSTALL_PREFIX/sbin/pamtool --remove --smart --name=qpopper
     fi
 %endif
 

samba/samba.spec

@@ -38,7 +38,7 @@ Distribution: OpenPKG [BASE]
 Group:        Filesystem
 License:      GPL
 Version:      2.2.5
-Release:      20020810
+Release:      20020916
 
 #   list of sources
 Source0:      http://download.samba.org/samba/ftp/samba-%{version}.tar.bz2
@@ -62,6 +62,9 @@ AutoReqProv:  no
     Samba is an open source software suite that provides seamless file
     and print services to SMB/CIFS clients.
 
+    Options:
+    --define 'with_pam %{with_pam}'
+
 %prep
     %setup -q
 
@@ -155,7 +158,7 @@ AutoReqProv:  no
 %if "%{with_pam}" == "yes"
     #   add PAM configuration entry
     if [ $1 -eq 1 ]; then
-        $RPM_INSTALL_PREFIX/sbin/pamtool -a -s -n "smbd"
+        $RPM_INSTALL_PREFIX/sbin/pamtool --add --smart --name=smbd
     fi
 %endif
 
@@ -163,7 +166,7 @@ AutoReqProv:  no
 %if "%{with_pam}" == "yes"
     #   remove PAM configuration entry
     if [ $1 -eq 0 ]; then
-        $RPM_INSTALL_PREFIX/sbin/pamtool -r -s -n "smbd"
+        $RPM_INSTALL_PREFIX/sbin/pamtool --remove --smart --name=smbd
     fi
 %endif
 

sudo/sudo.spec

@@ -38,7 +38,7 @@ Distribution: OpenPKG [BASE]
 Group:        System
 License:      BSD
 Version:      1.6.6
-Release:      20020828
+Release:      20020916
 
 #   list of sources
 Source0:      ftp://ftp.courtesan.com/pub/sudo/sudo-%{version}.tar.gz
@@ -60,7 +60,8 @@ AutoReqProv:  no
     users (or groups of users) the ability to run some (or all) commands
     as root or another user while logging the commands and arguments.
 
-    Options: with_pam=%{with_pam}
+    Options: 
+    --define 'with_pam %{with_pam}'
 
 %prep
     %setup -q
@@ -123,7 +124,7 @@ AutoReqProv:  no
 %if "%{with_pam}" == "yes"
     #   add PAM configuration entry
     if [ $1 -eq 1 ]; then
-        $RPM_INSTALL_PREFIX/sbin/pamtool -a -s -n "sudo"
+        $RPM_INSTALL_PREFIX/sbin/pamtool --add --smart --name=sudo
     fi
 %endif
 
@@ -131,7 +132,7 @@ AutoReqProv:  no
 %if "%{with_pam}" == "yes"
     #   remove PAM configuration entry
     if [ $1 -eq 0 ]; then
-        $RPM_INSTALL_PREFIX/sbin/pamtool -r -s -n "sudo"
+        $RPM_INSTALL_PREFIX/sbin/pamtool --remove --smart --name=sudo
     fi
 %endif