From 5928c8d65301ab6f33188f79fdccbe3c5867546c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 30 Oct 2014 12:43:04 +0100 Subject: php-horde-Horde-Core: add upstream patch to avoid error on front page from an unconfigured block --- php-horde-Horde-Core.spec | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'php-horde-Horde-Core.spec') diff --git a/php-horde-Horde-Core.spec b/php-horde-Horde-Core.spec index c890d50..3bb5b26 100644 --- a/php-horde-Horde-Core.spec +++ b/php-horde-Horde-Core.spec @@ -14,7 +14,7 @@ Name: php-horde-Horde-Core Version: 2.15.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Horde Core Framework libraries Group: Development/Libraries @@ -22,6 +22,9 @@ 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 @@ -184,6 +187,8 @@ 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 @@ -192,6 +197,7 @@ 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 @@ -281,6 +287,10 @@ fi %changelog +* Thu Oct 30 2014 Remi Collet - 2.15.0-2 +- add upstream patch to avoid error on front page from + an unconfigured block + * Sun Oct 12 2014 Remi Collet - 2.15.0-1 - Update to 2.15.0 -- cgit