- umask in scripts, other fixes/cosmetics where needed

Changed files:
    apache1-mod_accounting.spec -> 1.14

diff --git a/apache1-mod_accounting.spec b/apache1-mod_accounting.spec
index 8f383a5eeda77f52e6a10ca03825c116967aee2d..ef13a622cd2764204f04ab1df585f101f520f302 100644 (file)
--- a/apache1-mod_accounting.spec
+++ b/apache1-mod_accounting.spec
@@ -13,7 +13,9 @@ URL:          http://sourceforge.net/projects/mod-acct/
 BuildRequires: apache(EAPI)-devel
 BuildRequires: mysql-devel
 BuildRequires: postgresql-devel
-Prereq:                %{_sbindir}/apxs
+Requires(post,preun):  %{apxs}
+Requires(post,preun):  grep
+Requires(preun):       fileutils
 Requires:      apache(EAPI)
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -43,6 +45,9 @@ install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}}
 install mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/mod_accounting.conf
 
+%clean
+rm -rf $RPM_BUILD_ROOT
+
 %post
 %{apxs} -e -a -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
 if [ -f /etc/httpd/httpd.conf ] && ! grep -q "^Include.*mod_accounting.conf" /etc/httpd/httpd.conf; then
@@ -55,6 +60,7 @@ fi
 %preun
 if [ "$1" = "0" ]; then
        %{apxs} -e -A -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
+       umask 027
         grep -v "^Include.*mod_accounting.conf" /etc/httpd/httpd.conf > \
                 /etc/httpd/httpd.conf.tmp
         mv -f /etc/httpd/httpd.conf.tmp /etc/httpd/httpd.conf
@@ -63,9 +69,6 @@ if [ "$1" = "0" ]; then
        fi
 fi
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
 %defattr(644,root,root,755)
 %doc README ChangeLog