switch to %option(s)

postgresql/postgresql.spec

@@ -28,18 +28,10 @@
 %define       V_libpqxx     4.0
 
 #   package options
-%ifndef       with_openssl
+%option       with_openssl  no
-%define       with_openssl  no
+%option       with_odbc     no
-%endif
+%option       with_perl     no
-%ifndef       with_odbc
+%option       with_tcl      no
-%define       with_odbc     no
-%endif
-%ifndef       with_perl
-%define       with_perl     no
-%endif
-%ifndef       with_tcl
-%define       with_tcl      no
-%endif
 
 #   package information
 Name:         postgresql
@@ -51,7 +43,7 @@ Distribution: OpenPKG [BASE]
 Group:        Database
 License:      GPL
 Version:      %{V_postgresql}
-Release:      20021222
+Release:      20021230
 
 #   list of sources
 Source0:      ftp://ftp.postgresql.org/pub/source/v%{V_postgresql}/postgresql-%{V_postgresql}.tar.gz
@@ -62,8 +54,8 @@ Source3:      pg_migrate
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20020416, make, gcc, readline, flex, bison, zlib
+BuildPreReq:  OpenPKG, openpkg >= 20021230, make, gcc, readline, flex, bison, zlib
-PreReq:       OpenPKG, openpkg >= 20020416
+PreReq:       OpenPKG, openpkg >= 20021230
 %if "%{with_openssl}" == "yes"
 BuildPreReq:  openssl
 %endif
@@ -83,16 +75,12 @@ AutoReq:      no
 AutoReqProv:  no
 
 %description
-     PostgreSQL is a sophisticated Object-Relational DBMS, supporting
+    PostgreSQL is a sophisticated Object-Relational DBMS, supporting
-     almost all SQL constructs, including subselects, transactions,
+    almost all SQL constructs, including subselects, transactions,
-     and user-defined types and functions. It is the most advanced
+    and user-defined types and functions. It is the most advanced
-     open-source database available anywhere.
+    open-source database available anywhere.
 
-     Options:
+    %options -p12
-     --define 'with_openssl %{with_openssl}'
-     --define 'with_odbc %{with_odbc}'
-     --define 'with_perl %{with_perl}'
-     --define 'with_tcl %{with_tcl}'
 
 %prep
     %setup0 -q

proftpd/proftpd.spec

@@ -24,9 +24,7 @@
 ##
 
 #   package options
-%ifndef       with_pam
+%option       with_pam  no
-%define       with_pam  no
-%endif
 
 #   package information
 Name:         proftpd
@@ -38,7 +36,7 @@ Distribution: OpenPKG [BASE]
 Group:        FTP
 License:      GPL
 Version:      1.2.7
-Release:      20021219
+Release:      20021230
 
 #   list of sources
 Source0:      ftp://ftp.proftpd.net/distrib/source/proftpd-%{version}.tar.bz2
@@ -50,8 +48,8 @@ Source4:      rc.proftpd
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20021204, ncurses, make
+BuildPreReq:  OpenPKG, openpkg >= 20021230, ncurses, make
-PreReq:       OpenPKG, openpkg >= 20021204, ncurses
+PreReq:       OpenPKG, openpkg >= 20021230, ncurses
 %if "%{with_pam}" == "yes"
 BuildPreReq:  PAM
 PreReq:       PAM
@@ -75,8 +73,7 @@ AutoReqProv:  no
     list of some of the sites ProFTPD powers -- many of them handling large
     volumes of traffic on a daily basis.
 
-    Options: 
+    %options
-    --define 'with_pam %{with_pam}'
 
 %prep
     %setup -q

pureftpd/pureftpd.spec

@@ -24,9 +24,7 @@
 ##
 
 #   package options
-%ifndef       with_pam
+%option       with_pam  no
-%define       with_pam  no
-%endif
 
 #   package information
 Name:         pureftpd
@@ -38,7 +36,7 @@ Distribution: OpenPKG [BASE]
 Group:        FTP
 License:      GPL
 Version:      1.1.0
-Release:      20020916
+Release:      20021230
 
 #   list of sources
 Source0:      http://osdn.dl.sourceforge.net/sourceforge/pureftpd/pure-ftpd-%{version}.tar.gz
@@ -47,8 +45,8 @@ Source1:      rc.pureftpd
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20020206, make
+BuildPreReq:  OpenPKG, openpkg >= 20021230, make
-PreReq:       OpenPKG, openpkg >= 20020206
+PreReq:       OpenPKG, openpkg >= 20021230
 %if "%{with_pam}" == "yes"
 BuildPreReq:  PAM
 PreReq:       PAM
@@ -67,8 +65,7 @@ AutoReqProv:  no
     protocol, bandwidth throttling, ratios, LDAP, XML and HTML reports,
     support for external programs to post-process uploads and more.
 
-    Options: 
+    %options
-    --define 'with_pam %{with_pam}'
 
 %prep
     %setup -q -n pure-ftpd-%{version}