From b14651dd09151664e693c0d9139eb83fef4f4836 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 7 Sep 2016 07:42:31 +0200 Subject: php-snappy: 0.1.4 --- REFLECTION | 2 +- php-ext-snappy-pr4.patch | 107 ----------------------------------------------- php-snappy.spec | 11 ++--- 3 files changed, 7 insertions(+), 113 deletions(-) delete mode 100644 php-ext-snappy-pr4.patch diff --git a/REFLECTION b/REFLECTION index c3ee497..c5896f2 100644 --- a/REFLECTION +++ b/REFLECTION @@ -1,4 +1,4 @@ -Extension [ extension #112 snappy version 0.1.3 ] { +Extension [ extension #112 snappy version 0.1.4 ] { - Functions { Function [ function snappy_compress ] { diff --git a/php-ext-snappy-pr4.patch b/php-ext-snappy-pr4.patch deleted file mode 100644 index d304a95..0000000 --- a/php-ext-snappy-pr4.patch +++ /dev/null @@ -1,107 +0,0 @@ -From 0416fc87704f29badb669915ad78e1c3084e2fcd Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Tue, 6 Sep 2016 15:51:14 +0200 -Subject: [PATCH] add support for build with sytem library - ---- - config.m4 | 41 ++++++++++++++++++++++++++++++++++------- - snappy.c | 6 +++++- - tests/info.phpt | 2 +- - 3 files changed, 40 insertions(+), 9 deletions(-) - -diff --git a/config.m4 b/config.m4 -index 94837ec..2d06e98 100644 ---- a/config.m4 -+++ b/config.m4 -@@ -25,10 +25,40 @@ PHP_ARG_ENABLE(snappy, whether to enable snappy support, - [ --enable-snappy Enable snappy support]) - - PHP_ARG_WITH(snappy-includedir, for snappy header, --[ --with-snappy-includedir=DIR snappy header files], yes) -+[ --with-snappy-includedir=DIR snappy header files], no, no) - - if test "$PHP_SNAPPY" != "no"; then - -+ AC_MSG_CHECKING([searching for libsnappy]) -+ -+ if test "$PHP_SNAPPY_INCLUDEDIR" != "no"; then -+ for i in $PHP_SNAPPY_INCLUDEDIR /usr/local /usr; do -+ if test -r $i/include/snappy-c.h; then -+ LIBSNAPPY_CFLAGS="-I$i/include" -+ LIBSNAPPY_LIBDIR="$i/$PHP_LIBDIR" -+ AC_MSG_RESULT(found in $i) -+ break -+ fi -+ done -+ if test -z "$LIBSNAPPY_LIBDIR"; then -+ AC_MSG_RESULT(not found) -+ AC_MSG_ERROR(Please reinstall the snappy library distribution) -+ fi -+ PHP_CHECK_LIBRARY(snappy, snappy_compress, -+ [ -+ PHP_ADD_LIBRARY_WITH_PATH(snappy, $LIBSNAPPY_LIBDIR, SNAPPY_SHARED_LIBADD) -+ AC_DEFINE(HAVE_LIBSNAPPY,1,[ ]) -+ ], [ -+ AC_MSG_ERROR(could not find usable libsnappy) -+ ], [ -+ -L$LIBSNAPPY_LIBDIR -+ ]) -+ -+ PHP_SUBST(SNAPPY_SHARED_LIBADD) -+ PHP_NEW_EXTENSION(snappy, snappy.c, $ext_shared,, $LIBSNAPPY_CFLAGS) -+ else -+ AC_MSG_RESULT(use bundled version) -+ - dnl compiler C++: - PHP_REQUIRE_CXX() - -@@ -121,10 +151,7 @@ if test "$PHP_SNAPPY" != "no"; then - - PHP_NEW_EXTENSION(snappy, snappy.c $SNAPPY_SOURCES, $ext_shared) - -- ifdef([PHP_INSTALL_HEADERS], -- [ -- PHP_INSTALL_HEADERS([ext/snappy/], [php_snappy.h]) -- ], [ -- PHP_ADD_MAKEFILE_FRAGMENT -- ]) -+ PHP_ADD_BUILD_DIR($ext_builddir/snappy, 1) -+ PHP_ADD_INCLUDE([$ext_srcdir/snappy]) -+ fi - fi -diff --git a/snappy.c b/snappy.c -index b76fae9..9ffba4b 100644 ---- a/snappy.c -+++ b/snappy.c -@@ -9,7 +9,7 @@ - #include "php_snappy.h" - - /* snappy */ --#include "snappy/snappy-c.h" -+#include - - static ZEND_FUNCTION(snappy_compress); - static ZEND_FUNCTION(snappy_uncompress); -@@ -33,7 +33,11 @@ PHP_MINFO_FUNCTION(snappy) - php_info_print_table_start(); - php_info_print_table_row(2, "Snappy support", "enabled"); - php_info_print_table_row(2, "Extension Version", SNAPPY_EXT_VERSION); -+#ifdef HAVE_LIBSNAPPY -+ php_info_print_table_row(2, "Snappy Version", "system library"); -+#else - php_info_print_table_row(2, "Snappy Version", SNAPPY_LIB_VERSION); -+#endif - php_info_print_table_end(); - } - -diff --git a/tests/info.phpt b/tests/info.phpt -index 98939aa..f163823 100644 ---- a/tests/info.phpt -+++ b/tests/info.phpt -@@ -14,5 +14,5 @@ snappy - - Snappy support => enabled - Extension Version => %d.%d.%d --Snappy Version => %d.%d.%d -+Snappy Version => %s - %a diff --git a/php-snappy.spec b/php-snappy.spec index 7a4dc4d..b9c9298 100644 --- a/php-snappy.spec +++ b/php-snappy.spec @@ -15,7 +15,7 @@ %scl_package php-snappy %endif -%global gh_commit 9b0357f39335ecd36858b05ace09a47f46b493c5 +%global gh_commit 4906868a139f7dc0b14e3d334773354da2bebd5a %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner kjdev %global gh_project php-ext-snappy @@ -26,7 +26,7 @@ Summary: Snappy Extension for PHP Name: %{?sub_prefix}php-snappy -Version: 0.1.3 +Version: 0.1.4 %if 0%{?gh_date:1} Release: 0.1.%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} %else @@ -37,8 +37,6 @@ Group: Development/Languages URL: https://github.com/%{gh_owner}/%{gh_project} Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{gh_short}.tar.gz -Patch0: %{gh_project}-pr4.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: %{?scl_prefix}php-devel BuildRequires: snappy-devel @@ -90,7 +88,6 @@ mv %{gh_project}-%{gh_commit} NTS cd NTS # Use the system library -%patch0 -p1 -b .pr4 rm -r snappy # Sanity check, really often broken @@ -203,6 +200,10 @@ rm -rf %{buildroot} %changelog +* Wed Sep 7 2016 Remi Collet - 0.1.4-1 +- update to 0.1.4 (no change) +- drop patch merged upstream + * Tue Sep 6 2016 Remi Collet - 0.1.3-1 - new package, version 0.1.3 - add patch to build with system libsnappy -- cgit