upgrade to new %option world order

apache/apache.spec

@@ -32,9 +32,34 @@
 ##  a example of what is maximum possible with RPM and how far one can
 ##  go with the macro mechanism. But do not try to repeat this!
 
-##  ATTENTION: DO NOT EDIT THE FOLLOWING DEFAULTS DIRECTLY IN THIS FILE!
-##  INSTEAD USE --define "with_xxx yes" ON THE COMMAND LINE. THE REASON
-##  IS THAT RPM'S MACRO MECHANISM HORSES UP HORRIBLY ELSE!
+#   package component versions
+%define       V_apache             1.3.27
+%define       V_mod_ssl            2.8.12-1.3.27
+%define       V_mod_perl           1.27
+%define       V_mod_php            4.3.0
+%define       V_mod_php3           3.0.18
+%define       V_mod_dav            1.0.3-1.3.6
+%define       V_mod_layout         3.2
+%define       V_mod_macro          1.1.2
+%define       V_mod_auth_pam       1.0a
+%define       V_mod_gzip           1.3.19.1a
+%define       V_mod_fastcgi        2.2.12
+%define       V_mod_throttle       312
+%define       V_mod_access_referer 1.0.2
+%define       V_mod_roaming        1.0.2
+%define       V_mod_relocate       1.0
+
+#   package information
+Name:         apache
+Summary:      Apache HTTP Server
+URL:          http://httpd.apache.org/
+Vendor:       Apache Software Foundation
+Packager:     The OpenPKG Project
+Distribution: OpenPKG [BASE]
+Group:        Web
+License:      ASF
+Version:      %{V_apache}
+Release:      20021230
 
 #   the additionally used Apache modules (can be enabled without thinking)
 %option       with_mod_ssl            no
@@ -118,35 +143,6 @@ ERROR: with_mod_php conflicts with with_mod_php3
 %endif
 %endif
 
-#   package component versions
-%define       V_apache             1.3.27
-%define       V_mod_ssl            2.8.12-1.3.27
-%define       V_mod_perl           1.27
-%define       V_mod_php            4.3.0
-%define       V_mod_php3           3.0.18
-%define       V_mod_dav            1.0.3-1.3.6
-%define       V_mod_layout         3.2
-%define       V_mod_macro          1.1.2
-%define       V_mod_auth_pam       1.0a
-%define       V_mod_gzip           1.3.19.1a
-%define       V_mod_fastcgi        2.2.12
-%define       V_mod_throttle       312
-%define       V_mod_access_referer 1.0.2
-%define       V_mod_roaming        1.0.2
-%define       V_mod_relocate       1.0
-
-#   package information
-Name:         apache
-Summary:      Apache HTTP Server
-URL:          http://httpd.apache.org/
-Vendor:       Apache Software Foundation
-Packager:     The OpenPKG Project
-Distribution: OpenPKG [BASE]
-Group:        Web
-License:      ASF
-Version:      %{V_apache}
-Release:      20021230
-
 #   list of sources
 Source0:      http://www.apache.org/dist/httpd/apache_%{V_apache}.tar.gz
 Source1:      http://www.modssl.org/source/mod_ssl-%{V_mod_ssl}.tar.gz

openssh/openssh.spec

@@ -28,13 +28,6 @@
 %define       V_portable   p1
 %define       V_chroot     3.5
 
-#   package options
-%option       with_pam     no
-%option       with_pcre    no
-%option       with_skey    no
-%option       with_x11     %{l_test -p x11}
-%option       with_chroot  no
-
 #   package information
 Name:         openssh
 Summary:      Secure Shell (SSH)
@@ -45,7 +38,14 @@ Distribution: OpenPKG [CORE]
 Group:        Security
 License:      BSD
 Version:      %{V_base}%{V_portable}
-Release:      20021231
+Release:      20030103
+
+#   package options
+%option       with_pam     no
+%option       with_pcre    no
+%option       with_skey    no
+%option       with_x11     %{l_test -p x11}
+%option       with_chroot  no
 
 #   list of sources
 Source0:      ftp://ftp.openssh.com/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
@@ -62,8 +62,8 @@ Source9:      http://chrootssh.sourceforge.net/patches/osshChroot-%{V_chroot}.di
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20021230, fsl, perl, openssl, zlib
-PreReq:       OpenPKG, openpkg >= 20021230, fsl
+BuildPreReq:  OpenPKG, openpkg >= 20030103, fsl, perl, openssl, zlib
+PreReq:       OpenPKG, openpkg >= 20030103, fsl
 %if "%{with_pam}" == "yes"
 BuildPreReq:  PAM
 PreReq:       PAM
@@ -92,8 +92,6 @@ AutoReqProv:  no
     terms of security and features, as well as removing all patented
     algorithms to separate libraries (OpenSSL).
 
-    %options -p11
-
 %prep
     #   unpack distribution
     %setup -q