From c57acdbafd7011915e1599dcc89da6515e3c8c42 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 27 Jul 2013 16:55:53 +0200 Subject: php-pecl-igbinary: cleanups from rawhide --- igbinary-apcu.patch | 2 +- php-pecl-igbinary.spec | 31 ++++++++++++++++--------------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/igbinary-apcu.patch b/igbinary-apcu.patch index fd197de..a5ee6d6 100644 --- a/igbinary-apcu.patch +++ b/igbinary-apcu.patch @@ -214,7 +214,7 @@ index 9027638..f1941d2 100644 igbinary support => enabled igbinary version => %s -igbinary APC serializer ABI => %s -+igbinary APC%s serializer ABI => %s ++igbinary AP%s serializer ABI => %s igbinary session support => %s igbinary.compact_strings => %s => %s -- diff --git a/php-pecl-igbinary.spec b/php-pecl-igbinary.spec index 82fb9ce..79c16ac 100644 --- a/php-pecl-igbinary.spec +++ b/php-pecl-igbinary.spec @@ -11,7 +11,6 @@ %global extname igbinary %global commit c35d48f3d14794373b2ef89a6d79020bb7418d7f %global short %(c=%{commit}; echo ${c:0:7}) -%global gitver 3b8ab7e %global prever -dev Summary: Replacement for the standard PHP serializer @@ -26,7 +25,7 @@ Source0: http://pecl.php.net/get/%{extname}-%{version}.tgz # http://pecl.php.net/bugs/22598 Source1: %{extname}-tests.tgz %endif -# http://pecl.php.net/bugs/22599 +# https://bugs.php.net/59669 License: BSD Group: System Environment/Libraries @@ -79,6 +78,7 @@ Summary: Igbinary developer files (header) Group: Development/Libraries Requires: php-pecl-%{extname}%{?_isa} = %{version}-%{release} Requires: php-devel%{?_isa} + Obsoletes: php-%{extname}-devel <= 1.1.1 Provides: php-%{extname}-devel = %{version}-%{release} Provides: php-%{extname}-devel%{?_isa} = %{version}-%{release} @@ -104,6 +104,7 @@ cd %{extname}-%{version} tar xzf %{SOURCE1} %endif +# Check version extver=$(sed -n '/#define IGBINARY_VERSION/{s/.* "//;s/".*$//;p}' igbinary.h) if test "x${extver}" != "x%{version}%{?prever}"; then : Error: Upstream version is ${extver}, expecting %{version}%{?prever}. @@ -113,7 +114,7 @@ cd .. cp -r %{extname}-%{version} %{extname}-%{version}-zts -cat >%{extname}.ini <