From 825517067e75df84b39c371373f4f2b6919df46f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 13 Jun 2014 11:29:41 +0200 Subject: [PATCH] update to 4.0.6 --- .gitignore | 1 + php-pecl-apcu.spec | 26 +++++++++++++++----------- sources | 2 +- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index d585290..4f33f29 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ clog /apcu-4.0.2.tgz /apcu-4.0.3.tgz /apcu-4.0.4.tgz +/apcu-4.0.6.tgz diff --git a/php-pecl-apcu.spec b/php-pecl-apcu.spec index 1c1e446..87b2442 100644 --- a/php-pecl-apcu.spec +++ b/php-pecl-apcu.spec @@ -21,8 +21,8 @@ Name: php-pecl-apcu Summary: APC User Cache -Version: 4.0.4 -Release: 3%{?dist} +Version: 4.0.6 +Release: 1%{?dist} Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz Source1: %{pecl_name}.ini Source2: %{pecl_name}-panel.conf @@ -59,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} @@ -128,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 @@ -254,7 +256,6 @@ fi %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 @@ -263,6 +264,9 @@ fi %changelog +* Thu Jun 12 2014 Remi Collet - 4.0.6-1 +- Update to 4.0.6 (beta) + * Sat Jun 07 2014 Fedora Release Engineering - 4.0.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild diff --git a/sources b/sources index 329cb5a..3c52f84 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a7696b1c351d9bd1592b7840701f5bf7 apcu-4.0.4.tgz +cf7f1a751c4f3ecd1bb8f985be4de09b apcu-4.0.6.tgz