rpms/php-eaccelerator/devel eaccelerator-0.9.5-trac187.patch, NONE, 1.1 php-eaccelerator.spec, 1.28, 1.29
Matthias Saou (thias)
fedora-extras-commits at redhat.com
Wed May 16 14:28:59 UTC 2007
Author: thias
Update of /cvs/extras/rpms/php-eaccelerator/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15256
Modified Files:
php-eaccelerator.spec
Added Files:
eaccelerator-0.9.5-trac187.patch
Log Message:
Fix ppc64 build + minor cleanups.
eaccelerator-0.9.5-trac187.patch:
--- NEW FILE eaccelerator-0.9.5-trac187.patch ---
diff -Naupr eaccelerator-0.9.5.orig/cache.c eaccelerator-0.9.5/cache.c
--- eaccelerator-0.9.5.orig/cache.c 2006-10-11 14:45:52.000000000 +0200
+++ eaccelerator-0.9.5/cache.c 2007-01-23 19:01:32.000000000 +0100
@@ -632,7 +632,7 @@ int eaccelerator_list_keys(zval *return_
}
if (p->ttl) {
- if (p->ttl < t) {
+ if (p->ttl > t) {
add_assoc_long(list, "ttl", p->ttl); // ttl
} else {
add_assoc_long(list, "ttl", -1); // expired
Index: php-eaccelerator.spec
===================================================================
RCS file: /cvs/extras/rpms/php-eaccelerator/devel/php-eaccelerator.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- php-eaccelerator.spec 16 May 2007 13:57:17 -0000 1.28
+++ php-eaccelerator.spec 16 May 2007 14:28:25 -0000 1.29
@@ -11,18 +11,19 @@
# This is the apache userid, only used for sysvipc semaphores which is the
# default on ppc since spinlock is not detected
-%define userid 48
+%define userid 48
Summary: PHP accelerator, optimizer, encoder and dynamic content cacher
Name: php-eaccelerator
Version: %{php_version}_%{module_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPL
Group: Development/Languages
URL: http://eaccelerator.net/
Source: http://bart.eaccelerator.net/source/%{module_version}/eaccelerator-%{module_version}.tar.bz2
Patch0: eaccelerator-0.9.5-rc1-config.patch
Patch1: eaccelerator-0.9.5-php52fix.patch
+Patch2: eaccelerator-0.9.5-trac187.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: php-api = %{php_apiver}
Requires: php-common = %{php_version}
@@ -39,9 +40,10 @@
%prep
-%setup -n eaccelerator-%{module_version}
+%setup -q -n eaccelerator-%{module_version}
%patch0 -p1 -b .config
%patch1 -p2 -b .php52fix
+%patch2 -p1 -b .trac187
# 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' \
@@ -54,7 +56,7 @@
--with-eaccelerator-shared-memory \
--with-eaccelerator-sessions \
--with-eaccelerator-content-caching \
-%ifarch ppc
+%ifarch ppc ppc64
--with-eaccelerator-userid="%{userid}"
%endif
@@ -85,15 +87,19 @@
%files
-%defattr(-, root, root, 0755)
+%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README*
%doc eaccelerator.ini *.php
%config(noreplace) %{_sysconfdir}/php.d/eaccelerator.ini
%{php_extdir}/eaccelerator.so
-%attr(0750, apache, apache) %{_var}/cache/php-eaccelerator/
+%attr(0750,apache,apache) %{_var}/cache/php-eaccelerator/
%changelog
+* Wed May 16 2007 Matthias Saou <http://freshrpms.net/> 5.2.2_0.9.5-2
+- Include ppc64 %%ifarch, since it's now a Fedora target.
+- Include patch to fix trac bug #187.
+
* Wed May 16 2007 Matthias Saou <http://freshrpms.net/> 5.2.2_0.9.5-1
- Rebuild against PHP 5.2.2.
More information about the fedora-extras-commits
mailing list