[php-shout] - fix php_zend_api usage, fix FTBFS #715846 - add filter_provides to avoid private-shared-object-pro

[Remi Collet]

commit a73a9aaafd3c2fb7ec6322060564c286c32db9df
Author: remi <fedora at famillecollet.com>
Date:   Wed Jul 6 20:38:07 2011 +0200

    - fix php_zend_api usage, fix FTBFS #715846
    - add filter_provides to avoid private-shared-object-provides shout.so
    - clean tabs from spec

 php-shout.spec |   55 ++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 32 insertions(+), 23 deletions(-)
---
diff --git a/php-shout.spec b/php-shout.spec
index f69aa98..0a282ca 100644
--- a/php-shout.spec
+++ b/php-shout.spec
@@ -1,28 +1,34 @@
-%global php_apiver	%((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
-%global php_extdir	%(php-config --extension-dir 2>/dev/null || echo "undefined")
+%global php_apiver %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
+%global php_extdi %(php-config --extension-dir 2>/dev/null || echo "undefined")
 
-Name:		php-shout
-Version:	0.9.2
-Release:	7%{?dist}
-Summary:	PHP module for communicating with Icecast servers
+Name:           php-shout
+Version:        0.9.2
+Release:        8%{?dist}
+Summary:        PHP module for communicating with Icecast servers
 
-Source0:	http://downloads.sourceforge.net/phpshout/phpShout-%{version}.tar.gz
-Group:		Development/Languages
-License:	LGPLv2+
-URL:		http://phpshout.sourceforge.net/
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Group:          Development/Languages
+License:        LGPLv2+
+URL:            http://phpshout.sourceforge.net/
 
-BuildRequires:	php-devel
+Source0:        http://downloads.sourceforge.net/phpshout/phpShout-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  php-devel
 # Will hopefully go away once libogg-devel and/or libshout-devel specify this BR:
-BuildRequires:	pkgconfig
-BuildRequires:	libshout-devel >= 2.1
-%if %{?php_zend_api}0
+BuildRequires:  pkgconfig
+BuildRequires:  libshout-devel >= 2.1
+
+%if 0%{?php_zend_api:1}
 Requires:       php(zend-abi) = %{php_zend_api}
 Requires:       php(api) = %{php_core_api}
 %else
-Requires:	php-api = %{php_apiver}
+Requires: php-api = %{php_apiver}
 %endif
 
+%{?filter_setup:
+%filter_provides_in %{php_extdir}/.*\.so$
+%filter_setup
+}
+
 
 %description
 The php-shout package is an extension to the PHP Hypertext Preprocessor.
@@ -56,13 +62,11 @@ install -D -p -m 0644 shout.ini %{buildroot}%{_sysconfdir}/php.d/shout.ini
 
 
 %check
-# Make sure module loads correctly
-php -m -d extension_dir=modules -d extension=shout.so 2>/dev/null | grep shout || {
-  echo "Shout extension not loadable!"
-  exit 1
-}
-# Disable PHP's tests since they require an icecast server running on localhost
-#make test
+# simple module load test
+php --no-php-ini \
+    --define extension_dir=modules \
+    --define extension=shout.so \
+    --modules | grep shout
 
 
 %clean
@@ -77,6 +81,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Jul  6 2011  Remi Collet <Fedora at FamilleCollet.com> - 0.9.2-8
+- fix php_zend_api usage, fix FTBFS #715846
+- add filter_provides to avoid private-shared-object-provides shout.so
+- clean tabs from spec
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.2-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild