[php-horde-Horde-Argv/epel7] fix merge

[Remi Collet]

commit 682d882abd673fd7e4c1d31d92f792bb159f195f
Author: Remi Collet <remi at fedoraproject.org>
Date:   Sat Apr 5 07:20:32 2014 +0200

    fix merge

 .gitignore                |    1 +
 php-horde-Horde-Argv.spec |   26 +++++++++++++++++++-------
 sources                   |    2 +-
 3 files changed, 21 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c17a72c..b0c1c95 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /Horde_Argv-2.0.4.tgz
 /Horde_Argv-2.0.5.tgz
 /Horde_Argv-2.0.7.tgz
+/Horde_Argv-2.0.8.tgz
diff --git a/php-horde-Horde-Argv.spec b/php-horde-Horde-Argv.spec
index ef46bf6..f078468 100644
--- a/php-horde-Horde-Argv.spec
+++ b/php-horde-Horde-Argv.spec
@@ -1,10 +1,19 @@
+# spec file for php-horde-Horde-Argv
+#
+# 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_Argv
 %global pear_channel pear.horde.org
 
 Name:           php-horde-Horde-Argv
-Version:        2.0.7
+Version:        2.0.8
 Release:        1%{?dist}
 Summary:        Horde command-line argument parsing package
 
@@ -29,9 +38,9 @@ Requires:       php-spl
 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_Translation) >= 2.0.0
-Conflicts:      php-pear(%{pear_channel}/Horde_Translation) >= 3.0.0
+Requires:       php-pear(%{pear_channel}/Horde_Translation) <  3.0.0
 
 Provides:       php-pear(%{pear_channel}/%{pear_name}) = %{version}
 
@@ -84,7 +93,7 @@ done | tee ../%{pear_name}.lang
 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 \
     .
 
@@ -110,16 +119,19 @@ fi
 
 
 %changelog
+* Fri Apr 04 2014 Remi Collet <remi at fedoraproject.org> - 2.0.8-1
+- Update to 2.0.8
+
 * Thu Apr 04 2013 Remi Collet <remi at fedoraproject.org> - 2.0.7-1
 - Update to 2.0.7
 
 * Wed Mar 06 2013 Remi Collet <remi at fedoraproject.org> - 2.0.5-1
 - Update to 2.0.5
 
-* Wed Feb 6 2013 Nick Bebout <nb at fedoraproject.org> - 2.0.4-4
+* Wed Feb  6 2013 Nick Bebout <nb at fedoraproject.org> - 2.0.4-4
 - Update for review
 
-* Tue Feb 5 2013 Nick Bebout <nb at fedoraproject.org> - 2.0.4-3
+* Tue Feb  5 2013 Nick Bebout <nb at fedoraproject.org> - 2.0.4-3
 - Use php-common instead of php(language), remove BuildRoot
 
 * Wed Jan 30 2013 Remi Collet <remi at fedoraproject.org> - 2.0.4-2
diff --git a/sources b/sources
index b728045..a747478 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e8925eb7daa042fc0b19383e8ecc2233  Horde_Argv-2.0.7.tgz
+94d241edf27149c1c2e323e92f2beb10  Horde_Argv-2.0.8.tgz