[php-pecl-apcu/f20] update to 4.0.7

[Remi Collet]

commit c02bbd22a94589f8074c48fb2972f9a4dc451431
Author: Remi Collet <remi at fedoraproject.org>
Date:   Mon Oct 27 16:13:55 2014 +0100

    update to 4.0.7

 .gitignore         |    2 ++
 php-pecl-apcu.spec |   40 ++++++++++++++++++++++++++--------------
 sources            |    2 +-
 3 files changed, 29 insertions(+), 15 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d585290..62c0ba2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@ clog
 /apcu-4.0.2.tgz
 /apcu-4.0.3.tgz
 /apcu-4.0.4.tgz
+/apcu-4.0.6.tgz
+/apcu-4.0.7.tgz
diff --git a/php-pecl-apcu.spec b/php-pecl-apcu.spec
index eb9d073..ba843f4 100644
--- a/php-pecl-apcu.spec
+++ b/php-pecl-apcu.spec
@@ -13,10 +13,15 @@
 
 %global pecl_name apcu
 %global with_zts  0%{?__ztsphp:1}
+%if "%{php_version}" < "5.6"
+%global ini_name  %{pecl_name}.ini
+%else
+%global ini_name  40-%{pecl_name}.ini
+%endif
 
 Name:           php-pecl-apcu
 Summary:        APC User Cache
-Version:        4.0.4
+Version:        4.0.7
 Release:        1%{?dist}
 Source0:        http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
 Source1:        %{pecl_name}.ini
@@ -54,7 +59,7 @@ Provides:       php-pecl-apc%{?_isa} = %{version}
 Provides:       php-pecl(APC) = %{version}
 Provides:       php-pecl(APC)%{?_isa} = %{version}
 
-%if 0%{?fedora} < 20
+%if 0%{?fedora} < 20 && 0%{?rhel} < 7
 # Filter shared private
 %{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$}
 %{?filter_setup}
@@ -123,13 +128,15 @@ configuration, available on http://localhost/apcu-panel/
 %setup -qc
 mv %{pecl_name}-%{version} NTS
 
-# Fix file roles https://github.com/krakjoe/apcu/pull/69
-sed -e '/LICENSE/s/role="src"/role="doc"/' \
-    -e '/NOTICE/s/role="src"/role="doc"/' \
-    -e '/README.md/s/role="src"/role="doc"/' \
-    -e '/TECHNOTES.txt/s/role="src"/role="doc"/' \
-    -e '/TODO/s/role="src"/role="doc"/' \
-    -i package.xml
+cd NTS
+
+# Sanity check, really often broken
+extver=$(sed -n '/#define PHP_APCU_VERSION/{s/.* "//;s/".*$//;p}' php_apc.h)
+if test "x${extver}" != "x%{version}"; then
+   : Error: Upstream extension version is ${extver}, expecting %{version}.
+   exit 1
+fi
+cd ..
 
 %if %{with_zts}
 # duplicate for ZTS build
@@ -158,12 +165,12 @@ make %{?_smp_mflags}
 %install
 # Install the NTS stuff
 make -C NTS install INSTALL_ROOT=%{buildroot}
-install -D -m 644 %{SOURCE1} %{buildroot}%{php_inidir}/%{pecl_name}.ini
+install -D -m 644 %{SOURCE1} %{buildroot}%{php_inidir}/%{ini_name}
 
 %if %{with_zts}
 # Install the ZTS stuff
 make -C ZTS install INSTALL_ROOT=%{buildroot}
-install -D -m 644 %{SOURCE1} %{buildroot}%{php_ztsinidir}/%{pecl_name}.ini
+install -D -m 644 %{SOURCE1} %{buildroot}%{php_ztsinidir}/%{ini_name}
 %endif
 
 # Install the package XML file
@@ -232,24 +239,26 @@ fi
 %files
 %doc %{pecl_docdir}/%{pecl_name}
 %{pecl_xmldir}/%{name}.xml
-%config(noreplace) %{php_inidir}/%{pecl_name}.ini
+
+%config(noreplace) %{php_inidir}/%{ini_name}
 %{php_extdir}/%{pecl_name}.so
+
 %if %{with_zts}
 %{php_ztsextdir}/%{pecl_name}.so
-%config(noreplace) %{php_ztsinidir}/%{pecl_name}.ini
+%config(noreplace) %{php_ztsinidir}/%{ini_name}
 %endif
 
 
 %files devel
 %doc %{pecl_testdir}/%{pecl_name}
 %{php_incldir}/ext/%{pecl_name}
+
 %if %{with_zts}
 %{php_ztsincldir}/ext/%{pecl_name}
 %endif
 
 
 %files -n apcu-panel
-%defattr(-,root,root,-)
 # Need to restrict access, as it contains a clear password
 %attr(550,apache,root) %dir %{_sysconfdir}/apcu-panel
 %config(noreplace) %{_sysconfdir}/apcu-panel/conf.php
@@ -258,6 +267,9 @@ fi
 
 
 %changelog
+* Mon Oct 27 2014 Remi Collet <remi at fedoraproject.org> - 4.0.7-1
+- Update to 4.0.7
+
 * Sat Mar 01 2014 Remi Collet <remi at fedoraproject.org> - 4.0.4-1
 - Update to 4.0.4 (beta)
 
diff --git a/sources b/sources
index 329cb5a..f289333 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a7696b1c351d9bd1592b7840701f5bf7  apcu-4.0.4.tgz
+9feb03d3e5217242a39244964f098b52  apcu-4.0.7.tgz