[php-nrk-Predis/epel7] update to 1.0.1

[Remi Collet]

commit 07da3ca20c3463fe72ca8ebed930723c06b0f56f
Author: Remi Collet <remi at fedoraproject.org>
Date:   Fri Jan 2 16:19:15 2015 +0100

    update to 1.0.1

 .gitignore            |    1 +
 Predis-upstream.patch |   60 -------------------------------------------------
 php-nrk-Predis.spec   |   26 ++++++++++++---------
 sources               |    2 +-
 4 files changed, 17 insertions(+), 72 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 69fca96..07fafed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /Predis-0.8.5.tgz
 /Predis-0.8.6.tgz
 /Predis-1.0.0.tgz
+/Predis-1.0.1.tgz
diff --git a/php-nrk-Predis.spec b/php-nrk-Predis.spec
index 2b3501a..3d4fadd 100644
--- a/php-nrk-Predis.spec
+++ b/php-nrk-Predis.spec
@@ -1,6 +1,6 @@
 # spec file for php-nrk-Predis
 #
-# Copyright (c) 2013-2014 Remi Collet
+# Copyright (c) 2013-2015 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/3.0/
 #
@@ -11,11 +11,14 @@
 %global pear_name    Predis
 %global pear_channel pear.nrk.io
 
-# Disabled, see https://github.com/nrk/predis/issues/220
+%if 0%{?fedora} >= 21
+%global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
+%else
 %global with_tests   %{?_with_tests:1}%{!?_with_tests:0}
+%endif
 
 Name:           php-nrk-Predis
-Version:        1.0.0
+Version:        1.0.1
 Release:        1%{?dist}
 Summary:        PHP client library for Redis
 
@@ -24,8 +27,6 @@ License:        MIT
 URL:            http://%{pear_channel}
 Source0:        http://%{pear_channel}/get/%{pear_name}-%{version}.tgz
 
-Patch0:         %{pear_name}-upstream.patch
-
 BuildArch:      noarch
 BuildRequires:  php(language) >= 5.3.2
 BuildRequires:  php-pear(PEAR)
@@ -59,12 +60,7 @@ Flexible and feature-complete PHP client library for Redis.
 %setup -q -c
 
 cd %{pear_name}-%{version}
-%patch0 -p1 -b .upstream
-
-sed -e '/StringPreciseSetExpireTest.php/s/md5sum=.*name=/name=/' \
-    -e '/StringSetExpireTest.php/s/md5sum=.*name=/name=/' \
-    ../package.xml >%{name}.xml
-touch -r ../package.xml %{name}.xml
+mv ../package.xml %{name}.xml
 
 
 %build
@@ -83,6 +79,11 @@ rm -rf %{buildroot}%{pear_metadir}/.??*
 mkdir -p %{buildroot}%{pear_xmldir}
 install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 
+# Relocate PATH so test suite can be run from install dir
+sed -e 's:tests/::' \
+    %{buildroot}%{pear_testdir}/%{pear_name}/phpunit.xml.dist \
+  > %{buildroot}%{pear_testdir}/%{pear_name}/phpunit.xml
+
 
 %check
 %if %{with_tests}
@@ -133,6 +134,9 @@ fi
 
 
 %changelog
+* Fri Jan 02 2015 Remi Collet <remi at fedoraproject.org> - 1.0.1-1
+- Update to 1.0.1
+
 * Mon Nov 03 2014 Remi Collet <remi at fedoraproject.org> - 1.0.0-1
 - Update to 1.0.0
 - upstream patch for tests
diff --git a/sources b/sources
index be15b53..758f04b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0b53a97593d64ef6359a2340bd36fe19  Predis-1.0.0.tgz
+7b9848b53cf59e6200184520c2fbcbf7  Predis-1.0.1.tgz