- BR s@%{apxs}@apache-apxs@g

[packages/apache-mod_suphp.git] / apache-mod_suphp.spec

diff --git a/apache-mod_suphp.spec b/apache-mod_suphp.spec
index 320d7dbf72ab2b000a552717e00f4bdf9db10b35..a69787bfe8bc1796ed50614ec1d5f75d93b5ccae 100644 (file)
--- a/apache-mod_suphp.spec
+++ b/apache-mod_suphp.spec
@@ -5,25 +5,27 @@
 %define                mod_name        suphp
 %define        apxs            /usr/sbin/apxs
 Summary:       Apache module: suPHP - execute PHP scripts with the permissions of their owners
-Summary(pl):   Modu³ do apache: suPHP - uruchamianie skryptów PHP z uprawnieniami ich w³a¶cicieli
+Summary(pl.UTF-8):     Moduł do apache: suPHP - uruchamianie skryptów PHP z uprawnieniami ich właścicieli
 Name:          apache-mod_%{mod_name}
 Version:       0.6.1
-Release:       0.1
+Release:       1
 License:       GPL
 Group:         Networking/Daemons
 Source0:       http://www.suphp.org/download/%{mod_name}-%{version}.tar.gz
 # Source0-md5: 7eb8ae29404392d9eb07c69d5242d716
 Source1:       %{name}.logrotate
 Source2:       %{name}.conf
+Source3:       %{name}-suphp.conf
 Patch0:                %{name}-apr.patch
 Patch1:                %{name}-compiler-flags.patch
 Patch2:                %{name}-apache_version.patch
 URL:           http://www.suphp.org/
-BuildRequires: %{apxs}
+BuildRequires: apache-apxs >= 2.0.52-2
 BuildRequires: apache-devel >= 2.0.52-2
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: libstdc++-devel
+BuildRequires: rpmbuild(macros) >= 1.268
 Requires:      apache(modules-api) = %apache_modules_api
 Requires:      php-cgi
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -37,23 +39,23 @@ their owners. It consists of an Apache module (mod_suphp) and a setuid
 root binary (suphp) that is called by the Apache module to change the
 uid of the process executing the PHP interpreter.
 
-%description -l pl
-suPHP jest narzêdziem pozwalaj±cym na wykonywanie skryptów w PHP z
-uprawnieniami ich w³a¶cicieli. Sk³ada siê z modu³u (mod_suphp) oraz
-programu (suphp) z ustawionym bitem suid, który uruchamiany jest przez
-modu³ w celu zmiany uid procesu uruchamiaj±cego interpreter PHP.
+%description -l pl.UTF-8
+suPHP jest narzędziem pozwalającym na wykonywanie skryptów w PHP z
+uprawnieniami ich właścicieli. Składa się z modułu (mod_suphp) oraz
+programu (suphp) z ustawionym bitem suid, który uruchamiany jest przez
+moduł w celu zmiany uid procesu uruchamiającego interpreter PHP.
 
 %prep
 %setup -q -n %{mod_name}-%{version}
 %patch0 -p1
-#%patch1 -p1
+%patch1 -p1
 %patch2 -p1
 
 %build
 %{__aclocal}
 %{__autoconf}
 %{__autoheader}
-chmod 755 configure
+%{__automake}
 export APACHE_VERSION=$(rpm -q --qf '%%{version}' apache-apxs)
 %configure \
        %{?with_checkpath: --enable-checkpath} \
@@ -63,12 +65,9 @@ export APACHE_VERSION=$(rpm -q --qf '%%{version}' apache-apxs)
        --with-min-gid=1000 \
        --with-apxs=%{apxs} \
        --disable-checkuid \
-       --disable-checkgid
-
-# FIXME: I don't know anything about libtool, but libtool created by configure
-# doesn't work. My hardcoded trick is to replace libtool created by configure
-# with one provided by libtool package in /usr/bin/ path.
-cp %{_bindir}/libtool .
+       --disable-checkgid \
+       --with-setid-mode=owner \
+       --with-logfile=/var/log/httpd/suphp_log
 
 %{__make}
 
@@ -80,6 +79,7 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
 install src/suphp $RPM_BUILD_ROOT%{_sbindir}
 install src/apache2/.libs/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
 install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/70_mod_%{mod_name}.conf
+install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/%{mod_name}.conf
 
 install -d $RPM_BUILD_ROOT/etc/logrotate.d
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/logrotate.d/apache-mod_suphp
@@ -90,21 +90,18 @@ install doc/suphp.conf-example $RPM_BUILD_ROOT%{_datadir}/suphp
 rm -rf $RPM_BUILD_ROOT
 
 %post
-if [ -f /var/lock/subsys/httpd ]; then
-       /etc/rc.d/init.d/httpd restart 1>&2
-fi
+%service -q httpd restart
 
-%preun
+%postun
 if [ "$1" = "0" ]; then
-       if [ -f /var/lock/subsys/httpd ]; then
-               /etc/rc.d/init.d/httpd restart 1>&2
-       fi
+       %service -q httpd restart
 fi
 
 %files
 %defattr(644,root,root,755)
 %doc README AUTHORS ChangeLog doc
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_%{mod_name}.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{mod_name}.conf
 %attr(755,root,root) %{_pkglibdir}/*.so
 %attr(4755,root,root) %{_sbindir}/suphp
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/*