rpms/php-eaccelerator/FC-5 eaccelerator-0.9.5-rc1-config.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 php-eaccelerator.spec, 1.11, 1.12 sources, 1.6, 1.7 eaccelerator-0.9.5-beta2-64bit_cast_warning.patch, 1.1, NONE eaccelerator-0.9.5-beta2-compile.patch, 1.1, NONE

[Matthias Saou (thias)]

Author: thias

Update of /cvs/extras/rpms/php-eaccelerator/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4909

Modified Files:
	.cvsignore php-eaccelerator.spec sources 
Added Files:
	eaccelerator-0.9.5-rc1-config.patch 
Removed Files:
	eaccelerator-0.9.5-beta2-64bit_cast_warning.patch 
	eaccelerator-0.9.5-beta2-compile.patch 
Log Message:
Backport 0.9.5-rc1 update from devel to FC-5.


eaccelerator-0.9.5-rc1-config.patch:

--- NEW FILE eaccelerator-0.9.5-rc1-config.patch ---
diff -Naupr eaccelerator-0.9.5-rc1.orig/eaccelerator.ini eaccelerator-0.9.5-rc1/eaccelerator.ini
--- eaccelerator-0.9.5-rc1.orig/eaccelerator.ini	2006-07-25 15:00:00.000000000 +0200
+++ eaccelerator-0.9.5-rc1/eaccelerator.ini	2006-08-22 14:29:08.000000000 +0200
@@ -15,9 +15,6 @@
 ;extension="eaccelerator.so"
 zend_extension="/usr/lib/php4/eaccelerator.so"
 ;zend_extension_ts="/usr/lib/php4/eaccelerator.so"
-;extension="eaccelerator.dll"
-;zend_extension_ts="c:\php4\eaccelerator.dll"
-;zend_extension="c:\php4\eaccelerator.dll"
 
 ; The amount of shared memory (in megabytes) that eAccelerator will use.
 ; "0" means OS default. Default value is "0".
@@ -73,7 +70,7 @@ eaccelerator.shm_max = "0"
 ; all scripts which were not accessed at last "shm_ttl" seconds from shared
 ; memory. Default value is "0" that means - don't remove any files from
 ; shared memory.
-eaccelerator.shm_ttl = "0"
+eaccelerator.shm_ttl = "3600"
 
 ; When eAccelerator fails to get shared memory for new script it tryes to 
 ; remove old script if the previous try was made more then "shm_prune_period"


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-eaccelerator/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	23 May 2006 09:12:27 -0000	1.6
+++ .cvsignore	24 Aug 2006 10:42:21 -0000	1.7
@@ -1 +1 @@
-eaccelerator-0.9.5-beta2.tar.bz2
+eaccelerator-0.9.5-rc1.tar.bz2


Index: php-eaccelerator.spec
===================================================================
RCS file: /cvs/extras/rpms/php-eaccelerator/FC-5/php-eaccelerator.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- php-eaccelerator.spec	23 May 2006 09:12:27 -0000	1.11
+++ php-eaccelerator.spec	24 Aug 2006 10:42:21 -0000	1.12
@@ -4,7 +4,7 @@
 %define default_version 5.1.4
 
 %define module_version 0.9.5
