From 1e2b3ad7a2fb05ab0297d6d51234d7324bd65297 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Sun, 29 Dec 2002 01:44:28 +0000 Subject: [PATCH] - umask in scripts, other fixes/cosmetics where needed Changed files: apache1-mod_dav.spec -> 1.27 --- apache1-mod_dav.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/apache1-mod_dav.spec b/apache1-mod_dav.spec index f0af7b5..3851b7c 100644 --- a/apache1-mod_dav.spec +++ b/apache1-mod_dav.spec @@ -23,12 +23,14 @@ Group: Networking/Daemons Source0: http://www.webdav.org/mod_dav/mod_%{mod_name}-%{version}-%{apache_version}.tar.gz Source1: %{name}.conf URL: http://www.webdav.org/mod_dav/ -Prereq: %{_sbindir}/apxs BuildRequires: expat-devel BuildRequires: %{apxs} BuildRequires: autoconf BuildRequires: automake BuildRequires: apache(EAPI)-devel >= %{apache_version} +Requires(post,preun): %{apxs} +Requires(post,preun): grep +Requires(preun): fileutils Requires: apache(EAPI) >= %{apache_version} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) Obsoletes: mod_dav @@ -148,9 +150,12 @@ Fusion צ rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd,/var/lock/mod_dav} -install lib%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}/ +install lib%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir} install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/mod_dav.conf +%clean +rm -rf $RPM_BUILD_ROOT + %post %{apxs} -e -a -n %{mod_name} %{_pkglibdir}/lib%{mod_name}.so 1>&2 if [ -f /etc/httpd/httpd.conf ] && ! grep -q "^Include.*mod_dav.conf" /etc/httpd/httpd.conf; then @@ -163,6 +168,7 @@ fi %preun if [ "$1" = "0" ]; then %{apxs} -e -A -n %{mod_name} %{_pkglibdir}/lib%{mod_name}.so 1>&2 + umask 027 grep -v "^Include.*mod_dav.conf" /etc/httpd/httpd.conf > \ /etc/httpd/httpd.conf.tmp mv -f /etc/httpd/httpd.conf.tmp /etc/httpd/httpd.conf @@ -171,9 +177,6 @@ if [ "$1" = "0" ]; then fi fi -%clean -rm -rf $RPM_BUILD_ROOT - %files %defattr(644,root,root,755) %doc README CHANGES INSTALL LICENSE.html -- 2.44.0