[php-pecl-mysqlnd-qc] update to 1.2.0

Remi Collet remi at fedoraproject.org
Tue Mar 12 16:55:44 UTC 2013


commit 31fb115a59f20d5e0cb87260c6175fed89028ffc
Author: Remi Collet <remi at fedoraproject.org>
Date:   Tue Mar 12 17:55:39 2013 +0100

    update to 1.2.0

 .gitignore               |    1 +
 php-pecl-mysqlnd-qc.spec |   37 ++++++++++++++-----------------------
 sources                  |    2 +-
 3 files changed, 16 insertions(+), 24 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ff7e51a..ad6d94d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 *spec~
 /mysqlnd_qc-1.1.1.tgz
 /mysqlnd_qc-svn329586.tar.gz
+/mysqlnd_qc-1.2.0.tgz
diff --git a/php-pecl-mysqlnd-qc.spec b/php-pecl-mysqlnd-qc.spec
index 9b155e6..a67766d 100644
--- a/php-pecl-mysqlnd-qc.spec
+++ b/php-pecl-mysqlnd-qc.spec
@@ -2,7 +2,6 @@
 
 %global pecl_name mysqlnd_qc
 %global prever    alpha
-%global svnrel    329586
 
 %if 0%{?fedora} >= 9 || 0%{?rhel} >= 6
 %global withsqlite 1
@@ -12,21 +11,13 @@
 
 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
+Version:      1.2.0
+Release:      1%{?dist}
 License:      PHP
 Group:        Development/Languages
 URL:          http://pecl.php.net/package/mysqlnd_qc
 
-
+Source0:      http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
 # From http://www.php.net/manual/en/mysqlnd-qc.configuration.php
 Source1:      mysqlnd_qc.ini
 
@@ -46,8 +37,10 @@ Requires:     php-sqlite3%{?_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}
+Provides:     php-%{pecl_name} = %{version}
+Provides:     php-%{pecl_name}%{?_isa} = %{version}
+Provides:     php-pecl(%{pecl_name}) = %{version}
+Provides:     php-pecl(%{pecl_name})%{?_isa} = %{version}
 
 # Filter private shared
 %{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$}
@@ -76,9 +69,6 @@ These are the files needed to compile programs using mysqlnd_qc extension.
 %prep 
 %setup -c -q
 
-# Fix version
-sed -i -e '/MYSQLND_QC_VERSION_STR/s/1.1.0/1.1.1/' %{pecl_name}-*/php_mysqlnd_qc.h
-
 # Check version (often broken)
 extver=$(sed -n '/#define MYSQLND_QC_VERSION_STR/{s/.* "//;s/".*$//;p}' %{pecl_name}-*/php_mysqlnd_qc.h)
 if test "x${extver}" != "x%{version}%{?prever:-}%{?prever}"; then
@@ -89,12 +79,7 @@ fi
 
 cp %{SOURCE1} %{pecl_name}.ini
 
-%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
+mv %{pecl_name}-%{version} %{pecl_name}-nts
 
 cp -r %{pecl_name}-nts %{pecl_name}-zts
 
@@ -114,6 +99,7 @@ export LIBS
     --with-libdir=%{_lib} \
     --enable-mysqlnd-qc \
     --enable-mysqlnd-qc-memcache \
+    --with-libmemcached-dir=%{_prefix} \
 %if %{withsqlite}
     --enable-mysqlnd-qc-sqlite \
     --with-sqlite-dir=%{_prefix} \
@@ -128,6 +114,7 @@ cd ../%{pecl_name}-zts
     --with-libdir=%{_lib} \
     --enable-mysqlnd-qc \
     --enable-mysqlnd-qc-memcache \
+    --with-libmemcached-dir=%{_prefix} \
 %if %{withsqlite}
     --enable-mysqlnd-qc-sqlite \
     --with-sqlite-dir=%{_prefix} \
@@ -222,6 +209,10 @@ zts-php -n -q \
 
 
 %changelog
+* Tue Mar 12 2013  Remi Collet <remi at fedoraproject.org> - 1.2.0-1
+- update to 1.2.0-alpha
+- also provides php-mysqlnd_qc
+
 * Wed Feb 27 2013  Remi Collet <remi at fedoraproject.org> - 1.1.1-4.svn329586
 - pull latest changes from SVN, fix FTBFS #914368
 
diff --git a/sources b/sources
index b951f0f..754d69b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0ed921d2cfdaf374ab8b88ff00bbc0e9  mysqlnd_qc-svn329586.tar.gz
+74c9c0eb8a00658f49a979f452754628  mysqlnd_qc-1.2.0.tgz


More information about the scm-commits mailing list