[php-pecl-sphinx/f15] * update to latest upstream

topdog topdog at fedoraproject.org
Fri Jul 15 08:20:57 UTC 2011


commit 309921fd3ceb3faa91e2c5c56f4744c72fc500d8
Author: Andrew Colin Kissa <andrew at topdog.za.net>
Date:   Fri Jul 15 10:20:26 2011 +0200

     * update to latest upstream

 .gitignore           |    1 +
 php-pecl-sphinx.spec |   37 ++++++++++++++++---------------------
 sources              |    2 +-
 3 files changed, 18 insertions(+), 22 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6d3c0eb..fbbdc79 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 sphinx-1.0.0.tgz
+/sphinx-1.1.0.tgz
diff --git a/php-pecl-sphinx.spec b/php-pecl-sphinx.spec
index ed8cf0a..37e4a35 100644
--- a/php-pecl-sphinx.spec
+++ b/php-pecl-sphinx.spec
@@ -1,30 +1,27 @@
-%global php_apiver	%((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
-%{!?__pecl:		%{expand: %%global __pecl     %{_bindir}/pecl}}
-%{!?php_extdir:		%{expand: %%global php_extdir %(php-config --extension-dir)}}
+%global php_apiver  %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
+%{!?__pecl:     %{expand: %%global __pecl     %{_bindir}/pecl}}
+%{!?php_extdir: %{expand: %%global php_extdir %(php-config --extension-dir)}}
 
 %define pecl_name sphinx
 
 Name:		php-pecl-sphinx
-Version:	1.0.0
-Release:	3%{?dist}
+Version:	1.1.0
+Release:	1%{?dist}
 Summary:	PECL extension for Sphinx SQL full-text search engine
 Group:		Development/Languages
 License:	PHP
 URL:		http://pecl.php.net/package/%{pecl_name}
 Source0:	http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	libsphinxclient-devel php-pear
+BuildRequires:	libsphinxclient-devel
+BuildRequires:  php-pear
 BuildRequires:	php-devel >= 5.1.3
-Requires(post):	%{__pecl}
-Requires(postun):	%{__pecl}
-Provides:	php-pecl(%{pecl_name}) = %{version}
+Requires:       php(zend-abi) = %{php_zend_api}
+Requires:       php(api) = %{php_core_api}
+Requires(post): %{__pecl}
+Requires(postun): %{__pecl}
 
-%if %{?php_zend_api}0
-Requires:	php(zend-abi) = %{php_zend_api}
-Requires:	php(api) = %{php_core_api}
-%else
-Requires:	php-api = %{php_apiver}
-%endif
+Provides:       php-pecl(%{pecl_name}) = %{version}
 
 
 %description
@@ -70,19 +67,14 @@ EOF
 %clean
 %{__rm} -rf %{buildroot}
 
-%if 0%{?pecl_install:1}
 %post
 %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
-%endif
 
 
-%if 0%{?pecl_uninstall:1}
 %postun
-if [ $1 -eq 0 ]; then
+if [ $1 -eq 0 ]  ; then
 %{pecl_uninstall} %{pecl_name} >/dev/null || :
 fi
-%endif
-
 
 %files
 %defattr(-,root,root,-)
@@ -93,6 +85,9 @@ fi
 
 
 %changelog
+* Fri Jul 15 2011 Andrew Colin Kissa <andrew at topdog.za.net> - 1.1.0-1
+- Update to latest upstream
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index c01560d..fc85c0d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d5bd7c00a8e036d7f82e98ebb0d9b210  sphinx-1.0.0.tgz
+8997229134fabb77b224ec7507965347  sphinx-1.1.0.tgz


More information about the scm-commits mailing list