[php-pecl-mysqlnd-qc] pull latest changes from SVN, fix FTBFS #914368

Remi Collet remi at fedoraproject.org
Wed Feb 27 14:05:58 UTC 2013


commit f0184ef63cdce0bed54ee7862a44c6cf30e0a4f4
Author: Remi Collet <remi at fedoraproject.org>
Date:   Wed Feb 27 15:05:52 2013 +0100

    pull latest changes from SVN, fix FTBFS #914368

 .gitignore               |    2 ++
 php-pecl-mysqlnd-qc.spec |   36 +++++++++++++++++++++++++++++-------
 sources                  |    2 +-
 3 files changed, 32 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3512b3e..ff7e51a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
+*spec~
 /mysqlnd_qc-1.1.1.tgz
+/mysqlnd_qc-svn329586.tar.gz
diff --git a/php-pecl-mysqlnd-qc.spec b/php-pecl-mysqlnd-qc.spec
index bb15666..9b155e6 100644
--- a/php-pecl-mysqlnd-qc.spec
+++ b/php-pecl-mysqlnd-qc.spec
@@ -2,6 +2,7 @@
 
 %global pecl_name mysqlnd_qc
 %global prever    alpha
+%global svnrel    329586
 
 %if 0%{?fedora} >= 9 || 0%{?rhel} >= 6
 %global withsqlite 1
@@ -12,8 +13,15 @@
 Summary:      A query cache plugin for mysqlnd
 Name:         php-pecl-mysqlnd-qc
 Version:      1.1.1
+%if 0%{?svnrel}
+Release:      4.svn%{svnrel}%{?dist}
+# svn export -r 329586 https://svn.php.net/repository/pecl/mysqlnd_qc/trunk mysqlnd_qc-svn329586
+# tar czf mysqlnd_qc-svn329586.tar.gz mysqlnd_qc-svn329586
+Source0:      %{pecl_name}-svn%{svnrel}.tar.gz
+%else
 Release:      3%{?dist}
 Source0:      http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
+%endif
 License:      PHP
 Group:        Development/Languages
 URL:          http://pecl.php.net/package/mysqlnd_qc
@@ -81,14 +89,25 @@ fi
 
 cp %{SOURCE1} %{pecl_name}.ini
 
-cp -r %{pecl_name}-%{version} %{pecl_name}-zts
+%if 0%{?svnrel}
+mv %{pecl_name}-svn%{svnrel} %{pecl_name}-nts
+mv %{pecl_name}-nts/package.xml .
+%else
+mv %{pecl_name}-%{version}   %{pecl_name}-nts
+%endif
+
+cp -r %{pecl_name}-nts %{pecl_name}-zts
 
 
 %build
-cd %{pecl_name}-%{version}
+cd %{pecl_name}-nts
 
 %{_bindir}/phpize
 
+# required by libmemcached
+LIBS="-lpthread"
+export LIBS
+
 # don't use --enable-mysqlnd-qc-apc because:
 # APC is onlysupported if both APC and MySQL Query Cache are compiled statically
 %configure \
@@ -122,10 +141,10 @@ make %{?_smp_mflags}
 # for short-circuit
 rm -f %{pecl_name}-*/modules/{sqlite3,mysqlnd}.so
 
-make install -C %{pecl_name}-%{version} INSTALL_ROOT=%{buildroot}
+make install -C %{pecl_name}-nts INSTALL_ROOT=%{buildroot}
 
 %if 0%{?__ztsphp:1}
-make install -C %{pecl_name}-zts        INSTALL_ROOT=%{buildroot}
+make install -C %{pecl_name}-zts INSTALL_ROOT=%{buildroot}
 
 # Drop in the bit of configuration
 install -D -m 644 %{pecl_name}.ini %{buildroot}%{php_ztsinidir}/%{pecl_name}.ini
@@ -147,7 +166,7 @@ fi
 
 
 %check
-cd %{pecl_name}-%{version}
+cd %{pecl_name}-nts
 ln -s %{php_extdir}/mysqlnd.so modules/
 %if %{withsqlite}
 ln -s %{php_extdir}/sqlite3.so modules/
@@ -183,8 +202,8 @@ zts-php -n -q \
 
 
 %files
-%doc %{pecl_name}-%{version}/{CHANGES,CREDITS,LICENSE,README}
-%doc %{pecl_name}-%{version}/web
+%doc %{pecl_name}-nts/{CHANGES,CREDITS,LICENSE,README}
+%doc %{pecl_name}-nts/web
 %config(noreplace) %{_sysconfdir}/php.d/%{pecl_name}.ini
 %{php_extdir}/%{pecl_name}.so
 %{pecl_xmldir}/%{name}.xml
@@ -203,6 +222,9 @@ zts-php -n -q \
 
 
 %changelog
+* Wed Feb 27 2013  Remi Collet <remi at fedoraproject.org> - 1.1.1-4.svn329586
+- pull latest changes from SVN, fix FTBFS #914368
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index 137dabb..b951f0f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2bf854752a79db7645c8c986c68b13f9  mysqlnd_qc-1.1.1.tgz
+0ed921d2cfdaf374ab8b88ff00bbc0e9  mysqlnd_qc-svn329586.tar.gz


More information about the scm-commits mailing list