[ckeditor] - Update to 4.1 - provided ckeditor_basic.js for compatibility with 3.6 - don't provide default alia
Remi Collet
remi at fedoraproject.org
Sun Apr 7 06:23:47 UTC 2013
commit 177523830d34e170deffb7bb08294c8901ee9c51
Author: Remi Collet <remi at fedoraproject.org>
Date: Sun Apr 7 08:23:32 2013 +0200
- Update to 4.1
- provided ckeditor_basic.js for compatibility with 3.6
- don't provide default alias, #910590
.gitignore | 1 +
ckeditor.conf | 5 ++++-
ckeditor.spec | 11 ++++++++++-
sources | 2 +-
4 files changed, 16 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c72db18..239c91e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/ckeditor_3.6.4.tar.gz
/ckeditor_3.6.6.tar.gz
/ckeditor_4.0.2_standard.tar.gz
+/ckeditor_4.1_standard.tar.gz
diff --git a/ckeditor.conf b/ckeditor.conf
index f531b49..3feace3 100644
--- a/ckeditor.conf
+++ b/ckeditor.conf
@@ -1,4 +1,7 @@
-Alias /ckeditor /usr/share/ckeditor
+# Uncomment this if you need ckeditor to live at the root of your webserver
+# NOTE: This is needed by provided examples
+# This is not needed for drupal-ckeditor and may break it
+#Alias /ckeditor /usr/share/ckeditor
<Directory /usr/share/ckeditor>
<IfModule mod_authz_core.c>
diff --git a/ckeditor.spec b/ckeditor.spec
index 87b259f..9bb9310 100644
--- a/ckeditor.spec
+++ b/ckeditor.spec
@@ -1,5 +1,5 @@
Name: ckeditor
-Version: 4.0.2
+Version: 4.1
Release: 1%{?dist}
Summary: WYSIWYG text editor to be used inside web pages
@@ -35,6 +35,7 @@ mv %{name}/samples doc/
sed -e 's:src="../ckeditor.js":src="/ckeditor/ckeditor.js":' \
-i doc/samples/*.html
+
%build
@@ -45,6 +46,9 @@ rm -rf %{buildroot}
mkdir -p %{buildroot}%{_datadir}
cp -rp %{name} %{buildroot}%{_datadir}/
+# Hack for compatibility with 3.6 (used by horde)
+ln -s ckeditor.js %{buildroot}%{_datadir}/ckeditor/ckeditor_basic.js
+
# Apache
mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d
install -p -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d
@@ -62,6 +66,11 @@ rm -rf %{buildroot}
%changelog
+* Sun Apr 7 2013 Remi Collet <remi at fedoraproject.org> - 4.1-1
+- Update to 4.1
+- provided ckeditor_basic.js for compatibility with 3.6
+- don't provide default alias, #910590
+
* Tue Mar 19 2013 Orion Poplawski <orion at cora.nwra.com> 4.0.2-1
- Update to 4.0.2
diff --git a/sources b/sources
index d506bfd..b468150 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ce550af120ab5939663b946cb97a5d23 ckeditor_4.0.2_standard.tar.gz
+246593a0e337edafd0ad621ebf7957d2 ckeditor_4.1_standard.tar.gz
More information about the scm-commits
mailing list