Author: glen                         Date: Sat Mar  5 17:14:12 2005 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- bcond minimal

---- Files affected:
SPECS:
   apache1.spec (1.83.2.6 -> 1.83.2.7) 

---- Diffs:

================================================================
Index: SPECS/apache1.spec
diff -u SPECS/apache1.spec:1.83.2.6 SPECS/apache1.spec:1.83.2.7
--- SPECS/apache1.spec:1.83.2.6 Fri Mar  4 23:01:58 2005
+++ SPECS/apache1.spec  Sat Mar  5 18:14:07 2005
@@ -1,25 +1,12 @@
 # $Revision$, $Date$
 # TODO
-# - split *all* modules to subpackages:
-#mod_access
-#mod_alias
-#mod_asis
-#mod_cern_meta
-#mod_cgi
-#mod_env
-#mod_include
-#mod_log_agent
-#mod_log_config
-#mod_log_referer
-#mod_mime
-#mod_mime_magic
-#mod_negotiation
-#mod_setenvif
-#mod_speling
-#mod_userdir
+# - separate package for /errordocs
+# - documentroot and cgi-dir out of /home/services
+#
 # Conditional build:
 %bcond_with    rewrite_ldap    # enable ldap map support for mod_rewrite 
(alpha)
 %bcond_without ipv6            # disable IPv6 support
+%bcond_with    minimal         # minimal apache, without any modules
 #
 %include       /usr/lib/rpm/macros.perl
 Summary:       The most widely used Web server on the Internet
@@ -45,7 +32,7 @@
 Summary(zh_CN):        Internet ÉĎÓŚÓĂ×îšăˇşľÄ Web ˇţÎńłĚĐňĄŁ
 Name:          apache1
 Version:       1.3.33
-Release:       3.4
+Release:       3.7
 License:       Apache Group
 Group:         Networking/Daemons
 Source0:       http://www.apache.org/dist/httpd/apache_%{version}.tar.gz
@@ -108,6 +95,10 @@
 PreReq:                perl-base
 PreReq:                rc-scripts
 Requires(pre): /bin/id
+%if %{without minimal}
+Requires:      %{name}-mod_access = %{version}-%{release}
+Requires:      %{name}-mod_alias = %{version}-%{release}
+%endif
 Requires(pre): /usr/bin/getent
 Requires(pre): /usr/bin/getgid
 Requires(pre): /usr/sbin/groupadd
@@ -1282,7 +1273,7 @@
 echo "poldek --upgrade %{name}-mod_autoindex"
 echo
 
-%triggerpostun -- %{name} <= 1.3.33-3.4
+%triggerpostun -- %{name} < 1.3.33-3.4
 echo "WARNING!!!"
 echo "Since that version following modules have been separated to subpackages"
 echo "If you want to have the same functionality do:"
@@ -2433,6 +2424,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.83.2.7  2005/03/05 17:14:07  glen
+- bcond minimal
+
 Revision 1.83.2.6  2005/03/04 22:01:58  glen
 - trigger text
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/apache1.spec?r1=1.83.2.6&r2=1.83.2.7&f=u


_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to