From ba9552e43d1d0128f8e86bd8e0f21fbc19c82213 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Feb 05 2013 17:03:00 +0000
Subject: - update to 3.6.6

- move _samples in doc
- don't package _source
- move php library to /usr/share/php
- fix httpd configuration (grant access) #894567

---

diff --git a/.gitignore b/.gitignore
index f99e124..7aa8b06 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /ckeditor_3.6.2.tar.gz
 /ckeditor_3.6.3.tar.gz
 /ckeditor_3.6.4.tar.gz
+/ckeditor_3.6.6.tar.gz
diff --git a/ckeditor.conf b/ckeditor.conf
index eb90005..f531b49 100644
--- a/ckeditor.conf
+++ b/ckeditor.conf
@@ -1 +1,13 @@
 Alias /ckeditor /usr/share/ckeditor
+
+<Directory /usr/share/ckeditor>
+    <IfModule mod_authz_core.c>
+        # Apache 2.4
+       Require all granted
+    </IfModule>
+    <IfModule !mod_authz_core.c>
+        # Apache 2.2
+        Order deny,allow
+        Allow from all
+    </IfModule>
+</Directory>
diff --git a/ckeditor.spec b/ckeditor.spec
index 2291968..794c8a5 100644
--- a/ckeditor.spec
+++ b/ckeditor.spec
@@ -1,5 +1,5 @@
 Name:		ckeditor
-Version:	3.6.4
+Version:	3.6.6
 Release:	1%{?dist}
 Summary:	WYSIWYG text editor to be used inside web pages
 
@@ -8,10 +8,13 @@ License:	GPLv2+ or LGPLv2+ or MPLv1.1+
 URL:		http://ckeditor.com/
 Source0:	http://download.cksource.com/CKEditor/CKEditor/CKEditor%20%{version}/ckeditor_%{version}.tar.gz
 Source1:	%{name}.conf
+
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:	noarch
 
 Requires:	httpd
+Requires:	php-common
+
 
 %description
 CKEditor is a text editor to be used inside web pages. It's a WYSIWYG editor,
@@ -22,32 +25,65 @@ OpenOffice.
 
 
 %prep
-%setup -q -n %{name}
+%setup -q -c
+
+# uneeded files
+rm  -f %{name}/.htaccess
+rm  -f %{name}/INSTALL.html
+rm -rf %{name}/_source
+
+# documentation
+mkdir doc
+mv %{name}/{CHANGES,LICENSE}.html doc/
+mv %{name}/_samples doc/
+
+# fix library path in provided samples
+sed -e 's:src="../ckeditor.js":src="/ckeditor/ckeditor.js":' \
+    -i doc/_samples/*.html
+
+# PHP Library
+mkdir php
+mv %{name}/*php php/
 
 
 %build
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
-cp -rp * $RPM_BUILD_ROOT%{_datadir}/%{name}
-chmod +x $RPM_BUILD_ROOT%{_datadir}/%{name}/_samples/adobeair/run.sh
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d
-install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d
+rm -rf %{buildroot}
+
+# PHP
+mkdir -p %{buildroot}%{_datadir}/php/%{name}
+cp -p php/ckeditor_php5.php %{buildroot}%{_datadir}/php/%{name}/ckeditor.php
+
+# Javascript
+cp -rp %{name} %{buildroot}%{_datadir}/%{name}
+
+# Apache
+mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d
+install -p -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d
+
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGES.html INSTALL.html LICENSE.html
+%doc doc/*
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
 %{_datadir}/%{name}
+%{_datadir}/php/%{name}
 
 
 %changelog
+* Tue Feb  5 2013 Remi Collet <remi@fedoraproject.org> - 3.6.6-1
+- update to 3.6.6
+- move _samples in doc
+- don't package _source
+- move php library to /usr/share/php
+- fix httpd configuration (grant access) #894567
+
 * Fri Sep 14 2012 Orion Poplawski <orion@cora.nwra.com> 3.6.4-1
 - Update to 3.6.4
 
@@ -63,8 +99,8 @@ rm -rf $RPM_BUILD_ROOT
 * Tue Oct 25 2011 Orion Poplawski <orion@cora.nwra.com> 3.6.2-1
 - Update to 3.6.2
 
-* Wed Aug 3 2011 Orion Poplawski <orion@cora.nwra.com> 3.6.1-1
+* Wed Aug  3 2011 Orion Poplawski <orion@cora.nwra.com> 3.6.1-1
 - Update to 3.6.1
 
-* Wed Oct 6 2010 Orion Poplawski <orion@cora.nwra.com> 3.4.1-1
+* Wed Oct  6 2010 Orion Poplawski <orion@cora.nwra.com> 3.4.1-1
 - Initial package
diff --git a/sources b/sources
index 88b1910..ccdb08a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e6e0c6f5e5e5dbc6e7df106608c22838  ckeditor_3.6.4.tar.gz
+fa9381e35282e9d89783dfdddb6dccac  ckeditor_3.6.6.tar.gz