diff options
| author | Remi Collet <fedora@famillecollet.com> | 2013-04-07 08:26:28 +0200 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2013-04-07 08:26:28 +0200 |
| commit | d114ae2f826608ade396429316f43b69742fb057 (patch) | |
| tree | c448680d99a53b8403b6c387b937cd99a2f39f42 | |
| parent | 142a3fb309b8c5b2ce35a5d837a355bc0c0e2ed6 (diff) | |
ckeditor: don't provide default alias, #910590
| -rw-r--r-- | ckeditor.conf | 6 | ||||
| -rw-r--r-- | ckeditor.spec | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/ckeditor.conf b/ckeditor.conf index 748db3e..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> @@ -11,4 +14,3 @@ Alias /ckeditor /usr/share/ckeditor Allow from all </IfModule> </Directory> - diff --git a/ckeditor.spec b/ckeditor.spec index 2b71de5..f5aaead 100644 --- a/ckeditor.spec +++ b/ckeditor.spec @@ -43,7 +43,6 @@ sed -e 's:src="../ckeditor.js":src="/ckeditor/ckeditor.js":' \ %install rm -rf %{buildroot} - # Javascript mkdir -p %{buildroot}%{_datadir} cp -rp %{name} %{buildroot}%{_datadir}/ @@ -70,7 +69,8 @@ rm -rf %{buildroot} %changelog * Sun Apr 7 2013 Remi Collet <remi@fedoraproject.org> - 4.1-1 - Update to 4.1 -- provided ckeditor_basic for compatibility +- provided ckeditor_basic.js for compatibility with 3.6 +- don't provide default alias, #910590 * Tue Mar 19 2013 Orion Poplawski <orion@cora.nwra.com> 4.0.2-1 - Update to 4.0.2 |