SPECS: apache-mod_suphp.spec - version 0.6.0 - compiler flags patc...

[zboczuch]

Author: zboczuch                     Date: Fri Jul  1 20:07:24 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- version 0.6.0
- compiler flags patch
- sample config file included
- removed configure option with-php (path to php should be specified in
  config file from now)
- ugly libtool trick (FIXME)

---- Files affected:
SPECS:
   apache-mod_suphp.spec (1.27 -> 1.28) 

---- Diffs:

================================================================
Index: SPECS/apache-mod_suphp.spec
diff -u SPECS/apache-mod_suphp.spec:1.27 SPECS/apache-mod_suphp.spec:1.28
--- SPECS/apache-mod_suphp.spec:1.27	Thu Jun  9 01:23:40 2005
+++ SPECS/apache-mod_suphp.spec	Fri Jul  1 22:07:18 2005
@@ -9,15 +9,16 @@
 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
 Name:		apache-mod_%{mod_name}
-Version:	0.5.2
-Release:	6
+Version:	0.6.0
+Release:	1
 License:	GPL
 Group:		Networking/Daemons
 Source0:	http://www.suphp.org/download/%{mod_name}-%{version}.tar.gz
-# Source0-md5:	337909e87027af124052baddddbd2994
+# Source0-md5:	fa89691101b9ebf18f4922b1382186c6
 Source1:	%{name}.logrotate
 Source2:	%{name}.conf
 Patch0:		%{name}-apr.patch
+Patch1:		%{name}-compiler-flags.patch
 URL:		http://www.suphp.org/
 BuildRequires:	%{apxs}
 # FIXME! (needs /usr/sbin/httpd.prefork)
@@ -48,6 +49,7 @@
 %prep
 %setup -q -n %{mod_name}-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__aclocal}
@@ -61,15 +63,19 @@
 	--with-min-uid=500 \
 	--with-min-gid=1000 \
 	--with-apxs=%{apxs} \
-	--with-php=%{_bindir}/php.cgi \
 	--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 .
+
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sbindir},%{_pkglibdir}}
+install -d $RPM_BUILD_ROOT{%{_sbindir},%{_pkglibdir},%{_datadir}/suphp}
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
 
 install src/suphp $RPM_BUILD_ROOT%{_sbindir}
@@ -79,6 +85,8 @@
 install -d $RPM_BUILD_ROOT/etc/logrotate.d
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/logrotate.d/apache-mod_suphp
 
+install doc/suphp.conf-example $RPM_BUILD_ROOT%{_datadir}/suphp
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -101,8 +109,10 @@
 %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/*
+%{_datadir}/suphp/*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -110,6 +120,14 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.28  2005/07/01 20:07:18  zboczuch
+- version 0.6.0
+- compiler flags patch
+- sample config file included
+- removed configure option with-php (path to php should be specified in
+  config file from now)
+- ugly libtool trick (FIXME)
+
 Revision 1.27  2005/06/08 23:23:40  ankry
 - temporary, dirty build problem workaround, rel. 6
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/apache-mod_suphp.spec?r1=1.27&r2=1.28&f=u