From a30b08ee3a8a51be9091bb73cf22149123c3e765 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Wed, 16 Jul 2014 08:54:00 +0200
Subject: php-nrk-Predis: 0.8.6

---
 php-nrk-Predis-tests.patch | 63 ----------------------------------------------
 php-nrk-Predis.spec        | 16 ++++++------
 2 files changed, 9 insertions(+), 70 deletions(-)
 delete mode 100644 php-nrk-Predis-tests.patch

diff --git a/php-nrk-Predis-tests.patch b/php-nrk-Predis-tests.patch
deleted file mode 100644
index fbd7f96..0000000
--- a/php-nrk-Predis-tests.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -up ./tests/Predis/Command/KeyExpireAtTest.php.old ./tests/Predis/Command/KeyExpireAtTest.php
---- ./tests/Predis/Command/KeyExpireAtTest.php.old	2013-02-18 15:13:11.000000000 +0100
-+++ ./tests/Predis/Command/KeyExpireAtTest.php	2013-06-05 08:52:53.000000000 +0200
-@@ -87,6 +87,7 @@ class KeyExpireAtTest extends CommandTes
-     /**
-      * @group connected
-      * @group slow
-+     * @medium
-      */
-     public function testCanExpireKeys()
-     {
-diff -up ./tests/Predis/Command/KeyExpireTest.php.old ./tests/Predis/Command/KeyExpireTest.php
---- ./tests/Predis/Command/KeyExpireTest.php.old	2013-02-18 15:13:11.000000000 +0100
-+++ ./tests/Predis/Command/KeyExpireTest.php	2013-06-05 08:53:16.000000000 +0200
-@@ -87,6 +87,7 @@ class KeyExpireTest extends CommandTestC
-     /**
-      * @group connected
-      * @group slow
-+     * @medium
-      */
-     public function testCanExpireKeys()
-     {
-@@ -105,6 +106,7 @@ class KeyExpireTest extends CommandTestC
-     /**
-      * @group connected
-      * @group slow
-+     * @medium
-      */
-     public function testConsistencyWithTTL()
-     {
-diff -up ./tests/Predis/Command/KeyPreciseExpireAtTest.php.old ./tests/Predis/Command/KeyPreciseExpireAtTest.php
---- ./tests/Predis/Command/KeyPreciseExpireAtTest.php.old	2013-02-18 15:13:11.000000000 +0100
-+++ ./tests/Predis/Command/KeyPreciseExpireAtTest.php	2013-06-05 08:53:36.000000000 +0200
-@@ -77,6 +77,7 @@ class KeyPreciseExpireAtTest extends Com
-     /**
-      * @group connected
-      * @group slow
-+     * @medium
-      */
-     public function testCanExpireKeys()
-     {
-diff -up ./tests/Predis/Command/KeyPreciseExpireTest.php.old ./tests/Predis/Command/KeyPreciseExpireTest.php
---- ./tests/Predis/Command/KeyPreciseExpireTest.php.old	2013-02-18 15:13:11.000000000 +0100
-+++ ./tests/Predis/Command/KeyPreciseExpireTest.php	2013-06-05 08:53:43.000000000 +0200
-@@ -87,6 +87,7 @@ class KeyPreciseExpireTest extends Comma
-     /**
-      * @group connected
-      * @group slow
-+     * @medium
-      */
-     public function testCanExpireKeys()
-     {
-diff -up ./tests/Predis/Command/StringSetExpireTest.php.old ./tests/Predis/Command/StringSetExpireTest.php
---- ./tests/Predis/Command/StringSetExpireTest.php.old	2013-02-18 15:13:11.000000000 +0100
-+++ ./tests/Predis/Command/StringSetExpireTest.php	2013-06-05 08:47:03.000000000 +0200
-@@ -86,6 +86,7 @@ class StringSetExpireTest extends Comman
-     /**
-      * @group connected
-      * @group slow
-+     * @medium
-      */
-     public function testKeyExpiresAfterTTL()
-     {
diff --git a/php-nrk-Predis.spec b/php-nrk-Predis.spec
index 469b4a2..76e66c9 100644
--- a/php-nrk-Predis.spec
+++ b/php-nrk-Predis.spec
@@ -10,14 +10,14 @@
 %global pear_name    Predis
 %global pear_channel pear.nrk.io
 
-%if 0%{?fedora} >= 18
+%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7
 %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:        0.8.5
+Version:        0.8.6
 Release:        1%{?dist}
 Summary:        PHP client library for Redis
 
@@ -49,6 +49,7 @@ Requires:       php-pear(PEAR)
 Requires:       php-channel(%{pear_channel})
 
 Provides:       php-pear(%{pear_channel}/%{pear_name}) = %{version}
+Provides:       php-composer(predis/predis) = %{version}
 
 
 %description
@@ -106,11 +107,7 @@ fi
 
 exit $ret
 %else
-%if 0%{?_without_tests:1}
-: Test disabled, by '--without tests' option.
-%else
-: Test disabled, missing '--with tests' option.
-%endif
+: Test disabled
 %endif
 
 
@@ -138,6 +135,11 @@ fi
 
 
 %changelog
+* Wed Jul 16 2014 Remi Collet <remi@fedoraproject.org> - 0.8.6-1
+- Update to 0.8.6
+- provides php-composer(predis/predis)
+- enable test suite in EL-7
+
 * Thu Jan 16 2014 Remi Collet <remi@fedoraproject.org> - 0.8.5-1
 - Update to 0.8.5 (stable)
 
-- 
cgit