- umask in scripts, other fixes/cosmetics where needed

Changed files:
    apache1-mod_mp3.spec -> 1.21

diff --git a/apache1-mod_mp3.spec b/apache1-mod_mp3.spec
index 1c45f00a3109cf0e6fd35132c868186a62d66c4f..d7f6d1187a3b0453af54479baa2d4536999e3461 100644 (file)
--- a/apache1-mod_mp3.spec
+++ b/apache1-mod_mp3.spec
@@ -11,14 +11,14 @@ Group:              Networking/Daemons
 Source0:       http://software.tangent.org/download/%{arname}-%{version}.tar.gz
 Source1:       %{arname}.conf
 URL:           http://media.tangent.org/
-Requires:      apache >= 1.3.12
-Prereq:                grep
-Prereq:                apache(EAPI) >= 1.3.12
-Prereq:                %{_sbindir}/apxs
-Provides:      %{arname}
 BuildRequires: %{apxs}
 BuildRequires: apache(EAPI)-devel >= 1.3.12
 BuildRequires: expat-devel
+PreReq:                apache(EAPI) >= 1.3.12
+Requires(post,preun):  %{apxs}
+Requires(post,preun):  grep
+Requires(preun):       fileutils
+Provides:      %{arname}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define         _pkglibdir      %(%{apxs} -q LIBEXECDIR)
@@ -43,6 +43,7 @@ pami
 
 %build
 ./configure
+
 %{__make} APXS=%{apxs}
 
 %install
@@ -68,8 +69,9 @@ fi
 %preun
 if [ "$1" = "0" ]; then
        %{apxs} -e -A -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
+       umask 027
        grep -E -v "^Include.*%{arname}.conf" %{_sysconfdir}/httpd.conf > \
-       %{_sysconfdir}/httpd.conf.tmp
+               %{_sysconfdir}/httpd.conf.tmp
        mv -f %{_sysconfdir}/httpd.conf.tmp %{_sysconfdir}/httpd.conf
        if [ -f /var/lock/subsys/httpd ]; then
                /etc/rc.d/init.d/httpd restart 1>&2