SPECS: apache1-mod_suphp.spec - merged update to 0.6.1 by AntiC (a...

[qboosh]

Author: qboosh                       Date: Fri Apr 27 10:00:38 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged update to 0.6.1 by AntiC (antic at tuchow.pl)

---- Files affected:
SPECS:
   apache1-mod_suphp.spec (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: SPECS/apache1-mod_suphp.spec
diff -u SPECS/apache1-mod_suphp.spec:1.9 SPECS/apache1-mod_suphp.spec:1.10
--- SPECS/apache1-mod_suphp.spec:1.9	Mon Feb 12 22:23:47 2007
+++ SPECS/apache1-mod_suphp.spec	Fri Apr 27 12:00:31 2007
@@ -8,22 +8,28 @@
 Summary:	Apache module: suPHP - execute PHP scripts with the permissions of their owners
 Summary(pl.UTF-8):	Moduł do apache: suPHP - uruchamianie skryptów PHP z uprawnieniami ich właścicieli
 Name:		apache1-mod_%{mod_name}
-Version:	0.5.2
-Release:	1.12
+Version:	0.6.1
+Release:	1
 License:	GPL
 Group:		Networking/Daemons
 Source0:	http://www.suphp.org/download/%{mod_name}-%{version}.tar.gz
 # Source0-md5:	337909e87027af124052baddddbd2994
-Source1:	%{name}.conf
-Source2:	%{name}.logrotate
+Source1:	%{name}.logrotate
+Source2:	%{name}.conf
+Source2:	%{name}-suphp.conf
+Patch0:		%{name}-apr.patch
+Patch1:		%{name}-notallowed.patch
 URL:		http://www.suphp.org/
+BuildRequires:	%{apxs}
 BuildRequires:	apache1-devel >= 1.3.33-2
 BuildRequires:	autoconf
 BuildRequires:	automake
+BuildRequires:	libstdc++-devel
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires(triggerpostun):	%{apxs}
 Requires(triggerpostun):	grep
 Requires(triggerpostun):	sed >= 4.0
-Requires:	apache
+Requires:	apache1
 Requires:	php-cgi
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -44,17 +50,15 @@
 
 %prep
 %setup -q -n %{mod_name}-%{version}
-
-# common GPL license
-rm -f doc/{de,en}/LICENSE
-# common Apache license
-rm -f doc/{de,en}/apache/LICENSE
+%patch0 -p1
+%patch1 -p1
 
 %build
 %{__aclocal}
 %{__autoconf}
 %{__autoheader}
-chmod 755 configure
+%{__automake}
+export APACHE_VERSION=$(rpm -q --qf '%%{version}' apache1-apxs)
 %configure \
 	%{?with_checkpath: --enable-checkpath} \
 	%{!?with_checkpath: --disable-checkpath} \
@@ -62,9 +66,10 @@
 	--with-min-uid=500 \
 	--with-min-gid=1000 \
 	--with-apxs=%{apxs} \
-	--with-php=/usr/bin/php.cgi \
 	--disable-checkuid \
-	--disable-checkgid
+	--disable-checkgid \
+	--with-setid-mode=owner \
+	--with-logfile=/var/log/apache/suphp_log
 
 %{__make}
 
@@ -73,12 +78,13 @@
 install -d $RPM_BUILD_ROOT{%{_sbindir},%{_pkglibdir},%{_sysconfdir}/conf.d}
 
 install src/suphp $RPM_BUILD_ROOT%{_sbindir}
-install src/apache/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/90_mod_%{mod_name}.conf
+install src/apache/.libs/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
+install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/90_mod_%{mod_name}.conf
+install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/%{mod_name}.conf
 
 install -d $RPM_BUILD_ROOT/etc/logrotate.d
 # TODO: apache1-mod_suphp + trigger
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/apache-mod_suphp
+install %{SOURCE1} $RPM_BUILD_ROOT/etc/logrotate.d/apache-mod_suphp
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -104,11 +110,12 @@
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog doc/en doc/de
+%doc AUTHORS ChangeLog README doc
 %attr(4755,root,root) %{_sbindir}/suphp
-%attr(755,root,root) %{_pkglibdir}/*
+%attr(755,root,root) %{_pkglibdir}/*.so
 %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}/conf.d/*_mod_%{mod_name}.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{mod_name}.conf
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -116,6 +123,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2007/04/27 10:00:31  qboosh
+- merged update to 0.6.1 by AntiC (antic at tuchow.pl)
+
 Revision 1.9  2007/02/12 21:23:47  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/apache1-mod_suphp.spec?r1=1.9&r2=1.10&f=u