[php-pecl-mysqlnd-ms] update to 1.4.2

[Remi Collet]

commit c61e3a8522ef70ae3052c8e685d95c563b59e6b2
Author: remi <fedora at famillecollet.com>
Date:   Wed Aug 22 15:41:18 2012 +0200

    update to 1.4.2

 .gitignore               |    1 +
 mysqlnd_ms.ini           |    3 +-
 php-pecl-mysqlnd-ms.spec |   47 +++++++++++++++++++++++++++++++++++++++++++--
 sources                  |    2 +-
 4 files changed, 48 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8dc00ab..a7f5379 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 *spec~
 /mysqlnd_ms-1.2.2.tgz
+/mysqlnd_ms-1.4.2.tgz
diff --git a/mysqlnd_ms.ini b/mysqlnd_ms.ini
index 584857f..ff293a9 100644
--- a/mysqlnd_ms.ini
+++ b/mysqlnd_ms.ini
@@ -14,7 +14,8 @@ extension=mysqlnd_ms.so
 ;mysqlnd_ms.force_config_usage = 0
 
 ; Plugin specific configuration file.
-;mysqlnd_ms.ini_file = "/etc/mysqlnd_ms.json"
+; This setting superseeds mysqlnd_ms.ini_file since 1.4.0.
+;mysqlnd_ms.config_file = "/etc/mysqlnd_ms.json"
 
 ; Enables or disables the collection of statistics. The collection of
 ; statistics is disabled by default for performance reasons.
diff --git a/php-pecl-mysqlnd-ms.spec b/php-pecl-mysqlnd-ms.spec
index 4d1c333..2c6a870 100644
--- a/php-pecl-mysqlnd-ms.spec
+++ b/php-pecl-mysqlnd-ms.spec
@@ -3,8 +3,8 @@
 
 Summary:      A replication and load balancing plugin for mysqlnd
 Name:         php-pecl-mysqlnd-ms
-Version:      1.2.2
-Release:      2%{?dist}
+Version:      1.4.2
+Release:      1%{?dist}
 
 License:      PHP
 Group:        Development/Languages
@@ -18,19 +18,25 @@ Source1:      %{pecl_name}.ini
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: php-devel >= 5.3.6
 BuildRequires: php-mysqlnd
+BuildRequires: php-json
 BuildRequires: php-pear
 
 Requires(post): %{__pecl}
 Requires(postun): %{__pecl}
 
 Requires:     php-mysqlnd%{?_isa}
+Requires:     php-json%{?_isa}
 Requires:     php(zend-abi) = %{php_zend_api}
 Requires:     php(api) = %{php_core_api}
 
 Provides:     php-pecl(%{pecl_name}) = %{version}-%{release}
 Provides:     php-pecl(%{pecl_name})%{?_isa} = %{version}-%{release}
 
+# RPM 4.8
+%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$}
 %{?filter_setup}
+# RPM 4.9
+%global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}%{_libdir}/.*\\.so$
 
 
 %description
@@ -45,11 +51,27 @@ dependent on the usage scenario required.
 Documentation : http://www.php.net/mysqlnd_ms
 
 
+%package devel
+Summary:       Mysqlnd_ms developer files (header)
+Group:         Development/Libraries
+Requires:      php-pecl-mysqlnd-ms%{?_isa} = %{version}-%{release}
+Requires:      php-devel%{?_isa}
+
+%description devel
+These are the files needed to compile programs using mysqlnd_ms extension.
+
+
 %prep 
 %setup -c -q
 
 cp %{SOURCE1} %{pecl_name}.ini
 
+extver=$(sed -n '/#define MYSQLND_MS_VERSION /{s/.* "//;s/".*$//;p}' %{pecl_name}-%{version}/mysqlnd_ms.h)
+if test "x${extver}" != "x%{version}"; then
+   : Error: Upstream version is ${extver}, expecting %{version}.
+   exit 1
+fi
+
 %if 0%{?__ztsphp:1}
 # Build ZTS extension if ZTS devel available (fedora >= 17)
 cp -r %{pecl_name}-%{version} %{pecl_name}-zts
@@ -57,6 +79,12 @@ cp -r %{pecl_name}-%{version} %{pecl_name}-zts
 
 
 %build
+# EXPERIMENTAL options not used
+# --enable-mysqlnd-ms-table-filter
+#         Enable support for table filter in mysqlnd_ms
+# --enable-mysqlnd-ms-cache-support
+#         Enable query caching through mysqlnd_qc
+
 cd %{pecl_name}-%{version}
 %{_bindir}/phpize
 %configure \
@@ -78,7 +106,7 @@ make %{?_smp_mflags}
 %install
 rm -rf %{buildroot}
 # for short-circuit
-rm -rf %{pecl_name}-*/modules/{json,mysqlnd}.so
+rm -f %{pecl_name}-*/modules/{json,mysqlnd}.so
 
 make install -C %{pecl_name}-%{version} \
      INSTALL_ROOT=%{buildroot}
@@ -152,7 +180,20 @@ ln -sf %{php_ztsextdir}/json.so modules/
 %endif
 
 
+%files devel
+%defattr(-,root,root,-)
+%{_includedir}/php/ext/%{pecl_name}
+
+%if 0%{?__ztsphp:1}
+%{php_ztsincldir}/ext/%{pecl_name}
+%endif
+
+
 %changelog
+* Wed Aug 22 2012 Remi Collet <remi at fedoraproject.org> - 1.4.2-1
+- update to 1.4.2 (stable)
+- add -devel sub package
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index 37d22bd..d0a5a68 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fad5095907aea981b9af41a66276c587  mysqlnd_ms-1.2.2.tgz
+7d500ecbfe38c673ab6a4a6d2f345721  mysqlnd_ms-1.4.2.tgz