- notes

[packages/apache1.git] / apache1.spec

diff --git a/apache1.spec b/apache1.spec
index 3384dbc15d946a103fec1f4295f6fa6acf81a113..a454fe1ea28af8d3656b26dfb18eb4075384a7c6 100644 (file)
--- a/apache1.spec
+++ b/apache1.spec
@@ -31,7 +31,7 @@ Summary(uk):  
 Summary(zh_CN):        Internet ÉÏÓ¦ÓÃ×î¹ã·ºµÄ Web ·þÎñ³ÌÐò¡£
 Name:          apache1
 Version:       1.3.33
-Release:       3.7
+Release:       3.11
 License:       Apache Group
 Group:         Networking/Daemons
 Source0:       http://www.apache.org/dist/httpd/apache_%{version}.tar.gz
@@ -88,15 +88,21 @@ URL:                http://www.apache.org/
 BuildRequires: db-devel >= 4.1
 BuildRequires: mm-devel >= 1.3.0
 %{?with_rewrite_ldap:BuildRequires:    openldap-devel}
-BuildRequires: rpmbuild(macros) >= 1.159
+BuildRequires: rpmbuild(macros) >= 1.177
 BuildRequires: rpm-perlprov
 PreReq:                mm
 PreReq:                perl-base
 PreReq:                rc-scripts
 Requires(pre): /bin/id
 %if %{without minimal}
+# essental modules (maybe remove these in future if all Requires in
+# place for other packages).
 Requires:      %{name}-mod_access = %{version}-%{release}
 Requires:      %{name}-mod_alias = %{version}-%{release}
+Requires:      %{name}-mod_log_config = %{version}-%{release}
+Requires:      %{name}-mod_mime = %{version}-%{release}
+# for errordocs
+Requires:      %{name}-mod_include = %{version}-%{release}
 %endif
 Requires(pre): /usr/bin/getent
 Requires(pre): /usr/bin/getgid
@@ -1260,19 +1266,20 @@ if [ "$1" = "2" ]; then
 fi
 
 %triggerpostun -- %{name} <= 1.3.31-5
-echo "WARNING!!!"
-echo "Since that version autoindex module has been separated to package %{name}-mod_autoindex"
-echo "If you want to have the same functionality do:"
-echo "poldek --upgrade %{name}-mod_autoindex"
-echo
+%banner %{name} -e -a <<EOF
+WARNING!!!
+ Since that version autoindex module has been separated to package %{name}-mod_autoindex
+ If you want to have the same functionality do:
+poldek --upgrade %{name}-mod_autoindex
+
+EOF
 
 %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:"
-echo "poldek --upgrade %{name}-MODULENAME"
-echo
-cat <<EOF
+%banner %{name} -e -a <<EOF
+WARNING!!!
+ Since that version following modules have been separated to subpackages
+ If you want to have the same functionality do:
+ poldek --upgrade %{name}-MODULENAME
        mod_asis
        mod_cern_meta
        mod_cgi
@@ -2213,6 +2220,7 @@ sed -i -e '
 %{_includedir}
 
 %files -n htpasswd-%{name}
+%defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/htpasswd
 %{_sbindir}/htpasswd
 %{_mandir}/man1/htpasswd.1*