summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2013-04-15 16:00:12 +0200
committerRemi Collet <fedora@famillecollet.com>2013-04-15 16:00:12 +0200
commite2e126a3972218ec2a13fea9f3cb699f5a901f4d (patch)
treeb85bf9b84db5d51535635bcd61d5dc50182de41f
parent2edeccc3ffe49429f3b2c039cd9fbcd6b5584c02 (diff)
php-pecl-couchbase: fix BR and provide full .ini from upstream example
-rw-r--r--php-pecl-couchbase.spec13
1 files changed, 3 insertions, 10 deletions
diff --git a/php-pecl-couchbase.spec b/php-pecl-couchbase.spec
index fa8f804..4f06826 100644
--- a/php-pecl-couchbase.spec
+++ b/php-pecl-couchbase.spec
@@ -17,8 +17,7 @@ Source0: http://pecl.php.net/get/%{pecl_name}-%{version}%{?svnrev:-dev}.tg
BuildRequires: php-devel >= 5.3.0
BuildRequires: php-pear
-BuildRequires: httpd-devel
-BuildRequires: pcre-devel
+BuildRequires: zlib-devel
BuildRequires: libcouchbase-devel
# for tests
BuildRequires: php-json
@@ -49,12 +48,6 @@ tar xif %{SOURCE0}
mv %{pecl_name}-%{version} NTS
-cat > %{pecl_name}.ini << 'EOF'
-; Enable %{pecl_name} extension module
-extension=%{pecl_name}.so
-
-EOF
-
# Sanity check, really often broken
extver=$(sed -n '/#define PHP_COUCHBASE_VERSION/{s/.* "//;s/".*$//;p}' NTS/php_couchbase.h)
if test "x${extver}" != "x%{version}%{?versuf}"; then
@@ -90,12 +83,12 @@ rm -f */modules/json.so
# Install the NTS stuff
make install -C NTS INSTALL_ROOT=%{buildroot}
-install -D -m 644 %{pecl_name}.ini %{buildroot}%{php_inidir}/z-%{pecl_name}.ini
+install -D -m 644 NTS/example/%{pecl_name}.ini %{buildroot}%{php_inidir}/z-%{pecl_name}.ini
# Install the ZTS stuff
%if %{with_zts}
make install -C ZTS INSTALL_ROOT=%{buildroot}
-install -D -m 644 %{pecl_name}.ini %{buildroot}%{php_ztsinidir}/z-%{pecl_name}.ini
+install -D -m 644 ZTS/example/%{pecl_name}.ini %{buildroot}%{php_ztsinidir}/z-%{pecl_name}.ini
%endif
# Install the package XML file