switch to %option(s)

perl-dbi/perl-dbi.spec

@@ -34,15 +34,9 @@
 %define       V_dbd_oracle     1.12
 
 #   package options
-%ifndef       with_dbd_mysql
-%define       with_dbd_mysql   no
-%endif
-%ifndef       with_dbd_pg
-%define       with_dbd_pg      no
-%endif
-%ifndef       with_dbd_oracle
-%define       with_dbd_oracle  no
-%endif
+%option       with_dbd_mysql   no
+%option       with_dbd_pg      no
+%option       with_dbd_oracle  no
 
 #   package information
 Name:         perl-dbi
@@ -53,8 +47,8 @@ Packager:     The OpenPKG Project
 Distribution: OpenPKG [BASE]
 Group:        Language
 License:      GPL/Artistic
-Version:      20021229
-Release:      20021229
+Version:      20021230
+Release:      20021230
 
 #   list of sources
 Source0:      http://www.cpan.org/modules/by-module/DBI/DBI-%{V_dbi}.tar.gz
@@ -69,8 +63,8 @@ Source7:      http://www.cpan.org/modules/by-module/DBD/DBD-Oracle-%{V_dbd_oracl
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20020206, perl >= 5.8.0, perl-net
-PreReq:       OpenPKG, openpkg >= 20020206, perl >= 5.8.0, perl-net
+BuildPreReq:  OpenPKG, openpkg >= 20021230, perl >= 5.8.0, perl-net
+PreReq:       OpenPKG, openpkg >= 20021230, perl >= 5.8.0, perl-net
 %if "%{with_dbd_mysql}" == "yes"
 BuildPreReq:  mysql
 PreReq:       mysql
@@ -93,10 +87,7 @@ AutoReqProv:  no
     - DBD::Pg (%{V_dbd_pg}) [%{with_dbd_pg}]
     - DBD::Oracle (%{V_dbd_oracle}) [%{with_dbd_oracle}]
 
-    Options:
-    --define 'with_dbd_mysql %{with_dbd_mysql}'
-    --define 'with_dbd_pg %{with_dbd_pg}'
-    --define 'with_dbd_oracle %{with_dbd_oracle}'
+    %options -p15
 
 %prep
     %setup0 -q -c

perl-xml/perl-xml.spec

@@ -53,21 +53,17 @@
 %define       V_xml_gdome            0.82
 
 #   package options
-%ifndef       with_libxml
-%define       with_libxml            %{l_test -p libxml}
-%endif
-%ifndef       with_libxslt
-%define       with_libxslt           %{l_test -p libxslt}
-%endif
-%ifndef       with_libgdome
-%define       with_libgdome          %{l_test -p libgdome}
-%endif
+%option       with_libxml            %{l_test -p libxml}
+%option       with_libxslt           %{l_test -p libxslt}
+%option       with_libgdome          %{l_test -p libgdome}
 
 #   package inter-dependencies
-%if "%{with_libxslt}" == "yes" && "%{with_libxml}" == "no"
+%if "%{with_libxslt}" == "yes"
+%undefine     with_libxml
 %define       with_libxml            yes
 %endif
-%if "%{with_libgdome}" == "yes" && "%{with_libxml}" == "no"
+%if "%{with_libgdome}" == "yes"
+%undefine     with_libxml
 %define       with_libxml            yes
 %endif
 
@@ -80,8 +76,8 @@ Packager:     The OpenPKG Project
 Distribution: OpenPKG [BASE]
 Group:        Language
 License:      GPL/Artistic
-Version:      20021215
-Release:      20021215
+Version:      20021230
+Release:      20021230
 
 #   list of sources
 Source0:      http://www.cpan.org/modules/by-module/XML/XML-Parser-%{V_xml_parser}.tar.gz
@@ -115,8 +111,8 @@ Source26:     http://www.cpan.org/modules/by-module/XML/XML-GDOME-%{V_xml_gdome}
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20021002, perl >= 5.8.0, expat
-PreReq:       OpenPKG, openpkg >= 20021002, perl >= 5.8.0
+BuildPreReq:  OpenPKG, openpkg >= 20021230, perl >= 5.8.0, expat
+PreReq:       OpenPKG, openpkg >= 20021230, perl >= 5.8.0
 %if "%{with_libxml}" == "yes"
 BuildPreReq:  libxml
 %endif
@@ -165,7 +161,7 @@ AutoReqProv:  no
     - SOAP::Lite::SmartProxy (%{V_soap_lite_smartproxy})
     - SOAP::payload (%{V_soap_payload})
 
-    Options: none
+    %options -p13
 
 %prep
     %setup0  -q -c