- apxs1 in apache1-devel now

[packages/apache1-mod_suid.git] / apache1-mod_suid.spec

diff --git a/apache1-mod_suid.spec b/apache1-mod_suid.spec
index 4a5a8bf9b9ba7f367cfc252b00be7918a155c34a..1b4bdd6ef3ace2daac0f158a566caf25fd9bc4e2 100644 (file)
--- a/apache1-mod_suid.spec
+++ b/apache1-mod_suid.spec
@@ -1,30 +1,31 @@
 %define                mod_name        suid
 %define        apxs            /usr/sbin/apxs1
 Summary:       Apache module: execution of scripts under their own uids
-Summary(pl):   Modu³ do apache: wykonywanie skryptów pod wskazanym uidem
+Summary(pl.UTF-8):     Moduł do apache: wykonywanie skryptów pod wskazanym uidem
 Name:          apache1-mod_%{mod_name}
 Version:       1.1
-Release:       2
+Release:       4
 License:       GPL
 Group:         Networking/Daemons
 Source0:       http://www.jdimedia.nl/igmar/mod_%{mod_name}/files/mod_%{mod_name}-%{version}.tar.gz
 # Source0-md5: 1e47d40d8f0404d9faa3040655df44a2
 URL:           http://www.jdimedia.nl/igmar/mod_suid/
-BuildRequires: %{apxs}
-BuildRequires: apache1-devel >= 1.3.33-2
+BuildRequires: apache1-devel >= 1.3.39
+BuildRequires: rpmbuild(macros) >= 1.268
 BuildRequires: zlib-devel
 Requires(triggerpostun):       %{apxs}
-Requires:      apache1 >= 1.3.33-2
-Obsoletes:     apache-mod_%{mod_name} <= %{version}
+Requires:      apache1(EAPI)
+Obsoletes:     apache-mod_suid <= 1.1
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _pkglibdir      %(%{apxs} -q LIBEXECDIR)
+%define                _pkglibdir      %(%{apxs} -q LIBEXECDIR 2>/dev/null)
+%define                _sysconfdir     %(%{apxs} -q SYSCONFDIR 2>/dev/null)
 
 %description
 Apache module: execution of scripts under their own uids per-vhost.
 
-%description -l pl
-Modu³ do apache: wykonywanie skryptów pod wskazanym uidem per-vhost.
+%description -l pl.UTF-8
+Moduł do apache: wykonywanie skryptów pod wskazanym uidem per-vhost.
 
 %prep
 %setup -q -n mod_%{mod_name}-%{version}
@@ -45,15 +46,11 @@ echo 'LoadModule %{mod_name}_module modules/mod_%{mod_name}.so' > \
 rm -rf $RPM_BUILD_ROOT
 
 %post
-if [ -f /var/lock/subsys/apache ]; then
-       /etc/rc.d/init.d/apache restart 1>&2
-fi
+%service -q apache restart
 
 %postun
 if [ "$1" = "0" ]; then
-       if [ -f /var/lock/subsys/apache ]; then
-               /etc/rc.d/init.d/apache restart 1>&2
-       fi
+       %service -q apache restart
 fi
 
 %triggerpostun -- apache1-mod_%{mod_name} < 1.1-1.1