diff options
| -rw-r--r-- | LICENSE | 22 | ||||
| -rw-r--r-- | php-nrk-Predis.spec | 22 | ||||
| -rw-r--r-- | phpunit.xml.dist | 39 |
3 files changed, 8 insertions, 75 deletions
diff --git a/LICENSE b/LICENSE deleted file mode 100644 index e0b0536..0000000 --- a/LICENSE +++ /dev/null @@ -1,22 +0,0 @@ -Copyright (c) 2009-2013 Daniele Alessandri - -Permission is hereby granted, free of charge, to any person -obtaining a copy of this software and associated documentation -files (the "Software"), to deal in the Software without -restriction, including without limitation the rights to use, -copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the -Software is furnished to do so, subject to the following -conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -OTHER DEALINGS IN THE SOFTWARE. diff --git a/php-nrk-Predis.spec b/php-nrk-Predis.spec index ba7a4dc..59ac92f 100644 --- a/php-nrk-Predis.spec +++ b/php-nrk-Predis.spec @@ -18,21 +18,17 @@ %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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -67,9 +63,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 @@ -89,14 +83,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 @@ -148,6 +139,9 @@ fi %changelog +* Sun Jul 28 2013 Remi Collet <remi@fedoraproject.org> - 0.8.4-1 +- Update to 0.8.4 + * Wed Jul 3 2013 Remi Collet <remi@fedoraproject.org> - 0.8.3-2 - fixed sources, https://github.com/nrk/predis/issues/125 diff --git a/phpunit.xml.dist b/phpunit.xml.dist deleted file mode 100644 index 1a6a012..0000000 --- a/phpunit.xml.dist +++ /dev/null @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<phpunit bootstrap="tests/bootstrap.php" colors="true" strict="true"> - <testsuites> - <testsuite name="Predis Test Suite"> - <directory>tests/Predis/</directory> - </testsuite> - </testsuites> - - <groups> - <exclude> - <group>ext-phpiredis</group> - <group>ext-curl</group> - <group>realm-webdis</group> - <!-- <group>connected</group> --> - <!-- <group>disconnected</group> --> - <!-- <group>commands</group> --> - <!-- <group>slow</group> --> - </exclude> - </groups> - - <filter> - <whitelist> - <directory suffix=".php">lib/Predis/</directory> - </whitelist> - </filter> - - <php> - <!-- Redis --> - <const name="REDIS_SERVER_VERSION" value="2.6" /> - <const name="REDIS_SERVER_HOST" value="127.0.0.1" /> - <const name="REDIS_SERVER_PORT" value="6379" /> - <const name="REDIS_SERVER_DBNUM" value="15" /> - - <!-- Webdis --> - <const name="WEBDIS_SERVER_HOST" value="127.0.0.1" /> - <const name="WEBDIS_SERVER_PORT" value="7379" /> - </php> -</phpunit> |