-%define prever         beta2
+%define prever         rc1
 
 %define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{default_extdir})
 %define php_apiver %((echo %{default_apiver}; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
@@ -17,13 +17,12 @@
 Summary: PHP accelerator, optimizer, encoder and dynamic content cacher
 Name: php-eaccelerator
 Version: %{php_version}_%{module_version}
-Release: 0.2.%{prever}%{?dist}
+Release: 0.3.%{prever}%{?dist}
 License: GPL
 Group: Development/Languages
 URL: http://eaccelerator.sourceforge.net/
 Source: http://dl.sf.net/eaccelerator/eaccelerator-%{module_version}-%{prever}.tar.bz2
-Patch0: eaccelerator-0.9.5-beta2-compile.patch
-Patch1: eaccelerator-0.9.5-beta2-64bit_cast_warning.patch
+Patch0: eaccelerator-0.9.5-rc1-config.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: php-api = %{php_apiver}
 Provides: php-zend_extension
@@ -40,13 +39,19 @@
 
 %prep
 %setup -n eaccelerator-%{module_version}-%{prever}
-%patch0 -p0
-%patch1 -p0
+%patch0 -p1 -b .config
+# Change paths in the example config, other values are changed by a patch
+%{__perl} -pi -e 's|/usr/lib/php4/|%{php_extdir}/|g;
+                  s|/tmp/eaccelerator|%{_var}/cache/php-eaccelerator|g' \
+    eaccelerator.ini
 
 
 %build
 phpize
 %configure \
+    --with-eaccelerator-shared-memory \
+    --with-eaccelerator-sessions \
+    --with-eaccelerator-content-caching \
 %ifarch ppc
     --with-eaccelerator-userid="%{userid}"
 %endif
@@ -59,31 +64,11 @@
 %{__make} install INSTALL_ROOT=%{buildroot}
 
 # The cache directory where pre-compiled files will reside
-%{__mkdir_p} %{buildroot}%{_localstatedir}/cache/php-eaccelerator
+%{__mkdir_p} %{buildroot}%{_var}/cache/php-eaccelerator
 
 # Drop in the bit of configuration
-%{__mkdir_p} %{buildroot}%{_sysconfdir}/php.d
-%{__cat} > %{buildroot}%{_sysconfdir}/php.d/eaccelerator.ini << 'EOF'
-; Enable eAccelerator extension module
-zend_extension = %{php_extdir}/eaccelerator.so
-; Options for the eAccelerator module
-eaccelerator.cache_dir = %{_localstatedir}/cache/php-eaccelerator
-eaccelerator.shm_size = 0
-eaccelerator.enable = 1
-eaccelerator.optimizer = 1
-eaccelerator.check_mtime = 1
-eaccelerator.filter = ""
-eaccelerator.shm_max = 0
-eaccelerator.shm_ttl = 3600
-eaccelerator.shm_prune_period = 0
-eaccelerator.shm_only = 0
-eaccelerator.compress = 1
-eaccelerator.compress_level = 9
-eaccelerator.keys = "shm_and_disk"
-eaccelerator.sessions = "shm_and_disk"
-eaccelerator.content = "shm_and_disk"
-eaccelerator.debug = 0
-EOF
+%{__install} -D -m 0644 eaccelerator.ini \
+    %{buildroot}%{_sysconfdir}/php.d/eaccelerator.ini
 
 
 %clean
@@ -96,10 +81,17 @@
 %doc eaccelerator.ini *.php
 %config(noreplace) %{_sysconfdir}/php.d/eaccelerator.ini
 %{php_extdir}/eaccelerator.so
-%attr(0750, apache, apache) %{_localstatedir}/cache/php-eaccelerator/
+%attr(0750, apache, apache) %{_var}/cache/php-eaccelerator/
 
 
 %changelog
+* Tue Aug 22 2006 Matthias Saou <http://freshrpms.net/> 5.1.4_0.9.5-0.3.rc1
+- Update to 0.9.5-rc1.
+- Enable shared-memory, sessions and content-caching (#201319).
+- Remove both patches of fixes, merged upstream.
+- Change from creating a full eaccelerator.ini to using the included one with
+  path substitutions and a patch to change default values.
+
 * Tue May 23 2006 Matthias Saou <http://freshrpms.net/> 5.1.x_0.9.5-0.2.beta2
 - Rebuild against PHP 5.1.4.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-eaccelerator/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	23 May 2006 09:12:27 -0000	1.6
+++ sources	24 Aug 2006 10:42:21 -0000	1.7
@@ -1 +1 @@
-2516b680ce372765d24e7b64003f1e64  eaccelerator-0.9.5-beta2.tar.bz2
+5d03deb399f8f857d92dd092a2c69a87  eaccelerator-0.9.5-rc1.tar.bz2


--- eaccelerator-0.9.5-beta2-64bit_cast_warning.patch DELETED ---


--- eaccelerator-0.9.5-beta2-compile.patch DELETED ---