[php-horde-horde/f20] - Update to 5.2.0 - raise dep on Horde_Alarm, Horde_Autoloader, Horde_Core and Horde_Service_Weather

[Remi Collet]

commit 560201548a57e1a1eede44826581689ad86b1f91
Author: Remi Collet <remi at fedoraproject.org>
Date:   Wed Jul 23 15:34:22 2014 +0200

    - Update to 5.2.0
    - raise dep on Horde_Alarm, Horde_Autoloader, Horde_Core and Horde_Service_Weather
    - use bundled ckeditor
    - add optional dep on Horde_OpenXchange
    
    (cherry picked from commit 256f4b150e28bb6011bcee032506e071daf6f39c)

 .gitignore           |    1 +
 php-horde-horde.spec |   29 +++++++++++++++++++++++------
 sources              |    2 +-
 3 files changed, 25 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 29bfa44..770430a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /horde-5.1.6.tgz
 /horde-5.1.7.tgz
+/horde-5.2.0.tgz
diff --git a/php-horde-horde.spec b/php-horde-horde.spec
index 90e84c8..d1ab933 100644
--- a/php-horde-horde.spec
+++ b/php-horde-horde.spec
@@ -10,9 +10,10 @@
 %{!?__pear:       %global __pear       %{_bindir}/pear}
 %global pear_name    horde
 %global pear_channel pear.horde.org
+%global sysckeditor  0
 
 Name:           php-horde-horde
-Version:        5.1.7
+Version:        5.2.0
 Release:        1%{?dist}
 Summary:        Horde Application Framework
 
@@ -37,7 +38,11 @@ Requires:       httpd
 Requires:       prototype-httpd
 Requires:       scriptaculous-httpd
 Requires:       syntaxhighlighter-httpd
+%if %{sysckeditor}
 Requires:       ckeditor
+%else
+Requires:       horde-ckeditor
+%endif
 # PHP stuff, from package.xml
 Requires:       php(language) >= 5.3.0
 Requires:       php-filter
@@ -46,17 +51,17 @@ Requires:       php-hash
 Requires:       php-pear(PEAR) >= 1.7.0
 Requires:       php-channel(%{pear_channel})
 Requires:       php-pear(%{pear_channel}/Horde_Role) >= 1.0.0
-Requires:       php-pear(%{pear_channel}/Horde_Alarm) >= 2.0.0
+Requires:       php-pear(%{pear_channel}/Horde_Alarm) >= 2.1.0
 Requires:       php-pear(%{pear_channel}/Horde_Alarm) <  3.0.0
 Requires:       php-pear(%{pear_channel}/Horde_Argv) >= 2.0.0
 Requires:       php-pear(%{pear_channel}/Horde_Argv) <  3.0.0
 Requires:       php-pear(%{pear_channel}/Horde_Auth) >= 2.0.0
 Requires:       php-pear(%{pear_channel}/Horde_Auth) <  3.0.0
-Requires:       php-pear(%{pear_channel}/Horde_Autoloader) >= 2.0.0
+Requires:       php-pear(%{pear_channel}/Horde_Autoloader) >= 2.1.0
 Requires:       php-pear(%{pear_channel}/Horde_Autoloader) <  3.0.0
 Requires:       php-pear(%{pear_channel}/Horde_Browser) >= 2.0.0
 Requires:       php-pear(%{pear_channel}/Horde_Browser) <  3.0.0
-Requires:       php-pear(%{pear_channel}/Horde_Core) >= 2.11.0
+Requires:       php-pear(%{pear_channel}/Horde_Core) >= 2.12.0
 Requires:       php-pear(%{pear_channel}/Horde_Core) <  3.0.0
 Requires:       php-pear(%{pear_channel}/Horde_Date) >= 2.0.0
 Requires:       php-pear(%{pear_channel}/Horde_Date) <  3.0.0
@@ -113,7 +118,9 @@ Requires:       php-pear(Net_DNS2)
 Requires:       php-pear(Services_Weather)
 Requires:       php-pear(%{pear_channel}/Horde_Feed) >= 2.0.0
 Requires:       php-pear(%{pear_channel}/Horde_Feed) <  3.0.0
-Requires:       php-pear(%{pear_channel}/Horde_Service_Weather) >= 2.0.0
+Requires:       php-pear(%{pear_channel}/Horde_OpenXchange) >= 1.0.0
+Requires:       php-pear(%{pear_channel}/Horde_OpenXchange) <  2.0.0
+Requires:       php-pear(%{pear_channel}/Horde_Service_Weather) >= 2.1.0
 Requires:       php-pear(%{pear_channel}/Horde_Service_Weather) <  3.0.0
 # Optional but implicitly required
 #               Horde_Db, Horde_Oauth, Horde_SyncMl
@@ -193,7 +200,10 @@ ln -s %{_sysconfdir}/horde %{buildroot}%{pear_hordedir}/config
 cp %{buildroot}%{_sysconfdir}/horde/conf.php.dist \
    %{buildroot}%{_sysconfdir}/horde/conf.php
 
-install -D -p -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/httpd/conf.d/%{name}.conf
+install -Dpm 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/httpd/conf.d/%{name}.conf
+%if ! %{sysckeditor}
+sed -e '/ckeditor/d'      -i %{buildroot}%{_sysconfdir}/httpd/conf.d/%{name}.conf
+%endif
 
 # Locales
 for loc in locale/{??,??_??}
@@ -244,6 +254,13 @@ fi
 
 
 %changelog
+* Tue Jul 23 2014 Remi Collet <remi at fedoraproject.org> - 5.2.0-1
+- Update to 5.2.0
+- raise dep on Horde_Alarm, Horde_Autoloader, Horde_Core
+  and Horde_Service_Weather
+- use bundled ckeditor
+- add optional dep on Horde_OpenXchange
+
 * Mon Jul 07 2014 Remi Collet <remi at fedoraproject.org> - 5.1.7-1
 - Update to 5.1.7
 
diff --git a/sources b/sources
index 137bcb4..d5112bf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3d3f3d314307a4b6457d641d62b6ccb9  horde-5.1.7.tgz
+50d75178f79310efa3ef6b37157e9482  horde-5.2.0.tgz