From 544ae0025431c7c31b77b79b582b134a420df105 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Wed, 5 Nov 2014 10:47:56 +0100
Subject: php-horde-Horde-Core: 2.16.0

---
 Horde_Core-upstream.patch | 27 ---------------------------
 php-horde-Horde-Core.spec | 13 +++++--------
 2 files changed, 5 insertions(+), 35 deletions(-)
 delete mode 100644 Horde_Core-upstream.patch

diff --git a/Horde_Core-upstream.patch b/Horde_Core-upstream.patch
deleted file mode 100644
index 5cc5fac..0000000
--- a/Horde_Core-upstream.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 1ee4e8b255c80e7baab6072c29e5705820d8d5d4 Mon Sep 17 00:00:00 2001
-From: Michael M Slusarz <slusarz@horde.org>
-Date: Wed, 15 Oct 2014 13:41:27 -0600
-Subject: [PATCH] Hotfix: certain blocks (weather) don't throw Exceptions on
- error
-
-They set enabled to false.  Not sure how this is supposed to be fixed
-properly, but this prevents fatal errors
----
- framework/Core/lib/Horde/Core/Block/Layout/View.php | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/framework/Core/lib/Horde/Core/Block/Layout/View.php b/framework/Core/lib/Horde/Core/Block/Layout/View.php
-index eeaf551..4e92c98 100644
---- a/framework/Core/lib/Horde/Core/Block/Layout/View.php
-+++ b/framework/Core/lib/Horde/Core/Block/Layout/View.php
-@@ -79,6 +79,10 @@ public function toHtml()
-                     $rowspan = $colspan = 1;
-                     try {
-                         $block = $bc->getBlock($item['app'], $item['params']['type2'], $item['params']['params']);
-+
-+                        if (!$block->enabled) {
-+                            throw new Horde_Exception('Block not enabled.');
-+                        }
-                         $rowspan = $item['height'];
-                         $colspan = $item['width'];
-                         for ($i = 0; $i < $item['height']; $i++) {
diff --git a/php-horde-Horde-Core.spec b/php-horde-Horde-Core.spec
index 3bb5b26..f54ba40 100644
--- a/php-horde-Horde-Core.spec
+++ b/php-horde-Horde-Core.spec
@@ -13,8 +13,8 @@
 %global with_sysjs   0
 
 Name:           php-horde-Horde-Core
-Version:        2.15.0
-Release:        2%{?dist}
+Version:        2.16.0
+Release:        1%{?dist}
 Summary:        Horde Core Framework libraries
 
 Group:          Development/Libraries
@@ -22,9 +22,6 @@ License:        LGPLv2
 URL:            http://pear.horde.org
 Source0:        http://%{pear_channel}/get/%{pear_name}-%{version}.tgz
 
-# Upstream patch
-Patch0:         %{pear_name}-upstream.patch
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  gettext
@@ -187,8 +184,6 @@ Framework.
 %setup -q -c
 cd %{pear_name}-%{version}
 
-%patch0 -p3 -b .upstream
-
 # Don't install .po and .pot files
 # Don't install prototype, scriptaculous, use system one
 # Remove checksum for .mo, as we regenerate them
@@ -197,7 +192,6 @@ sed -e '/%{pear_name}\.po/d' \
     -e '/js\/prototype.js/d' \
     -e '/js\/scriptaculous/d' \
 %endif
-    -e '/View.php/s/md5sum=.*name=/name=/' \
     -e '/%{pear_name}.mo/s/md5sum=.*name=/name=/' \
     ../package.xml >%{name}.xml
 touch -r ../package.xml %{name}.xml
@@ -287,6 +281,9 @@ fi
 
 
 %changelog
+* Wed Nov 05 2014 Remi Collet <remi@fedoraproject.org> - 2.16.0-1
+- Update to 2.16.0
+
 * Thu Oct 30 2014 Remi Collet <remi@fedoraproject.org> - 2.15.0-2
 - add upstream patch to avoid error on front page from
   an unconfigured block
-- 
cgit