rpms/php-eaccelerator/EL-5 eaccelerator-0.9.5.1-nophpversioncheck.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 php-eaccelerator.spec, 1.27, 1.28 sources, 1.8, 1.9 eaccelerator-0.9.5-php52fix.patch, 1.1, NONE
Matthias Saou (thias)
fedora-extras-commits at redhat.com
Mon Nov 26 12:13:05 UTC 2007
Author: thias
Update of /cvs/extras/rpms/php-eaccelerator/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9235/EL-5
Modified Files:
.cvsignore php-eaccelerator.spec sources
Added Files:
eaccelerator-0.9.5.1-nophpversioncheck.patch
Removed Files:
eaccelerator-0.9.5-php52fix.patch
Log Message:
Update to 0.9.5.2.
eaccelerator-0.9.5.1-nophpversioncheck.patch:
--- NEW FILE eaccelerator-0.9.5.1-nophpversioncheck.patch ---
diff -Naupr eaccelerator-0.9.5.1.orig/eaccelerator.c eaccelerator-0.9.5.1/eaccelerator.c
--- eaccelerator-0.9.5.1.orig/eaccelerator.c 2006-09-15 17:46:10.000000000 +0200
+++ eaccelerator-0.9.5.1/eaccelerator.c 2007-07-24 13:02:51.000000000 +0200
@@ -1937,24 +1937,6 @@ static void eaccelerator_globals_dtor(ze
static void register_eaccelerator_as_zend_extension();
-static int eaccelerator_check_php_version(TSRMLS_D) {
- zval v;
- int ret = 0;
- if (zend_get_constant("PHP_VERSION", sizeof("PHP_VERSION")-1, &v TSRMLS_CC)) {
- if (Z_TYPE(v) == IS_STRING &&
- Z_STRLEN(v) == sizeof(PHP_VERSION)-1 &&
- strcmp(Z_STRVAL(v),PHP_VERSION) == 0) {
- ret = 1;
- } else {
- zend_error(E_CORE_WARNING,"[%s] This build of \"%s\" was compiled for PHP version %s. Rebuild it for your PHP version (%s) or download precompiled binaries.\n", EACCELERATOR_EXTENSION_NAME,EACCELERATOR_EXTENSION_NAME,PHP_VERSION,Z_STRVAL(v));
- }
- zval_dtor(&v);
- } else {
- zend_error(E_CORE_WARNING,"[%s] This build of \"%s\" was compiled for PHP version %s. Rebuild it for your PHP version.\n", EACCELERATOR_EXTENSION_NAME,EACCELERATOR_EXTENSION_NAME,PHP_VERSION);
- }
- return ret;
-}
-
static void make_hash_dirs(char *fullpath, int lvl) {
int j;
int n = strlen(fullpath);
@@ -1997,9 +1979,6 @@ PHP_MINIT_FUNCTION(eaccelerator) {
}
#endif
}
- if (!eaccelerator_check_php_version(TSRMLS_C)) {
- return FAILURE;
- }
ZEND_INIT_MODULE_GLOBALS(eaccelerator, eaccelerator_init_globals, NULL);
REGISTER_INI_ENTRIES();
REGISTER_STRING_CONSTANT("EACCELERATOR_VERSION", EACCELERATOR_VERSION, CONST_CS | CONST_PERSISTENT);
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-eaccelerator/EL-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 16 Oct 2006 16:44:20 -0000 1.8
+++ .cvsignore 26 Nov 2007 12:12:31 -0000 1.9
@@ -1 +1 @@
-eaccelerator-0.9.5.tar.bz2
+eaccelerator-0.9.5.2.tar.bz2
Index: php-eaccelerator.spec
===================================================================
RCS file: /cvs/extras/rpms/php-eaccelerator/EL-5/php-eaccelerator.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- php-eaccelerator.spec 19 Feb 2007 10:08:03 -0000 1.27
+++ php-eaccelerator.spec 26 Nov 2007 12:12:31 -0000 1.28
@@ -1,31 +1,25 @@
-# Useful defaults when building in chroots on systems where PHP is unavailable
-%define default_extdir %{_libdir}/php4
-%define default_apiver 20041225
-%define default_version 5.2.1
-
-%define module_version 0.9.5
-
-%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)
-%{!?php_version:%define php_version %(php-config --version 2>/dev/null || echo %{default_version})}
+%global php_extdir %(php-config --extension-dir 2>/dev/null || echo "undefined")
# This is the apache userid, only used for sysvipc semaphores which is the
-# default on ppc since spinlock is not detected
-%define userid 48
+# default on ppc since spinlock is not detected (not supported?)
+%define userid 48
Summary: PHP accelerator, optimizer, encoder and dynamic content cacher
Name: php-eaccelerator
-Version: %{php_version}_%{module_version}
+Version: 0.9.5.2
Release: 1%{?dist}
-License: GPL
+Epoch: 1
+# The eaccelerator module itself is GPLv2+
+# The PHP control panel is under the Zend license (control.php and dasm.php)
+License: GPLv2+ and Zend
Group: Development/Languages
URL: http://eaccelerator.net/
-Source: http://bart.eaccelerator.net/source/%{module_version}/eaccelerator-%{module_version}.tar.bz2
+Source: http://bart.eaccelerator.net/source/%{version}/eaccelerator-%{version}.tar.bz2
Patch0: eaccelerator-0.9.5-rc1-config.patch
-Patch1: eaccelerator-0.9.5-php52fix.patch
+Patch1: eaccelerator-0.9.5.1-nophpversioncheck.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: php-api = %{php_apiver}
-Requires: php-common = %{php_version}
+Requires: php(zend-abi) = %{php_zend_api}
+Requires: php(api) = %{php_core_api}
Provides: php-zend_extension
Conflicts: php-mmcache
BuildRequires: php, php-devel
@@ -39,25 +33,24 @@
%prep
-%setup -n eaccelerator-%{module_version}
+%setup -q -n eaccelerator-%{version}
%patch0 -p1 -b .config
-%patch1 -p2 -b .php52fix
+%patch1 -p1 -b .nophpversioncheck
# 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' \
+%{__sed} -i 's|/usr/lib/php4/|%{php_extdir}/|g;
+ s|/tmp/eaccelerator|%{_var}/cache/php-eaccelerator|g' \
eaccelerator.ini
%build
phpize
%configure \
+%ifnarch %{ix86} x86_64
+ --with-eaccelerator-userid="%{userid}" \
+%endif
--with-eaccelerator-shared-memory \
--with-eaccelerator-sessions \
- --with-eaccelerator-content-caching \
-%ifarch ppc
- --with-eaccelerator-userid="%{userid}"
-%endif
-
+ --with-eaccelerator-content-caching
%{__make} %{?_smp_mflags}
@@ -80,20 +73,58 @@
%preun
# Upon last removal (not update), clean all cache files
if [ $1 -eq 0 ]; then
- rm -rf %{_var}/cache/php-eaccelerator/* &>/dev/null || :
+ %{__rm} -rf %{_var}/cache/php-eaccelerator/* &>/dev/null || :
fi
%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
+* Mon Nov 26 2007 Matthias Saou <http://freshrpms.net/> 1:0.9.5.2-1
+- Update to 0.9.5.2.
+
+* Wed Aug 22 2007 Matthias Saou <http://freshrpms.net/> 1:0.9.5.1-7
+- Rebuild for new BuildID feature.
+
+* Sun Aug 12 2007 Matthias Saou <http://freshrpms.net/> 1:0.9.5.1-6
+- Change the ifarch ppc* to ifnarch x86(_64) since alpha also needs to be
+ excluded (#251302).
+
+* Mon Aug 6 2007 Matthias Saou <http://freshrpms.net/> 1:0.9.5.1-5
+- Update License field.
+
+* Wed Jul 25 2007 Jeremy Katz <katzj at redhat.com> - 1:0.9.5.1-4
+- rebuild for toolchain bug
+
+* Tue Jul 24 2007 Matthias Saou <http://freshrpms.net/> 1:0.9.5.1-3
+- Include patch to skip the exact PHP version check, we'll rely on our
+ package's php_zend_api version requirement to "get it right".
+
+* Thu Jul 19 2007 Jesse Keating <jkeating at redhat.com> 1:0.9.5.1-2
+- Rebuild for new php
+
+* Fri Jun 22 2007 Matthias Saou <http://freshrpms.net/> 1:0.9.5.1-1
+- Update to 0.9.5.1.
+- Major spec file cleanup, based on current PHP packaging guidelines.
+- Set Epoch to 1, since the proper versionning is lower than previously :-(
+- Remove two upstreamed patches (php52fix and trac187).
+- Use sed instead of perl for the config file changes.
+- No longer use dist because we want to use the same package on F-n and n+1.
+
+* 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.
+
* Mon Feb 19 2007 Matthias Saou <http://freshrpms.net/> 5.2.1_0.9.5-1
- Rebuild against PHP 5.2.1.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-eaccelerator/EL-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 16 Oct 2006 16:44:20 -0000 1.8
+++ sources 26 Nov 2007 12:12:31 -0000 1.9
@@ -1 +1 @@
-dad54af67488b83a2af6e30f661f613b eaccelerator-0.9.5.tar.bz2
+7c44ee0bc5e7f74b7cb7f6360e015128 eaccelerator-0.9.5.2.tar.bz2
--- eaccelerator-0.9.5-php52fix.patch DELETED ---
More information about the fedora-extras-commits
mailing list