diff options
author | Remi Collet <fedora@famillecollet.com> | 2013-07-15 13:06:34 +0200 |
---|---|---|
committer | Remi Collet <fedora@famillecollet.com> | 2013-07-15 13:06:34 +0200 |
commit | 4890708cb49abb4550868eb040cb45c9baaa908d (patch) | |
tree | b29ded97b6bf2044a55be6d0b7f38c35843d8454 | |
parent | 869a48a981fd0d41e7e019bea17cc4911f7b128d (diff) |
php-pecl-zendopcache: fix ZTS config.
-rw-r--r-- | opcache.ini | 2 | ||||
-rw-r--r-- | php-pecl-zendopcache.spec | 22 |
2 files changed, 17 insertions, 7 deletions
diff --git a/opcache.ini b/opcache.ini index ef6e0e0..4a9ac5c 100644 --- a/opcache.ini +++ b/opcache.ini @@ -63,7 +63,7 @@ opcache.fast_shutdown=1 ; The location of the OPcache blacklist file (wildcards allowed). ; Each OPcache blacklist file is a text file that holds the names of files ; that should not be accelerated. -opcache.blacklist_filename=/etc/php.d/opcache*.blacklist +opcache.blacklist_filename=@INIPATH@/opcache*.blacklist ; Allows exclusion of large files from being cached. By default all files ; are cached. diff --git a/php-pecl-zendopcache.spec b/php-pecl-zendopcache.spec index 7814e6d..cd4bacc 100644 --- a/php-pecl-zendopcache.spec +++ b/php-pecl-zendopcache.spec @@ -13,7 +13,7 @@ Name: php-pecl-%{pecl_name} Version: 7.0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Zend OPcache Group: Development/Libraries @@ -97,20 +97,26 @@ make %{?_smp_mflags} %install rm -rf %{buildroot} +make -C NTS install INSTALL_ROOT=%{buildroot} + +# Configuration file install -D -p -m 644 %{SOURCE1} %{buildroot}%{php_inidir}/%{plug_name}.ini sed -e 's:@EXTPATH@:%{php_extdir}:' \ + -e 's:@INIPATH@:%{php_inidir}:' \ -i %{buildroot}%{php_inidir}/%{plug_name}.ini -make -C NTS install INSTALL_ROOT=%{buildroot} + +# The default Zend OPcache blacklist file +install -D -p -m 644 %{SOURCE2} %{buildroot}%{php_inidir}/%{plug_name}-default.blacklist + +make -C ZTS install INSTALL_ROOT=%{buildroot} install -D -p -m 644 %{SOURCE1} %{buildroot}%{php_ztsinidir}/%{plug_name}.ini sed -e 's:@EXTPATH@:%{php_ztsextdir}:' \ + -e 's:@INIPATH@:%{php_ztsinidir}:' \ -i %{buildroot}%{php_ztsinidir}/%{plug_name}.ini -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 -D -p -m 644 %{SOURCE2} %{buildroot}%{php_ztsinidir}/%{plug_name}-default.blacklist # Install XML package description install -D -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml @@ -161,6 +167,7 @@ fi %config(noreplace) %{php_inidir}/%{plug_name}.ini %{php_extdir}/%{plug_name}.so +%config(noreplace) %{php_ztsinidir}/%{plug_name}-default.blacklist %config(noreplace) %{php_ztsinidir}/%{plug_name}.ini %{php_ztsextdir}/%{plug_name}.so @@ -168,6 +175,9 @@ fi %changelog +* Mon Jul 15 2013 Remi Collet <rcollet@redhat.com> - 7.0.2-1 +- fix ZTS configuration + * Wed Jun 5 2013 Remi Collet <rcollet@redhat.com> - 7.0.2-1 - update to 7.0.2 - add spec License = CC-BY-SA |