diff options
| author | Remi Collet <fedora@famillecollet.com> | 2013-04-11 08:43:50 +0200 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2013-04-11 08:43:50 +0200 |
| commit | a4e7231711e9dc9d060bc4a0830e84435d126018 (patch) | |
| tree | 526923fda6f318a266d32003725c7cacb99298ff /php-pecl-zendopcache-dev.spec | |
| parent | 747e2868fe13a87893045ad4ade503040a5d988b (diff) | |
php-pecl-zendopcache: allow wildcard in blacklist filename and comments in blacklist content
Diffstat (limited to 'php-pecl-zendopcache-dev.spec')
| -rw-r--r-- | php-pecl-zendopcache-dev.spec | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/php-pecl-zendopcache-dev.spec b/php-pecl-zendopcache-dev.spec index 64fc764..4812c91 100644 --- a/php-pecl-zendopcache-dev.spec +++ b/php-pecl-zendopcache-dev.spec @@ -9,7 +9,7 @@ Name: php-pecl-%{pecl_name} Version: 7.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Zend OPcache Group: Development/Libraries @@ -23,6 +23,11 @@ Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz # this extension must be loaded before XDebug # So "opcache" if before "xdebug" Source1: %{plug_name}.ini +Source2: %{plug_name}-default.blacklist + +# Allow comments in blacklist content +# Allow wildcard in blacklist filename +Patch0: %{plug_name}-blacklist.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: php-devel >= 5.2.0 @@ -69,12 +74,16 @@ sed -e '/release/s/7.0.0/%{version}%{prever}/' \ mv %{pecl_name}-%{version} NTS %endif +cd NTS +%patch0 -p1 -b .blacklist + # Sanity check, really often broken -extver=$(sed -n '/#define ACCELERATOR_VERSION/{s/.* "//;s/".*$//;p}' NTS/ZendAccelerator.h) +extver=$(sed -n '/#define ACCELERATOR_VERSION/{s/.* "//;s/".*$//;p}' ZendAccelerator.h) if test "x${extver}" != "x%{version}%{?prever:-%{prever}}"; then : Error: Upstream extension version is ${extver}, expecting %{version}%{?prever:-%{prever}}. exit 1 fi +cd .. # Duplicate source tree for NTS / ZTS build cp -pr NTS ZTS @@ -111,6 +120,9 @@ sed -e 's:@EXTPATH@:%{php_ztsextdir}:' \ make -C ZTS install INSTALL_ROOT=%{buildroot} +# The default Zend OPcache blacklist file +install -D -p -m 644 %{SOURCE2} %{buildroot}%{php_inidir}/%{plug_name}-default.blacklist + # Install XML package description install -D -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml @@ -156,6 +168,7 @@ fi %files %defattr(-,root,root,-) %doc NTS/{LICENSE,README} +%config(noreplace) %{php_inidir}/%{plug_name}-default.blacklist %config(noreplace) %{php_inidir}/%{plug_name}.ini %{php_extdir}/%{plug_name}.so @@ -166,6 +179,10 @@ fi %changelog +* Thu Apr 11 2013 Remi Collet <rcollet@redhat.com> - 7.0.1-2 +- allow wildcard in opcache.blacklist_filename and provide + default /etc/php.d/opcache-default.blacklist + * Mon Mar 25 2013 Remi Collet <remi@fedoraproject.org> - 7.0.1-1 - official PECL release, version 7.0.1 (beta) - rename to php-pecl-zendopcache |