[php-horde-Horde-Editor/f20] use bundled ckeditor
Remi Collet
remi at fedoraproject.org
Wed Jul 23 13:17:33 UTC 2014
commit e57dce5285b108258dcb3cac55d54d2ba45be512
Author: Remi Collet <remi at fedoraproject.org>
Date: Wed Jul 23 15:17:24 2014 +0200
use bundled ckeditor
php-horde-Horde-Editor.spec | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/php-horde-Horde-Editor.spec b/php-horde-Horde-Editor.spec
index 998a826..a668540 100644
--- a/php-horde-Horde-Editor.spec
+++ b/php-horde-Horde-Editor.spec
@@ -11,10 +11,11 @@
%{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
%global pear_name Horde_Editor
%global pear_channel pear.horde.org
+%global sysckeditor 0
Name: php-horde-Horde-Editor
Version: 2.0.4
-Release: 1%{?dist}
+Release: 3%{?dist}
Summary: Horde Editor API
Group: Development/Libraries
@@ -30,7 +31,11 @@ BuildRequires: php-pear(%{pear_channel}/Horde_Role) >= 1.0.0
Requires(post): %{__pear}
Requires(postun): %{__pear}
+%if %{sysckeditor}
Requires: ckeditor
+%else
+Provides: horde-ckeditor
+%endif
Requires: php(language) >= 5.3.0
Requires: php-pear(PEAR) >= 1.7.0
Requires: php-channel(%{pear_channel})
@@ -54,6 +59,7 @@ embedding javascript RTE editors in a web page.
%setup -q -c
cd %{pear_name}-%{version}
+%if %{sysckeditor}
sed -e '/name="js/d' \
../package.xml >%{name}.xml
@@ -61,6 +67,10 @@ if [ ! -d js/ckeditor ]; then
: Check js/ckeditor path
exit 1
fi
+%else
+mv ../package.xml %{name}.xml
+%endif
+
%build
cd %{pear_name}-%{version}
@@ -100,9 +110,16 @@ fi
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/Horde/Editor
%{pear_phpdir}/Horde/Editor.php
+%if ! %{sysckeditor}
+%dir %{pear_hordedir}/js
+%{pear_hordedir}/js/ckeditor
+%endif
%changelog
+* Wed Jul 23 2014 Remi Collet <remi at fedoraproject.org> - 2.0.4-3
+- use bundled ckeditor
+
* Tue Mar 04 2014 Remi Collet <remi at fedoraproject.org> - 2.0.4-1
- Update to 2.0.4
More information about the scm-commits
mailing list