summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore7
-rw-r--r--REFLECTION12
-rw-r--r--php-pecl-redis.spec27
3 files changed, 30 insertions, 16 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..1ab5c4f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+package-*.xml
+*.tgz
+*.tar.gz
+*.tar.xz
+*.tar.xz.asc
+*.src.rpm
+*/*rpm
diff --git a/REFLECTION b/REFLECTION
index 45f7d7b..3a131cd 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #173 redis version 3.1.2 ] {
+Extension [ <persistent> extension #175 redis version 3.1.3RC1 ] {
- Dependencies {
Dependency [ igbinary (Required) ]
@@ -69,7 +69,7 @@ Extension [ <persistent> extension #173 redis version 3.1.2 ] {
- Properties [0] {
}
- - Methods [212] {
+ - Methods [213] {
Method [ <internal:redis, ctor> public method __construct ] {
}
@@ -451,6 +451,9 @@ Extension [ <persistent> extension #173 redis version 3.1.2 ] {
Method [ <internal:redis> public method hMget ] {
}
+ Method [ <internal:redis> public method hStrLen ] {
+ }
+
Method [ <internal:redis> public method multi ] {
}
@@ -876,7 +879,7 @@ Extension [ <persistent> extension #173 redis version 3.1.2 ] {
- Properties [0] {
}
- - Methods [164] {
+ - Methods [165] {
Method [ <internal:redis, ctor> public method __construct ] {
}
@@ -1078,6 +1081,9 @@ Extension [ <persistent> extension #173 redis version 3.1.2 ] {
Method [ <internal:redis> public method hincrbyfloat ] {
}
+ Method [ <internal:redis> public method hstrlen ] {
+ }
+
Method [ <internal:redis> public method dump ] {
}
diff --git a/php-pecl-redis.spec b/php-pecl-redis.spec
index 1b0eeaf..6412ae9 100644
--- a/php-pecl-redis.spec
+++ b/php-pecl-redis.spec
@@ -27,18 +27,18 @@
# after 40-igbinary
%global ini_name 50-%{pecl_name}.ini
%endif
-#global prever RC2
+%global upstream_version 3.1.3
+%global upstream_prever RC1
Summary: Extension for communicating with the Redis key-value store
Name: %{?sub_prefix}php-pecl-redis
-Version: 3.1.2
+Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
-Source0: http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz
+Source0: http://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz
License: PHP
Group: Development/Languages
URL: http://pecl.php.net/package/redis
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: %{?scl_prefix}php-devel
BuildRequires: %{?scl_prefix}php-pear
%if %{with_igbin}
@@ -88,6 +88,10 @@ Obsoletes: php70w-pecl-%{pecl_name} <= %{version}
Obsoletes: php71u-pecl-%{pecl_name} <= %{version}
Obsoletes: php71w-pecl-%{pecl_name} <= %{version}
%endif
+%if "%{php_version}" > "7.2"
+Obsoletes: php72u-pecl-%{pecl_name} <= %{version}
+Obsoletes: php72w-pecl-%{pecl_name} <= %{version}
+%endif
%endif
%if 0%{?fedora} < 20 && 0%{?rhel} < 7
@@ -111,7 +115,7 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
%prep
%setup -q -c
# rename source folder
-mv %{pecl_name}-%{version}%{?prever} NTS
+mv %{pecl_name}-%{upstream_version}%{?upstream_prever} NTS
# Don't install/register tests
sed -e 's/role="test"/role="src"/' \
@@ -122,8 +126,8 @@ cd NTS
# Sanity check, really often broken
extver=$(sed -n '/#define PHP_REDIS_VERSION/{s/.* "//;s/".*$//;p}' php_redis.h)
-if test "x${extver}" != "x%{version}%{?gh_date:-dev}%{?prever}"; then
- : Error: Upstream extension version is ${extver}, expecting %{version}%{?gh_date:-dev}%{?prever}.
+if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}"; then
+ : Error: Upstream extension version is ${extver}, expecting %{upstream_version}%{?upstream_prever}.
exit 1
fi
cd ..
@@ -190,7 +194,6 @@ make %{?_smp_mflags}
%install
-rm -rf %{buildroot}
%{?dtsenable}
# Install the NTS stuff
@@ -288,12 +291,7 @@ fi
%endif
-%clean
-rm -rf %{buildroot}
-
-
%files
-%defattr(-,root,root,-)
%{?_licensedir:%license NTS/COPYING}
%doc %{pecl_docdir}/%{pecl_name}
%{pecl_xmldir}/%{name}.xml
@@ -308,6 +306,9 @@ rm -rf %{buildroot}
%changelog
+* Thu Jun 1 2017 Remi Collet <remi@remirepo.net> - 3.1.3~RC1-1
+- update to 3.1.3RC1 (beta)
+
* Sat Mar 25 2017 Remi Collet <remi@remirepo.net> - 3.1.2-1
- Update to 3.1.2 (stable)