[php-horde-Horde-Css-Parser/f20] - Update to 1.0.6 - raise dependency on sabberworm/php-css-parser >= 6 - add provides php-composer(h

[Remi Collet]

commit b60b9dde750f1c8aae80108eec8aa0a0acad9132
Author: Remi Collet <remi at fedoraproject.org>
Date:   Tue Jan 13 17:57:19 2015 +0100

    - Update to 1.0.6
    - raise dependency on sabberworm/php-css-parser >= 6
    - add provides php-composer(horde/horde-css-parser)

 .gitignore                      |    3 +++
 Horde_Css_Parser-rpm.patch      |   15 +++++++++++++++
 php-horde-Horde-Css-Parser.spec |   35 ++++++++++++++++++++++-------------
 sources                         |    2 +-
 4 files changed, 41 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 802fadb..db0845a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,5 @@
+clog
 /Horde_Css_Parser-1.0.3.tgz
 /Horde_Css_Parser-1.0.4.tgz
+/Horde_Css_Parser-1.0.5.tgz
+/Horde_Css_Parser-1.0.6.tgz
diff --git a/Horde_Css_Parser-rpm.patch b/Horde_Css_Parser-rpm.patch
new file mode 100644
index 0000000..f4292ba
--- /dev/null
+++ b/Horde_Css_Parser-rpm.patch
@@ -0,0 +1,15 @@
+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 @@
+  * @package   Css_Parser
+  */
+ 
+-if (file_exists(__DIR__ . '/Parser/vendor/autoload.php')) {
+-    require_once __DIR__ . '/Parser/vendor/autoload.php';
+-} else {
+-    require_once __DIR__ . '/../../../bundle/vendor/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 27d2c2c..ddd539a 100644
--- a/php-horde-Horde-Css-Parser.spec
+++ b/php-horde-Horde-Css-Parser.spec
@@ -1,6 +1,6 @@
 # spec file for php-horde-Horde-Css-Parser
 #
-# 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,10 +11,9 @@
 %global pear_name    Horde_Css_Parser
 %global pear_channel pear.horde.org
 
-
 Name:           php-horde-Horde-Css-Parser
-Version:        1.0.4
-Release:        1%{?dist}
+Version:        1.0.6
+Release:        2%{?dist}
 Summary:        Horde CSS Parser
 
 Group:          Development/Libraries
@@ -22,12 +21,17 @@ License:        LGPLv2
 URL:            http://%{pear_channel}
 Source0:        http://%{pear_channel}/get/%{pear_name}-%{version}.tgz
 
+# Sabberworm/CSS is PSR-0 compliant
+# Default Horde autoloader will find it
+Patch0:         %{pear_name}-rpm.patch
+
 BuildArch:      noarch
 BuildRequires:  php(language) >= 5.3.0
 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
 
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
@@ -36,12 +40,14 @@ Requires:       php(language) >= 5.3.0
 Requires:       php-mbstring
 Requires:       php-pear(PEAR) >= 1.7.0
 Requires:       php-channel(%{pear_channel})
-Requires:       php-PHP-CSS-Parser >= 5.0.8
+# Unbundled library
+Requires:       php-composer(sabberworm/php-css-parser) >= 6
 # From phpcompatinfo report for 1.0.2
 Requires:       php-iconv
 Requires:       php-pcre
 
 Provides:       php-pear(%{pear_channel}/%{pear_name}) = %{version}
+Provides:       php-composer(horde/horde-css-parser) = %{version}
 
 
 %description
@@ -53,11 +59,13 @@ Horde framework.
 %setup -q -c
 
 cd %{pear_name}-%{version}
-mv ../package.xml %{name}.xml
+%patch0 -p1 -b .rpm
 
-sed -e '/Sabberworm\/CSS/d' \
+sed -e '/bundle/d' \
     -e '/EXPAT_LICENSE/d' \
-    -i %{name}.xml
+    -e '/Parser.php/s/md5sum="[^"]*"//' \
+    ../package.xml >%{name}.xml
+touch -r ../package.xml %{name}.xml
 
 
 %build
@@ -78,12 +86,8 @@ install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 
 
 %check
-src=$(pwd)/%{pear_name}-%{version}
 cd %{pear_name}-%{version}/test/$(echo %{pear_name} | sed -e s:_:/:g)
-phpunit \
-    --include-path=$src/lib \
-    -d date.timezone=UTC \
-    .
+phpunit .
 
 
 %post
@@ -106,6 +110,11 @@ fi
 
 
 %changelog
+* Tue Jan 13 2015 Remi Collet <remi at fedoraproject.org> - 1.0.6-2
+- Update to 1.0.6
+- raise dependency on sabberworm/php-css-parser >= 6
+- add provides php-composer(horde/horde-css-parser)
+
 * Thu Feb 20 2014 Remi Collet <remi at fedoraproject.org> - 1.0.4-1
 - Update to 1.0.4
 
diff --git a/sources b/sources
index 06744a0..a6db65d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6a0338fa99da90af75263a2251469a89  Horde_Css_Parser-1.0.4.tgz
+f2c240f923d0561ff9073af63a3e56b7  Horde_Css_Parser-1.0.6.tgz