diff options
| -rw-r--r-- | Horde_Css_Parser-rpm.patch | 3 | ||||
| -rw-r--r-- | php-horde-Horde-Css-Parser.spec | 15 |
2 files changed, 12 insertions, 6 deletions
diff --git a/Horde_Css_Parser-rpm.patch b/Horde_Css_Parser-rpm.patch index f4292ba..c223f85 100644 --- a/Horde_Css_Parser-rpm.patch +++ b/Horde_Css_Parser-rpm.patch @@ -1,7 +1,7 @@ diff -up Horde_Css_Parser-1.0.5/lib/Horde/Css/Parser.php.rpm Horde_Css_Parser-1.0.5/lib/Horde/Css/Parser.php --- Horde_Css_Parser-1.0.5/lib/Horde/Css/Parser.php.rpm 2015-01-08 16:55:01.000000000 +0100 +++ Horde_Css_Parser-1.0.5/lib/Horde/Css/Parser.php 2015-01-08 16:55:09.000000000 +0100 -@@ -11,11 +11,6 @@ +@@ -11,11 +11,7 @@ * @package Css_Parser */ @@ -10,6 +10,7 @@ diff -up Horde_Css_Parser-1.0.5/lib/Horde/Css/Parser.php.rpm Horde_Css_Parser-1. -} else { - require_once __DIR__ . '/../../../bundle/vendor/autoload.php'; -} ++require_once '/usr/share/php/Sabberworm/CSS/autoload.php'; /** * Horde interface to the Sabberworm CSS Parser library. diff --git a/php-horde-Horde-Css-Parser.spec b/php-horde-Horde-Css-Parser.spec index a5e2193..e825e22 100644 --- a/php-horde-Horde-Css-Parser.spec +++ b/php-horde-Horde-Css-Parser.spec @@ -11,7 +11,7 @@ %global pear_channel pear.horde.org Name: php-horde-Horde-Css-Parser -Version: 1.0.8 +Version: 1.0.9 Release: 1%{?dist} Summary: Horde CSS Parser @@ -26,22 +26,22 @@ Patch0: %{pear_name}-rpm.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: php(language) >= 5.3.0 +BuildRequires: php(language) >= 5.3.2 BuildRequires: php-pear(PEAR) >= 1.7.0 BuildRequires: php-channel(%{pear_channel}) # To run unit tests BuildRequires: php-pear(%{pear_channel}/Horde_Test) >= 2.1.0 -BuildRequires: php-composer(sabberworm/php-css-parser) >= 6 +BuildRequires: php-composer(sabberworm/php-css-parser) >= 7.0.2 Requires(post): %{__pear} Requires(postun): %{__pear} # From package.xml -Requires: php(language) >= 5.3.0 +Requires: php(language) >= 5.3.2 Requires: php-mbstring Requires: php-pear(PEAR) >= 1.7.0 Requires: php-channel(%{pear_channel}) # Unbundled library -Requires: php-composer(sabberworm/php-css-parser) >= 6 +Requires: php-composer(sabberworm/php-css-parser) >= 7.0.2 # From phpcompatinfo report for 1.0.2 Requires: php-iconv Requires: php-pcre @@ -120,6 +120,11 @@ fi %changelog +* Tue Apr 05 2016 Remi Collet <remi@fedoraproject.org> - 1.0.9-1 +- Update to 1.0.9 +- raise dependency on php-PHP-CSS-Parser >= 7.0.2 +- use php-PHP-CSS-Parser autoloader (instead of PSR-0) + * Tue Feb 02 2016 Remi Collet <remi@fedoraproject.org> - 1.0.8-1 - Update to 1.0.8 - PHP 7 compatible version |