[php-horde-Horde-Alarm/el6] update to 2.0.5

[Remi Collet]

commit fa4d8d31d36709ad892080bbfcb0c7a88eaf1deb
Author: Remi Collet <remi at fedoraproject.org>
Date:   Sun Jan 12 09:35:21 2014 +0100

    update to 2.0.5

 .gitignore                 |    3 +++
 php-horde-Horde-Alarm.spec |   43 ++++++++++++++++++++++---------------------
 sources                    |    2 +-
 3 files changed, 26 insertions(+), 22 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6b2f022..2f41943 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,5 @@
+clog
+php-horde-Horde-Alarm.spec~
 /Horde_Alarm-2.0.3.tgz
 /Horde_Alarm-2.0.4.tgz
+/Horde_Alarm-2.0.5.tgz
diff --git a/php-horde-Horde-Alarm.spec b/php-horde-Horde-Alarm.spec
index 9da0d7c..0cc3fc1 100644
--- a/php-horde-Horde-Alarm.spec
+++ b/php-horde-Horde-Alarm.spec
@@ -4,7 +4,7 @@
 %global pear_channel pear.horde.org
 
 Name:           php-horde-Horde-Alarm
-Version:        2.0.4
+Version:        2.0.5
 Release:        1%{?dist}
 Summary:        Horde Alarm Libraries
 
@@ -15,7 +15,7 @@ Source0:        http://%{pear_channel}/get/%{pear_name}-%{version}.tgz
 
 BuildArch:      noarch
 BuildRequires:  gettext
-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
@@ -24,32 +24,29 @@ BuildRequires:  php-pear(%{pear_channel}/Horde_Date) >= 2.0.0
 
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
-Requires:       php-common >= 5.3.0
+Requires:       php(language) >= 5.3.0
 Requires:       php-date
 Requires:       php-spl
-BuildRequires:  php-pear(PEAR) >= 1.7.0
+Requires:       php-pear(PEAR) >= 1.7.0
 Requires:       php-channel(%{pear_channel})
 Requires:       php-pear(%{pear_channel}/Horde_Date) >= 2.0.0
-Conflicts:      php-pear(%{pear_channel}/Horde_Date) >= 3.0.0
+Requires:       php-pear(%{pear_channel}/Horde_Date) <  3.0.0
 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
 # Optional
-#Requires:       php-pear(%{pear_channel}/Horde_Db) >= 2.0.0
-#Conflicts:      php-pear(%{pear_channel}/Horde_Db) >= 3.0.0
-Requires:       php-pear(%{pear_channel}/Horde_Log) >= 2.0.0
-Conflicts:      php-pear(%{pear_channel}/Horde_Log) >= 3.0.0
-#Requires:       php-pear(%{pear_channel}/Horde_Mail) >= 2.0.0
-#Conflicts:      php-pear(%{pear_channel}/Horde_Mail) >= 3.0.0
-#Requires:       php-pear(%{pear_channel}/Horde_Mime) >= 2.0.0
-#Conflicts:      php-pear(%{pear_channel}/Horde_Mime) >= 3.0.0
-#Requires:       php-pear(%{pear_channel}/Horde_Notification) >= 2.0.0
-#Conflicts:      php-pear(%{pear_channel}/Horde_Notification) >= 3.0.0
-#Requires:       php-pear(%{pear_channel}/Horde_Perms) >= 2.0.0
-#Conflicts:      php-pear(%{pear_channel}/Horde_Perms) >= 3.0.0
-#Requires:       php-pear(%{pear_channel}/Horde_Prefs) >= 2.0.0
-#Conflicts:      php-pear(%{pear_channel}/Horde_Prefs) >= 3.0.0
+Requires:       php-pear(%{pear_channel}/Horde_Db) >= 2.0.0
+Requires:       php-pear(%{pear_channel}/Horde_Db) <  3.0.0
+Requires:       php-pear(%{pear_channel}/Horde_Mail) >= 2.0.0
+Requires:       php-pear(%{pear_channel}/Horde_Mail) <  3.0.0
+Requires:       php-pear(%{pear_channel}/Horde_Notification) >= 2.0.0
+Requires:       php-pear(%{pear_channel}/Horde_Notification) <  3.0.0
+Requires:       php-pear(%{pear_channel}/Horde_Perms) >= 2.0.0
+Requires:       php-pear(%{pear_channel}/Horde_Perms) <  3.0.0
+Requires:       php-pear(%{pear_channel}/Horde_Prefs) >= 2.0.0
+Requires:       php-pear(%{pear_channel}/Horde_Prefs) <  3.0.0
+# Horde_Log, Horde_Mime optional and implicitly required
 
 Provides:       php-pear(%{pear_channel}/%{pear_name}) = %{version}
 
@@ -131,6 +128,10 @@ fi
 
 
 %changelog
+* Tue Oct 22 2013 Remi Collet <remi at fedoraproject.org> - 2.0.5-1
+- Update to 2.0.5
+- add optional dependencies
+
 * Wed Mar 06 2013 Remi Collet <remi at fedoraproject.org> - 2.0.4-1
 - Update to 2.0.4
 - temporary remove optional dependencies no yet available
diff --git a/sources b/sources
index b727b92..e03670e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-db74a01a4dc2f0c8b782216047bcf657  Horde_Alarm-2.0.4.tgz
+b3b0761c0463597a8672227430fc9ce5  Horde_Alarm-2.0.5.tgz