From c2e896263c4645e14ee97ea1c81426d30ddabb58 Mon Sep 17 00:00:00 2001
From: Shawn Iwinski <shawn@iwin.ski>
Date: Mar 06 2017 13:24:48 +0000
Subject: Update to 4.6.2 (RHBZ #1070102, RHBZ #1295348)


- CVE-2014-5191 (RHBZ #1139487)
- Update spec to use web assets packaging guidelines

---

diff --git a/.gitignore b/.gitignore
index ddb1ac1..006f6bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /ckeditor_4.1_standard.tar.gz
 /ckeditor_4.2_standard.tar.gz
 /ckeditor_4.3.2_standard.tar.gz
+/ckeditor_4.6.2_standard.tar.gz
diff --git a/ckeditor.spec b/ckeditor.spec
index 9346719..6ed07d3 100644
--- a/ckeditor.spec
+++ b/ckeditor.spec
@@ -1,18 +1,18 @@
-Name:		ckeditor
-Version:	4.3.2
-Release:	5%{?dist}
-Summary:	WYSIWYG text editor to be used inside web pages
+Name:          ckeditor
+Version:       4.6.2
+Release:       1%{?dist}
+Summary:       WYSIWYG text editor to be used inside web pages
 
-Group:		Applications/Internet
-License:	GPLv2+ or LGPLv2+ or MPLv1.1+
-URL:		http://ckeditor.com/
-Source0:	http://download.cksource.com/CKEditor/CKEditor/CKEditor%20%{version}/ckeditor_%{version}_standard.tar.gz
-Source1:	%{name}.conf
+Group:         Applications/Internet
+License:       GPLv2+ or LGPLv2+ or MPLv1.1+
+URL:           http://ckeditor.com/
 
-BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-BuildArch:	noarch
+Source0:       http://download.cksource.com/CKEditor/CKEditor/CKEditor%20%{version}/ckeditor_%{version}_standard.tar.gz
 
-Requires:	httpd
+BuildArch:     noarch
+BuildRequires: web-assets-devel
+
+Requires:      web-assets-filesystem
 
 
 %description
@@ -24,59 +24,90 @@ OpenOffice.
 
 
 %package samples
-Summary:        Sample files for %{name}
-Group:          Documentation
+Summary:  Samples for %{name}
+Requires: %{name} = %{version}-%{release}
 
 %description samples
 %{summary}.
 
 
 %prep
-%setup -q -c
-
-# documentation
-mv %{name}/*.md .
-mv %{name}/samples .
+%setup -qn %{name}
 
-# Delete bundled flash files
-rm -r samples/plugins/htmlwriter/{assets,outputforflash.html}
+: Licenses
+mkdir -p .rpm/{licenses,docs}
+for LICENSE_FILE in $(find . -type f -name 'LICENSE*')
+do
+    DIR=$(dirname $LICENSE_FILE)
+    mkdir -p .rpm/licenses/$DIR
+    mv $LICENSE_FILE .rpm/licenses/$DIR/
+done
 
-# fix library path in provided samples
-find samples -name \*.html |
-  xargs sed -i -e 's:src="\(../\)*ckeditor.js":src="/ckeditor/ckeditor.js":'
+: Docs
+for DOC_FILE in $(find . -type f -name '*.md')
+do
+    DIR=$(dirname $DOC_FILE)
+    mkdir -p .rpm/docs/$DIR
+    mv $DOC_FILE .rpm/docs/$DIR/
+done
 
+: wrong-file-end-of-line-encoding
+find .rpm -type f -print0 | xargs -0 sed -i 's/\r$//'
 
-%install
-rm -rf %{buildroot}
-
-# Javascript
-mkdir -p %{buildroot}%{_datadir}
-cp -rp %{name} %{buildroot}%{_datadir}/
+: Delete bundled flash files
+rm -rf samples/old/htmlwriter/{assets,outputforflash.html}
 
-# 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
+%build
+# Empty build section, nothing to build
 
 
-%clean
-rm -rf %{buildroot}
+%install
+mkdir -p %{buildroot}%{_webassetdir}/%{name}
+cp -pr * %{buildroot}%{_webassetdir}/%{name}/
+
+: Compat filesystem
+mkdir -p %{buildroot}/%{_datadir}
+ln -s %{_webassetdir}/%{name} %{buildroot}/%{_datadir}/%{name}
+
+
+# https://fedoraproject.org/wiki/Packaging:Directory_Replacement#Scriptlet_to_replace_a_directory
+%pretrans -p <lua>
+path = "%{_datadir}/%{name}"
+st = posix.stat(path)
+if st and st.type == "directory" then
+  status = os.rename(path, path .. ".rpmmoved")
+  if not status then
+    suffix = 0
+    while not status do
+      suffix = suffix + 1
+      status = os.rename(path .. ".rpmmoved", path .. ".rpmmoved." .. suffix)
+    end
+    os.rename(path, path .. ".rpmmoved")
+  end
+end
 
 
 %files
-%doc *.md
-%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
+%{!?_licensedir:%global license %%doc}
+%license .rpm/licenses/*
+%doc .rpm/docs/*
+%{_webassetdir}/%{name}
 %{_datadir}/%{name}
+%exclude %{_webassetdir}/%{name}/samples
+
+%ghost %{_datadir}/%{name}.rpmmoved
+
 
 %files samples
-%doc LICENSE.md samples/*
+%{_webassetdir}/%{name}/samples
 
 
 %changelog
-* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.3.2-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+* Mon Mar 06 2017 Shawn Iwinski <shawn@iwin.ski> - 4.6.2-1
+- Update to 4.6.2 (RHBZ #1070102, RHBZ #1295348)
+- CVE-2014-5191 (RHBZ #1139487)
+- Update spec to use web assets packaging guidelines
 
 * Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 4.3.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
diff --git a/sources b/sources
index eab9185..134c0f8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b3ddfade162c05236697dec47484dfa3  ckeditor_4.3.2_standard.tar.gz
+SHA512 (ckeditor_4.6.2_standard.tar.gz) = 16aa49608e2cdad0a8e5437eb0a3da6e4b0f7e4c93b97b792e6942fe47805895d79e78acb69627767aac3a8b48c7f359ad718aec14b9ba24b1f893389c33daff