SPECS: apache-mod_suphp.spec - fix build for apache 2.2 - fixed du...
glen
glen at pld-linux.org
Thu Dec 22 01:52:13 CET 2005
Author: glen Date: Thu Dec 22 00:52:13 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- fix build for apache 2.2
- fixed duplicate files
- rel 3
---- Files affected:
SPECS:
apache-mod_suphp.spec (1.29 -> 1.30)
---- Diffs:
================================================================
Index: SPECS/apache-mod_suphp.spec
diff -u SPECS/apache-mod_suphp.spec:1.29 SPECS/apache-mod_suphp.spec:1.30
--- SPECS/apache-mod_suphp.spec:1.29 Sun Jul 3 18:39:55 2005
+++ SPECS/apache-mod_suphp.spec Thu Dec 22 01:52:08 2005
@@ -1,8 +1,7 @@
# $Revision$, $Date$
#
# Available build options:
-%bcond_with checkpath # enable check if php execution is within
- # DOCUMENT_ROOT of the vhost
+%bcond_with checkpath # enable check if php execution is within DOCUMENT_ROOT of the vhost
#
%define mod_name suphp
%define apxs /usr/sbin/apxs
@@ -10,7 +9,7 @@
Summary(pl): Moduł do apache: suPHP - uruchamianie skryptów PHP z uprawnieniami ich właścicieli
Name: apache-mod_%{mod_name}
Version: 0.6.0
-Release: 1
+Release: 3
License: GPL
Group: Networking/Daemons
Source0: http://www.suphp.org/download/%{mod_name}-%{version}.tar.gz
@@ -19,21 +18,21 @@
Source2: %{name}.conf
Patch0: %{name}-apr.patch
Patch1: %{name}-compiler-flags.patch
+Patch2: %{name}-apache_version.patch
URL: http://www.suphp.org/
BuildRequires: %{apxs}
-# FIXME! (needs /usr/sbin/httpd.prefork)
-BuildRequires: apache
BuildRequires: apache-devel >= 2.0.52-2
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libstdc++-devel
Requires(post,preun): %{apxs}
+Requires: apache(modules-api) = %apache_modules_api
Requires: apache >= 2.0.52-2
Requires: php-cgi
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define _sysconfdir %(%{apxs} -q SYSCONFDIR)
-%define _pkglibdir %(%{apxs} -q LIBEXECDIR)
+%define _pkglibdir %(%{apxs} -q LIBEXECDIR 2>/dev/null)
+%define _sysconfdir %(%{apxs} -q SYSCONFDIR 2>/dev/null)
%description
suPHP is a tool for executing PHP scripts with the permissions of
@@ -51,12 +50,14 @@
%setup -q -n %{mod_name}-%{version}
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
%{__aclocal}
%{__autoconf}
%{__autoheader}
chmod 755 configure
+export APACHE_VERSION=$(rpm -q --qf '%%{version}' apache-apxs)
%configure \
%{?with_checkpath: --enable-checkpath} \
%{!?with_checkpath: --disable-checkpath} \
@@ -92,14 +93,12 @@
rm -rf $RPM_BUILD_ROOT
%post
-%{apxs} -e -a -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
if [ -f /var/lock/subsys/httpd ]; then
/etc/rc.d/init.d/httpd restart 1>&2
fi
%preun
if [ "$1" = "0" ]; then
- %{apxs} -e -A -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
if [ -f /var/lock/subsys/httpd ]; then
/etc/rc.d/init.d/httpd restart 1>&2
fi
@@ -110,9 +109,9 @@
%doc README AUTHORS ChangeLog doc
%attr(4755,root,root) %{_sbindir}/suphp
%attr(755,root,root) %{_pkglibdir}/*
-%attr(755,root,root) %{_datadir}/suphp
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/*
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*
+%dir %{_datadir}/suphp
%{_datadir}/suphp/*
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -121,6 +120,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.30 2005/12/22 00:52:08 glen
+- fix build for apache 2.2
+- fixed duplicate files
+- rel 3
+
Revision 1.29 2005/07/03 16:39:55 aniolek
- added BR: libstdc++-devel
@@ -199,7 +203,10 @@
- updated to 0.5
Revision 1.7 2003/11/14 10:08:19 arekm
-- rel 0.5 (disable DOCUMENT_ROOT check by default since it doesn't work for Alias'ed directiories; disable checkuid/checkgid as apache itself works in the same way with suexec and it's usefull for hosting companies)
+- rel 0.5 (disable DOCUMENT_ROOT check by default since it doesn't
+ work for Alias'ed directiories; disable checkuid/checkgid as apache
+ itself works in the same way with suexec and it's usefull for
+ hosting companies)
Revision 1.6 2003/11/11 02:06:29 qboosh
- BR: ac,am
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/apache-mod_suphp.spec?r1=1.29&r2=1.30&f=u
More information about the pld-cvs-commit
mailing list