[tinymce] new release 3.5.10, partial web asset guideline compliance

Adam Williamson adamwill at fedoraproject.org
Wed Jan 15 07:01:14 UTC 2014


commit aefa6d07734483e5c7b9c3d6e4ccf7d107773330
Author: Adam Williamson <awilliam at redhat.com>
Date:   Tue Jan 14 23:00:58 2014 -0800

    new release 3.5.10, partial web asset guideline compliance

 .gitignore   |    1 +
 sources      |    2 +-
 tinymce.spec |   58 +++++++++++++++++++++++++++++-----------------------------
 3 files changed, 31 insertions(+), 30 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 479293e..74eee3e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /tinymce_3.5.8.zip
 /tinymce_3.5.9.zip
+/tinymce_3.5.10.zip
diff --git a/sources b/sources
index cb07b9e..ce18d3a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f84ee9b528d2cf73c722957a072b1ef1  tinymce_3.5.9.zip
+5d73bdf39552fe64c52df2cff12d2001  tinymce_3.5.10.zip
diff --git a/tinymce.spec b/tinymce.spec
index d5bf04e..4829393 100644
--- a/tinymce.spec
+++ b/tinymce.spec
@@ -1,12 +1,14 @@
-Summary:	Web based Javascript HTML WYSIWYG editor control
-Name:		tinymce
-Version:	3.5.9
-Release:	1%{?dist}
-Group:		Applications/Publishing
-License:	LGPLv2+
-URL:		http://tinymce.moxiecode.com
-
-Source0:	http://download.moxiecode.com/tinymce/%{name}_%{version}.zip
+Summary:  Web based Javascript HTML WYSIWYG editor control
+Name:     tinymce
+Version:  3.5.10
+Release:  1%{?dist}
+Group:    Applications/Publishing
+License:  LGPLv2+
+URL:      http://tinymce.moxiecode.com
+Source0:  http://download.moxiecode.com/tinymce/%{name}_%{version}.zip
+
+BuildRequires:  web-assets-devel
+Requires:       web-assets-filesystem
 # This disables the use of the moxieplayer.swf Flash video wrapper,
 # which we don't ship as it's provided as a binary blob. Just removing
 # the blob causes tinymce to keep generating HTML which wants to use
@@ -14,8 +16,8 @@ Source0:	http://download.moxiecode.com/tinymce/%{name}_%{version}.zip
 # nice clean HTML5 instead. This changes
 # 'p.getParam("flash_video_player_url",u.convertUrl(u.url+"/moxieplayer.swf"))'
 # to 'false'
-Patch0:		tinymce-3.5.8-no_moxieplayer.patch
-BuildArch:	noarch
+Patch0:         tinymce-3.5.8-no_moxieplayer.patch
+BuildArch:      noarch
 
 %description
 TinyMCE is a platform independent web based Javascript HTML WYSIWYG
@@ -51,36 +53,34 @@ done
 # so, nothing has to be compiled
 
 
+
 %install
-mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}
-cp -pr * ${RPM_BUILD_ROOT}%{_datadir}/%{name}
+mkdir -p ${RPM_BUILD_ROOT}%{_jsdir}
+cp -pr jscripts/tiny_mce ${RPM_BUILD_ROOT}%{_jsdir}
+# Included as a doc
+rm -f ${RPM_BUILD_ROOT}%{_jsdir}/tiny_mce/license.txt
 # Remove unnecessary src *.js files
 find ${RPM_BUILD_ROOT} -name '*_src.js' | xargs rm
 # Remove empty files to make rpmlint happy
 find ${RPM_BUILD_ROOT} -empty -exec rm -f {} \;
 # Set the appropriate permissions, since unzip doesn't
-chmod -R 755 ${RPM_BUILD_ROOT}%{_datadir}/%{name}
-find ${RPM_BUILD_ROOT}%{_datadir}/%{name} -type f | xargs chmod 644
-# These are docs, remove them from here, docify them later
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/%{name}/{changelog.txt,jscripts/tiny_mce/license.txt}
+chmod -R 755 ${RPM_BUILD_ROOT}%{_jsdir}/tiny_mce
+find ${RPM_BUILD_ROOT}%{_jsdir}/tiny_mce -type f | xargs chmod 644
 # Remove spellchecker plugin, we have separate package for that
-rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}/jscripts/tiny_mce/plugins/spellchecker
+rm -rf ${RPM_BUILD_ROOT}%{_jsdir}/tiny_mce/plugins/spellchecker
 
 %files
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/examples
-%doc changelog.txt
-%dir %{_datadir}/%{name}/jscripts
-%dir %{_datadir}/%{name}/jscripts/tiny_mce
-%{_datadir}/%{name}/jscripts/tiny_mce/langs
-%{_datadir}/%{name}/jscripts/tiny_mce/themes
-%{_datadir}/%{name}/jscripts/tiny_mce/utils
-%{_datadir}/%{name}/jscripts/tiny_mce/*.js
-%doc jscripts/tiny_mce/license.txt
-%{_datadir}/%{name}/jscripts/tiny_mce/plugins
+%doc changelog.txt jscripts/tiny_mce/license.txt examples/
+%{_jsdir}/tiny_mce
 
 
 %changelog
+* Tue Jan 14 2014 Adam Williamson <awilliam at redhat.com> - 3.5.10-1
+- oh look, there's an even newer upstream release
+
+* Tue Jan 14 2014 Adam Williamson <awilliam at redhat.com> - 3.5.9-2
+- web asset compliance: install to %_jsdir/
+
 * Tue Jan 14 2014 Adam Williamson <awilliam at redhat.com> - 3.5.9-1
 - new upstream release
 


More information about the scm-commits mailing list