move to now fixed %{error} macro

apache/apache.spec

@@ -60,7 +60,7 @@ Distribution: OpenPKG [BASE]
 Group:        Web
 License:      ASF
 Version:      %{V_apache}
-Release:      20030922
+Release:      20031002
 
 #   package options (suexec related)
 %option       with_suexec               yes
@@ -136,7 +136,7 @@ Release:      20030922
 #   fixing implicit inter-module dependencies and correlations
 %if "%{with_mod_php}" == "yes"
 %if "%{with_mod_php3}" == "yes"
-RPM ERROR: with_mod_php conflicts with with_mod_php3
+    %{error:build-time options 'with_mod_php' and 'with_mod_php3' conflict}
 %endif
 %if "%{with_mod_ssl}" == "yes"
 %undefine     with_mod_php_openssl
@@ -199,8 +199,8 @@ Patch0:       apache.patch
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20030718
-PreReq:       OpenPKG, openpkg >= 20030718
+BuildPreReq:  OpenPKG, openpkg >= 20030927
+PreReq:       OpenPKG, openpkg >= 20030927
 %if "%{with_mod_ssl}" == "yes"
 BuildPreReq:  openssl, mm
 PreReq:       openssl, mm

gcc/gcc.spec

@@ -39,7 +39,7 @@ Distribution: OpenPKG [CORE]
 Group:        Compiler
 License:      GPL
 Version:      %{V_full}
-Release:      20030927
+Release:      20031002
 
 #   package options
 %option       with_cxx       yes
@@ -55,7 +55,7 @@ Release:      20030927
 
 #   options sanity check
 %if "%{with_bounds}" == "yes" && "%{with_spp}" == "yes"
-RPM ERROR: options with_bounds and with_ssp conflict
+    %{error:build-time options 'with_bounds' and 'with_spp' conflict}
 %endif
 
 #   list of sources
@@ -67,8 +67,8 @@ Patch2:       http://www.trl.ibm.com/projects/security/ssp/gcc3_3/protector-%{V_
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20030909, make
-PreReq:       OpenPKG, openpkg >= 20030909
+BuildPreReq:  OpenPKG, openpkg >= 20030927, make
+PreReq:       OpenPKG, openpkg >= 20030927
 %if "%{with_binutils}" == "yes"
 BuildPreReq:  binutils >= 2.13
 PreReq:       binutils >= 2.13