From d9b8db3715d62f32e86e7a2b8fd1814fbd164ca1 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 29 Jan 2013 20:42:24 +0100 Subject: php-horde-Horde-Editor: 2.0.2 --- php-horde-Horde-Editor.spec | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/php-horde-Horde-Editor.spec b/php-horde-Horde-Editor.spec index 246fd8a..d84beb5 100644 --- a/php-horde-Horde-Editor.spec +++ b/php-horde-Horde-Editor.spec @@ -4,8 +4,8 @@ %global pear_channel pear.horde.org Name: php-horde-Horde-Editor -Version: 2.0.1 -Release: 2%{?dist} +Version: 2.0.2 +Release: 1%{?dist} Summary: Horde Editor API Group: Development/Libraries @@ -13,10 +13,6 @@ License: LGPLv2 URL: http://pear.horde.org Source0: http://%{pear_channel}/get/%{pear_name}-%{version}.tgz -# Change path of ckeditor to a subdir of /js -# See http://bugs.horde.org/ticket/11950 -Patch0: %{pear_name}-path.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: php-common >= 5.3.0 @@ -50,13 +46,13 @@ embedding javascript RTE editors in a web page. %setup -q -c cd %{pear_name}-%{version} -# Don't install ckeditor, use system one -# Remove md5sum for patched file -%patch0 -p1 -b .path sed -e '/name="js/d' \ - -e '/Ckeditor.php/s/md5sum=.*name/name/' \ ../package.xml >%{name}.xml +if [ ! -d js/ckeditor ]; then + : Check js/ckeditor path + exit 1 +fi %build cd %{pear_name}-%{version} @@ -100,6 +96,10 @@ fi %changelog +* Tue Jan 29 2013 Remi Collet - 2.0.2-1 +- Update to 2.0.2 for remi repo +- drop merged patch for http://bugs.horde.org/ticket/11950 + * Thu Jan 24 2013 Remi Collet - 2.0.1-2 - use Alias for system JS -- cgit