[php-pecl-memcache/el5/master] update to 2.2.6 (bugfix)

[Remi Collet]

commit 2f1d0d4bff83a25b0f9ff00d946537bf98cdb27d
Author: remi <fedora at famillecollet.com>
Date:   Wed Oct 6 15:10:50 2010 +0200

    update to 2.2.6 (bugfix)

 .gitignore             |    1 +
 php-pecl-memcache.spec |   49 +++++++++++++++++++++++++++++++++++++++--------
 sources                |    2 +-
 xml2changelog          |   26 +++++++++++++++---------
 4 files changed, 58 insertions(+), 20 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..5827c57 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/memcache-2.2.6.tgz
diff --git a/php-pecl-memcache.spec b/php-pecl-memcache.spec
index 677a0ac..044e5cc 100644
--- a/php-pecl-memcache.spec
+++ b/php-pecl-memcache.spec
@@ -1,32 +1,49 @@
 %{!?__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)
+%global php_zendabiver %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP Extension => //p') | tail -1)
+%global php_version %((echo 0; php-config --version 2>/dev/null) | tail -1)
 
-%define pecl_name memcache
+%global pecl_name memcache
 
 Summary:      Extension to work with the Memcached caching daemon
 Name:         php-pecl-memcache
-Version:      2.2.5
+Version:      2.2.6
 Release:      1%{?dist}
 License:      PHP
 Group:        Development/Languages
 URL:          http://pecl.php.net/package/%{pecl_name}
 
 Source:       http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
-
 Source2:      xml2changelog
 
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: php-devel >= 4.3.11, php-pear, zlib-devel
+
+Provides:     php-pecl(%{pecl_name}) = %{version}
+
+
+%if 0%{?pecl_install:1}
 Requires(post): %{__pecl}
+%endif
+%if 0%{?pecl_uninstall:1}
 Requires(postun): %{__pecl}
-Provides:     php-pecl(%{pecl_name}) = %{version}-%{release}
-%if %{?php_zend_api}0
-Requires:     php(zend-abi) = %{php_zend_api}
-Requires:     php(api) = %{php_core_api}
+%endif
+
+%if 0%{?php_zend_api}
+# Require clean ABI/API versions if available (Fedora)
+Requires:      php(zend-abi) = %{php_zend_api}
+Requires:      php(api) = %{php_core_api}
+%else
+%if "%{rhel}" == "5"
+# RHEL5 where we have php-common providing the Zend ABI the "old way"
+Requires:      php-zend-abi = %{php_zendabiver}
 %else
-Requires:     php-api = %{php_apiver}
+# RHEL4 where we have no php-common and nothing providing the Zend ABI...
+Requires:      php = %{php_version}
 %endif
+%endif
+
 
 %description
 Memcached is a caching daemon designed especially for
@@ -40,7 +57,7 @@ Memcache can be used as a PHP session handler.
 
 %prep 
 %setup -c -q
-%{_bindir}/php -n %{SOURCE2} package.xml >CHANGELOG
+%{_bindir}/php -n %{SOURCE2} package.xml | tee CHANGELOG | head -n 5
 
 # avoid spurious-executable-perm
 find . -type f -exec chmod -x {} \;
@@ -93,6 +110,15 @@ EOF
 %{__install} -m 644 ../package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml
 
 
+%check
+cd %{pecl_name}-%{version}
+# simple module load test
+%{_bindir}/php --no-php-ini \
+    --define extension_dir=modules \
+    --define extension=%{pecl_name}.so \
+    --modules | grep %{pecl_name}
+
+
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -121,6 +147,11 @@ fi
 
 
 %changelog
+* Wed Oct 06 2010 Remi Collet <Fedora at FamilleCollet.com> 2.2.6-1
+- new version 2.2.6 (bug fixes)
+- clean requires (php-zend-abi for EL5)
+- run a simple load test in %%check
+
 * Sat Feb 28 2009 Remi Collet <Fedora at FamilleCollet.com> 2.2.5-1
 - new version 2.2.5 (bug fixes)
 
diff --git a/sources b/sources
index 6dc4a5d..76ef694 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-72e56a3e4ab5742c4877fd4b6563e9bf  memcache-2.2.5.tgz
+9542f1886b72ffbcb039a5c21796fe8a  memcache-2.2.6.tgz
diff --git a/xml2changelog b/xml2changelog
index c114873..eb6bd31 100644
--- a/xml2changelog
+++ b/xml2changelog
@@ -13,16 +13,22 @@ if ($xml['version'] >= "2"){ // Package.xml V 2.0
 		$xml->date, $xml->notes);
 	$new=$xml->version->release;
 
-	if (isset($xml->changelog->release) && count($xml->changelog->release)) 
-	    foreach($xml->changelog->release as $rel) {
-		$old=$rel->version->release;
-		if ("$old" != "$new") {
-		    printf("*** Version %s (%s) - API %s (%s) - %s\n\n%s\n\n",
-			$rel->version->release, $rel->stability->release, 
-			$rel->version->api, $rel->stability->api, 
-			$rel->date, $rel->notes);
-		}
-	    }
+	if (isset($xml->changelog->release) && count($xml->changelog->release)) {
+		$tab = array();
+		foreach($xml->changelog->release as $rel) {
+			$old=$rel->version->release;
+			if ("$old" != "$new") {
+				$tab[''.$rel->date] = $rel;
+			}
+		}	
+		krsort($tab);
+		foreach($tab as $rel) {
+			printf("*** Version %s (%s) - API %s (%s) - %s\n\n%s\n\n",
+				$rel->version->release, $rel->stability->release, 
+				$rel->version->api, $rel->stability->api, 
+				$rel->date, $rel->notes);
+	    	}
+	}
 } else { // Package.xml V 1.0
 	printf("* Version %s (%s) - %s\n\n%s\n\n",
 		$xml->release->version, $xml->release->state, $xml->release->date, $xml->release->notes);