[php-pecl-mysqlnd-ms] - Update to 1.6.0 (alpha) svn snapshot for php 5.6 - add numerical prefix to extension configuration

[Remi Collet]

commit 89a45385b31c0aa6c4797367440100ded0a4e178
Author: Remi Collet <remi at fedoraproject.org>
Date:   Thu Jun 19 17:35:47 2014 +0200

    - Update to 1.6.0 (alpha) svn snapshot for php 5.6
    - add numerical prefix to extension configuration file

 .gitignore               |    1 +
 mysqlnd_ms-svn.patch     |   11 -----------
 php-pecl-mysqlnd-ms.spec |   46 ++++++++++++++++++++++++----------------------
 sources                  |    2 +-
 4 files changed, 26 insertions(+), 34 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a775668..b8dc6b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /mysqlnd_ms-1.4.2.tgz
 /mysqlnd_ms-1.5.1.tgz
 /mysqlnd_ms-1.5.2.tgz
+/mysqlnd_ms-1.6.0-333506.tgz
diff --git a/php-pecl-mysqlnd-ms.spec b/php-pecl-mysqlnd-ms.spec
index 5601760..45bf8ec 100644
--- a/php-pecl-mysqlnd-ms.spec
+++ b/php-pecl-mysqlnd-ms.spec
@@ -13,7 +13,9 @@
 
 %global pecl_name mysqlnd_ms
 %global with_zts  0%{?__ztsphp:1}
-%if 0%{?fedora} < 21
+%global versufix  -alpha
+%global svnrev    333506
+%if "%{php_version}" < "5.6"
 # After json, mysqlnd
 %global ini_name  %{pecl_name}.ini
 %else
@@ -23,25 +25,31 @@
 
 Summary:      A replication and load balancing plugin for mysqlnd
 Name:         php-pecl-mysqlnd-ms
-Version:      1.5.2
-Release:      3%{?dist}
+Version:      1.6.0
+Release:      1.svn%{svnrev}%{?dist}
 
 License:      PHP
 Group:        Development/Languages
 URL:          http://pecl.php.net/package/mysqlnd_ms
 
+%if 0%{?svnrev}
+# svn export -r 333506 https://svn.php.net/repository/pecl/mysqlnd_ms/trunk
+# cd trunk
+# pecl package
+# mv mysqlnd_ms-1.6.0.tgz ../mysqlnd_ms-1.6.0-333506.tgz
+Source0:      %{pecl_name}-%{version}-%{svnrev}.tgz
+%else
 Source0:      http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
+%endif
 
 # From http://www.php.net/manual/en/mysqlnd-ms.configuration.php
 Source1:      %{pecl_name}.ini
 
-# http://svn.php.net/viewvc?view=revision&revision=332282
-Patch0:       %{pecl_name}-svn.patch
-
 BuildRequires: php-devel >= 5.3.6
 BuildRequires: php-mysqlnd
 BuildRequires: php-json
 BuildRequires: php-pear
+BuildRequires: libxml2-devel
 
 Requires(post): %{__pecl}
 Requires(postun): %{__pecl}
@@ -85,28 +93,18 @@ Requires:      php-devel%{?_isa}
 These are the files needed to compile programs using mysqlnd_ms extension.
 
 
-%prep 
+%prep
 %setup -c -q
 
 cp %{SOURCE1} %{ini_name}
 
-# Fix some roles (fixed upstream)
-sed -e '/"tests/s/role="doc"/role="test"/'  \
-    -e '/"CHANGES/s/role="src"/role="doc"/' \
-    -e '/"CREDITS/s/role="src"/role="doc"/' \
-    -e '/"LICENSE/s/role="src"/role="doc"/' \
-    -i package.xml
-
 mv %{pecl_name}-%{version} NTS
-cd NTS
-%patch0 -p3 -b .format
-cd ..
 
 # check version, so often broken
 grep MYSQLND_MS_VERSION NTS/mysqlnd_ms.h
-extver=$(sed -n '/#define MYSQLND_MS_VERSION /{s/.* "//;s/".*$//;p}' NTS/mysqlnd_ms.h)
-if test "x${extver}" != "x%{version}"; then
-   : Error: Upstream version is ${extver}, expecting %{version}.
+extver=$(sed -n '/PHP_MYSQLND_MS_VERSION /{s/.* "//;s/".*$//;p}' NTS/mysqlnd_ms.h)
+if test "x${extver}" != "x%{version}%{?versufix}"; then
+   : Error: Upstream version is ${extver}, expecting %{version}%{?versufix}.
    exit 1
 fi
 
@@ -197,7 +195,7 @@ cd ../ZTS
 
 %files
 %doc %{pecl_docdir}/%{pecl_name}
-%exclude %{pecl_docdir}/%{pecl_name}/examples
+#exclude %{pecl_docdir}/%{pecl_name}/examples
 %{pecl_xmldir}/%{name}.xml
 
 %config(noreplace) %{php_inidir}/%{ini_name}
@@ -210,7 +208,7 @@ cd ../ZTS
 
 
 %files devel
-%doc %{pecl_docdir}/%{pecl_name}/examples
+#doc %{pecl_docdir}/%{pecl_name}/examples
 %doc %{pecl_testdir}/%{pecl_name}
 %{php_incldir}/ext/%{pecl_name}
 
@@ -220,6 +218,10 @@ cd ../ZTS
 
 
 %changelog
+* Thu Jun 19 2014 Remi Collet <remi at fedoraproject.org> - 1.6.0-1.svn333506
+- Update to 1.6.0 (alpha) svn snapshot for php 5.6
+- add numerical prefix to extension configuration file
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index e055a28..97e842b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a4f207e1b977daf3ae845b22e354b49c  mysqlnd_ms-1.5.2.tgz
+f3996e6f981ce79ad330c2feb552ccec  mysqlnd_ms-1.6.0-333506.tgz