[php-nrk-Predis: 2/2] update to 0.8.4

Remi Collet remi at fedoraproject.org
Tue Jul 30 05:16:15 UTC 2013


commit 128e67ac39a8b04add0754e9c15b220af410cfb9
Author: Remi Collet <remi at fedoraproject.org>
Date:   Tue Jul 30 07:15:42 2013 +0200

    update to 0.8.4

 .gitignore                 |    1 +
 LICENSE                    |   22 ---------------
 php-nrk-Predis-tests.patch |   63 --------------------------------------------
 php-nrk-Predis.spec        |   24 ++++++----------
 phpunit.xml.dist           |   39 ---------------------------
 sources                    |    2 +-
 6 files changed, 11 insertions(+), 140 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9bf3978..f65874a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 *spec~
 /Predis-0.8.3.tgz
+/Predis-0.8.4.tgz
diff --git a/php-nrk-Predis.spec b/php-nrk-Predis.spec
index 5930ab5..2c36de5 100644
--- a/php-nrk-Predis.spec
+++ b/php-nrk-Predis.spec
@@ -11,28 +11,24 @@
 %global pear_name    Predis
 %global pear_channel pear.nrk.io
 
-%if 0%{?fedora} > 18
+%if 0%{?fedora} >= 20
 %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.3
-Release:        2%{?dist}
+Version:        0.8.4
+Release:        1%{?dist}
 Summary:        PHP client library for Redis
 
 Group:          Development/Libraries
 License:        MIT
 URL:            http://%{pear_channel}
 Source0:        http://%{pear_channel}/get/%{pear_name}-%{version}.tgz
-# https://github.com/nrk/predis/issues/124
-Source1:        https://raw.github.com/nrk/predis/master/LICENSE
+
 # https://github.com/nrk/predis/issues/126
 Source2:        https://raw.github.com/nrk/predis/master/autoload.php
-Source3:        https://raw.github.com/nrk/predis/master/phpunit.xml.dist
-# https://github.com/nrk/predis/issues/127
-Patch0:         %{name}-tests.patch
 
 BuildArch:      noarch
 BuildRequires:  php(language) >= 5.3.2
@@ -66,9 +62,7 @@ Flexible and feature-complete PHP client library for Redis.
 %setup -q -c
 
 cd %{pear_name}-%{version}
-%patch0 -p1
-sed -e '/role="test"/s/md5sum.*name=/name=/' \
-    ../package.xml >%{name}.xml
+cp ../package.xml %{name}.xml
 
 
 %build
@@ -87,14 +81,11 @@ rm -rf %{buildroot}%{pear_metadir}/.??*
 mkdir -p %{buildroot}%{pear_xmldir}
 install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 
-# Missing in package.xml
-install -pm 644 %{SOURCE1} %{buildroot}%{pear_docdir}/%{pear_name}
-
 
 %check
 %if %{with_tests}
 cd %{pear_name}-%{version}
-cp %{SOURCE2} %{SOURCE3} .
+cp %{SOURCE2} .
 
 # Launch redis server
 mkdir -p {run,log,lib}/redis
@@ -141,6 +132,9 @@ fi
 
 
 %changelog
+* Sun Jul 28 2013 Remi Collet <remi at fedoraproject.org> - 0.8.4-1
+- Update to 0.8.4
+
 * Wed Jul  3 2013 Remi Collet <remi at fedoraproject.org> - 0.8.3-2
 - fixed sources, https://github.com/nrk/predis/issues/125
 
diff --git a/sources b/sources
index 8f9df14..efd86ae 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5b07cff994424dbc794fdf978235ff22  Predis-0.8.3.tgz
+b621f3cb984ca54f932e8c0e377d7abe  Predis-0.8.4.tgz


More information about the scm-commits mailing list