[php-horde-Horde-Text-Diff/f20] update to 2.1.0

[Remi Collet]

commit 4ffa0f99d7ebdf925ea3b682588bba7976544198
Author: Remi Collet <remi at fedoraproject.org>
Date:   Tue Jun 17 15:30:15 2014 +0200

    update to 2.1.0

 .gitignore                     |    1 +
 php-horde-Horde-Text-Diff.spec |   28 ++++++++++++++++++++--------
 sources                        |    2 +-
 3 files changed, 22 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8e970f3..ea7ce5e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /Horde_Text_Diff-2.0.1.tgz
 /Horde_Text_Diff-2.0.2.tgz
+/Horde_Text_Diff-2.1.0.tgz
diff --git a/php-horde-Horde-Text-Diff.spec b/php-horde-Horde-Text-Diff.spec
index 2c2948c..2308033 100644
--- a/php-horde-Horde-Text-Diff.spec
+++ b/php-horde-Horde-Text-Diff.spec
@@ -1,11 +1,20 @@
+# spec file for php-horde-Horde-Text-Diff
+#
+# Copyright (c) 2012-2014 Nick Bebout, Remi Collet
+#
+# License: MIT
+# https://fedoraproject.org/wiki/Licensing:MIT#Modern_Style_with_sublicense
+#
+# Please, preserve the changelog entries
+#
+%{!?__pear:       %global __pear       %{_bindir}/pear}
 %{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
-%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
 %global pear_name    Horde_Text_Diff
 %global pear_channel pear.horde.org
 
 Name:           php-horde-Horde-Text-Diff
-Version:        2.0.2
-Release:        2%{?dist}
+Version:        2.1.0
+Release:        1%{?dist}
 Summary:        Engine for performing and rendering text diffs
 
 Group:          Development/Libraries
@@ -14,7 +23,7 @@ URL:            http://%{pear_channel}
 Source0:        http://%{pear_channel}/get/%{pear_name}-%{version}.tgz
 
 BuildArch:      noarch
-BuildRequires:  php-common >= 5.3.0
+BuildRequires:  php(language) >= 5.3.0
 BuildRequires:  php-pear(PEAR) >= 1.7.0
 BuildRequires:  php-channel(%{pear_channel})
 # To run unit tests
@@ -22,14 +31,14 @@ BuildRequires:  php-pear(%{pear_channel}/Horde_Test) >= 2.1.0
 
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
-Requires:       php-common >= 5.3.0
+Requires:       php(language) >= 5.3.0
 Requires:       php-pcre
 Requires:       php-pear(PEAR) >= 1.7.0
 Requires:       php-channel(%{pear_channel})
 Requires:       php-pear(%{pear_channel}/Horde_Exception) >= 2.0.0
-Conflicts:      php-pear(%{pear_channel}/Horde_Exception) >= 3.0.0
+Requires:       php-pear(%{pear_channel}/Horde_Exception) <  3.0.0
 Requires:       php-pear(%{pear_channel}/Horde_Util) >= 2.0.0
-Conflicts:      php-pear(%{pear_channel}/Horde_Util) >= 3.0.0
+Requires:       php-pear(%{pear_channel}/Horde_Util) <  3.0.0
 # Optional but not yet available : php-pecl-xdiff
 
 Provides:       php-pear(%{pear_channel}/%{pear_name}) = %{version}
@@ -68,7 +77,7 @@ install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 src=$(pwd)/%{pear_name}-%{version}
 cd %{pear_name}-%{version}/test/$(echo %{pear_name} | sed -e s:_:/:g)
 phpunit \
-    -d include_path=$src/lib:.:%{pear_phpdir} \
+    --include-path=$src/lib \
     -d date.timezone=UTC \
     .
 
@@ -98,6 +107,9 @@ fi
 
 
 %changelog
+* Tue Jun 17 2014 Remi Collet <remi at fedoraproject.org> - 2.1.0-1
+- Update to 2.1.0
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index 2fba8b8..30e48c9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-58f5362c7b6a063d3ec00439ee7861f4  Horde_Text_Diff-2.0.2.tgz
+cfef473bdbe5b48d29b60068adc369d8  Horde_Text_Diff-2.1.0.tgz