Author: glen                         Date: Wed Aug 24 10:25:21 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use .ini file in conf.d directory

---- Files affected:
SPECS:
   php4-eaccelerator.spec (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: SPECS/php4-eaccelerator.spec
diff -u SPECS/php4-eaccelerator.spec:1.6 SPECS/php4-eaccelerator.spec:1.7
--- SPECS/php4-eaccelerator.spec:1.6    Mon Jun 13 08:54:58 2005
+++ SPECS/php4-eaccelerator.spec        Wed Aug 24 12:25:10 2005
@@ -1,13 +1,13 @@
 # $Revision$, $Date$
 %define                _name           eaccelerator
 %define                _pkgname        eaccelerator
-%define                php_ver         %(rpm -q --qf '%%{epoch}:%%{version}' 
php4-devel)
+%define                _sysconfdir     /etc/php4
 
 Summary:       eAccelerator module for PHP
 Summary(pl):   ModuĊ‚ eAccelerator dla PHP
 Name:          php4-%{_name}
 Version:       0.9.3
-Release:       1
+Release:       1.1
 Epoch:         0
 License:       GPL
 Vendor:                Turck Software
@@ -17,15 +17,14 @@
 URL:           http://eaccelerator.sourceforge.net/
 BuildRequires: automake
 BuildRequires: libtool
-BuildRequires: php4-devel >= 4.1
-Requires:      php4 = %{php_ver}
+BuildRequires: php4-devel >= 3:4.1
+%requires_eq_to php4 php4-devel
 Requires:      php4-zlib
-Requires(post,preun):  php4-common >= 4.1
+Requires:      %{_sysconfdir}/conf.d
 Conflicts:     php-mmcache
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _sysconfdir     /etc/php4
-%define                extensionsdir   %{_libdir}/php4
+%define                extensionsdir   %(php-config --extension-dir 
2>/dev/null)
 
 %description
 eAccelerator is a further development from mmcache PHP Accelerator &
@@ -52,26 +51,31 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{extensionsdir}
-install -d $RPM_BUILD_ROOT%{_bindir}
+install -d $RPM_BUILD_ROOT{%{extensionsdir},%{_bindir},%{_sysconfdir}/conf.d}
 
 install ./modules/eaccelerator.so $RPM_BUILD_ROOT%{extensionsdir}
 install ./encoder.php $RPM_BUILD_ROOT%{_bindir}
 
+cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/%{_name}.ini
+; Enable %{_name} extension module
+extension=%{_name}.so
+EOF
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%{_sbindir}/php4-module-install install eaccelerator %{_sysconfdir}/php.ini
+[ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart
+[ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart
 
-%preun
-if [ "$1" = "0" ]; then
-       %{_sbindir}/php4-module-install remove eaccelerator 
%{_sysconfdir}/php.ini
-fi
+%postun
+[ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart
+[ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart
 
 %files
 %defattr(644,root,root,755)
 %doc README
+%config(noreplace) %verify(not size mtime md5) 
%{_sysconfdir}/conf.d/%{_name}.ini
 %attr(755,root,root) %{extensionsdir}/eaccelerator.so
 %attr(755,root,root) %{_bindir}/encoder.php
 
@@ -81,6 +85,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2005/08/24 10:25:10  glen
+- use .ini file in conf.d directory
+
 Revision 1.6  2005/06/13 06:54:58  prism
 - up to 0.9.3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/php4-eaccelerator.spec?r1=1.6&r2=1.7&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to