From cbded5f3c91a34f52183351344421d1a30e9e377 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Aug 01 2015 06:14:09 +0000 Subject: v5.2.7 (cherry picked from commit 7e73f1bd7eccfd002bbb5e962e069ec87c54b0fc) --- diff --git a/.gitignore b/.gitignore index 66d7aa7..966654a 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ clog /horde-5.2.4.tgz /horde-5.2.5.tgz /horde-5.2.6.tgz +/horde-5.2.7.tgz diff --git a/php-horde-horde.spec b/php-horde-horde.spec index e48ea4f..2904d9d 100644 --- a/php-horde-horde.spec +++ b/php-horde-horde.spec @@ -14,7 +14,7 @@ %global with_sysjs 0 Name: php-horde-horde -Version: 5.2.6 +Version: 5.2.7 Release: 1%{?dist} Summary: Horde Application Framework @@ -89,7 +89,7 @@ Requires: php-pear(%{pear_channel}/Horde_Mime) >= 2.0.0 Requires: php-pear(%{pear_channel}/Horde_Mime) < 3.0.0 Requires: php-pear(%{pear_channel}/Horde_Nls) >= 2.0.0 Requires: php-pear(%{pear_channel}/Horde_Nls) < 3.0.0 -Requires: php-pear(%{pear_channel}/Horde_Perms) >= 2.0.0 +Requires: php-pear(%{pear_channel}/Horde_Perms) >= 2.1.5 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 @@ -148,11 +148,7 @@ Requires: php-spl Provides: php-pear(%{pear_channel}/%{pear_name}) = %{version} Provides: php-composer(horde/horde) = %{version} -%if 0%{?fedora} < 21 && 0%{?rhel} < 7 -Conflicts: horde < 5 -%else Obsoletes: horde < 5 -%endif Provides: horde = %{version} @@ -309,6 +305,10 @@ fi %changelog +* Sat Aug 01 2015 Remi Collet - 5.2.7-1 +- Update to 5.2.7 +- raise dependency on Horde_Perms 2.1.5 + * Thu Jun 18 2015 Remi Collet - 5.2.6-1 - Update to 5.2.6 diff --git a/sources b/sources index 8338567..5a1adcc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -717dd9939b4f628cfa9375c9a0199289 horde-5.2.6.tgz +4a0dcc30b4e75e8cd0e4d1a754ce5524 horde-5.2.7.tgz