Sfoglia il codice sorgente

upgrade to new %option world order

Ralf S. Engelschall 23 anni fa
parent
commit
c8f635497e
1 ha cambiato i file con 7 aggiunte e 13 eliminazioni
  1. 7 13
      apache/apache.spec

+ 7 - 13
apache/apache.spec

@@ -59,9 +59,9 @@ Distribution: OpenPKG [BASE]
 Group:        Web
 License:      ASF
 Version:      %{V_apache}
-Release:      20021230
+Release:      20030103
 
-#   the additionally used Apache modules (can be enabled without thinking)
+#   package options (additionally used Apache modules; can be enabled without thinking)
 %option       with_mod_ssl            no
 %option       with_mod_perl           no
 %option       with_mod_php            no
@@ -70,7 +70,7 @@ Release:      20021230
 %option       with_mod_layout         no
 %option       with_mod_macro          no
 
-#   the additionally used Apache modules (you have to know what you do)
+#   package options (additionally used Apache modules; you have to know what you do)
 %option       with_mod_auth_pam       no
 %option       with_mod_gzip           no
 %option       with_mod_fastcgi        no
@@ -79,8 +79,7 @@ Release:      20021230
 %option       with_mod_roaming        no
 %option       with_mod_relocate       no
 
-#   more optional PHP4 specific settings
-#   (requires "with_mod_php" set to "yes" above!)
+#   package options (optional PHP4 specific settings; requires "with_mod_php")
 %option       with_mod_php_calendar   no
 %option       with_mod_php_mysql      no
 %option       with_mod_php_gd         no
@@ -103,8 +102,7 @@ Release:      20021230
 %option       with_mod_php_bc         no
 %option       with_mod_php_transsid   no
 
-#   more optional PHP3 specific settings
-#   (requires "with_mod_php3" set to "yes" above!)
+#   package options (optional PHP3 specific settings; requires "with_mod_php3")
 %option       with_mod_php3_ftp       no
 %option       with_mod_php3_gd        no
 %option       with_mod_php3_jpeg      no
@@ -167,8 +165,8 @@ Source23:     rc.apache
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20021230
-PreReq:       OpenPKG, openpkg >= 20021230
+BuildPreReq:  OpenPKG, openpkg >= 20030103
+PreReq:       OpenPKG, openpkg >= 20030103
 %if "%{with_mod_ssl}" == "yes"
 BuildPreReq:  openssl, mm
 %endif
@@ -224,7 +222,6 @@ BuildPreReq:  c-client
 BuildPreReq: expat
 %endif
 %endif
-
 %if "%{with_mod_php3}" == "yes"
 BuildPreReq:  make, bison, flex
 %if "%{with_mod_php3_gd}" == "yes"
@@ -243,7 +240,6 @@ BuildPreReq:  openssl
 BuildPreReq:  zlib
 %endif
 %endif
-
 %if "%{with_mod_auth_pam}" == "yes"
 BuildPreReq:  PAM
 PreReq:       PAM
@@ -262,8 +258,6 @@ AutoReqProv:  no
     of users have contributed ideas, code, and documentation to the
     project.
 
-    %options -p25
-
 %prep
     #   unpack Apache distribution
     %setup0 -q -c