From 611815197f6db9d28f2d91e81e53c2ac313086b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jason=20=E3=83=86=E3=82=A3=E3=83=93=E3=83=84?= Date: Fri, 24 Jul 2009 19:22:23 +0000 Subject: [PATCH 1/4] Initialize branch F-10 for zikula-module-scribite --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..dc32377 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-10 From c3f1bdc30feca89cd10af9caca327a873a2d1ac4 Mon Sep 17 00:00:00 2001 From: Eric Christensen Date: Fri, 24 Jul 2009 22:30:07 +0000 Subject: [PATCH 2/4] Initial F-10 build. --- .cvsignore | 1 + import.log | 1 + sources | 1 + zikula-module-scribite.spec | 76 +++++++++++++++++++++++++++++++++++++ 4 files changed, 79 insertions(+) create mode 100644 import.log create mode 100644 zikula-module-scribite.spec diff --git a/.cvsignore b/.cvsignore index e69de29..25312d8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +scribite_3_2_basic.zip diff --git a/import.log b/import.log new file mode 100644 index 0000000..aba13da --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +zikula-module-scribite-3_2-3_fc11:F-10:zikula-module-scribite-3.2-3.fc11.src.rpm:1248474559 diff --git a/sources b/sources index e69de29..5e8451b 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +84cfdce4a38f7eb1dd44bb3d8359b561 scribite_3_2_basic.zip diff --git a/zikula-module-scribite.spec b/zikula-module-scribite.spec new file mode 100644 index 0000000..480443e --- /dev/null +++ b/zikula-module-scribite.spec @@ -0,0 +1,76 @@ +%global zikula_base %{_datadir}/zikula +%global zikula_moddir %{zikula_base}/modules +%global zikula_modname scribite + +Name: zikula-module-%{zikula_modname} +Version: 3.2 +Release: 3%{?dist} +Summary: Integration of several JavaScript text editors with Zikula + +Group: Applications/Publishing +License: GPLv2+ +# Use top-level URL from Zikula site for the module +URL: http://code.zikula.org/scribite/downloads/ +# http://code.zikula.org/scribite/downloads/24 +Source0: %{zikula_modname}_3_2_basic.zip +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArch: noarch +#BuildRequires: +Requires: zikula + +%description +scribite! is a module for easy integration of WYSIWYG scripts, TinyMCE, +FCKeditor, openWYSIWYG, NicEdit or YUI Rich Text Editor into textarea fields in +order to make text editing a little bit nicer and more comfortable for users. + + +%prep +%setup -qn modules/%{zikula_modname} +# Remove empty index.html and others +find -size 0 | xargs rm -f + +# Remove CC-licensed pieces +#rm -rf javascript/scribite_editors/xinha/skins/titan +#rm -rf javascript/scribite_editors/xinha/skins/inditreuse +#rm -rf javascript/scribite_editors/xinha/iconsets/Tango + +%build +#Fixing wrong-file-end-of-line-encoding error +cd pndocs +sed -i 's/\r//' Snoopy_gpl_license.txt +sed -i 's/\r//' changelog.txt +sed -i 's/\r//' tinymce_lgpl_license.txt +sed -i 's/\r//' openwysiwyg_license.txt +sed -i 's/\r//' fckeditor_license.txt + +%install +rm -rf $RPM_BUILD_ROOT +%{__mkdir} -p $RPM_BUILD_ROOT/%{zikula_moddir}/%{zikula_modname} +cp -pr . $RPM_BUILD_ROOT/%{zikula_moddir}/%{zikula_modname} +rm -rf $RPM_BUILD_ROOT/%{zikula_moddir}/%{zikula_modname}/pndocs + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files +%defattr(-,root,root,-) +%doc pndocs/changelog.txt pndocs/fckeditor_license.txt pndocs/license.txt pndocs/nicedit_license.txt pndocs/openwysiwyg_license.txt pndocs/scribite!-dev-deu.odt pndocs/scribite!-dev-deu.pdf pndocs/scribite!-dev-eng.odt pndocs/scribite!-dev-eng.pdf pndocs/scribite!-dev-fra.odt pndocs/scribite!-dev-fra.pdf pndocs/scribite!-documentation-deu.odt pndocs/scribite!-documentation-deu.pdf pndocs/scribite!-documentation-eng.odt pndocs/scribite!-documentation-eng.pdf pndocs/scribite!-documentation-fra.odt pndocs/scribite!-documentation-fra.pdf pndocs/Snoopy_gpl_license.txt pndocs/tinymce_lgpl_license.txt pndocs/todo.txt pndocs/xinha_htmlarea_license.txt + +%{zikula_moddir}/%{zikula_modname} + + +%changelog +* Wed Jul 22 2009 Eric "Sparks" Christensen - 3.2-3 +- Updated source with new version of scribite!. + +* Wed Jul 22 2009 Eric "Sparks" Christensen - 3.2-2 +- Updated SPEC to remove non-GPL skins and icons. +- Fixed wrong-file-end-of-line-encoding errors in SPEC. + +* Tue Jun 23 2009 Eric "Sparks" Christensen - 3.2-1 +- Updated package to remove non-GPL code. + +* Mon Jun 15 2009 Eric "Sparks" Christensen - 3.1-1 +- Initial RPM build From c3b5769a197a96eff84d044b48400fbb1de7fe49 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:08:53 +0000 Subject: [PATCH 3/4] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 9d1ba9f..de6aaa4 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: zikula-module-scribite -# $Id$ +# $Id: Makefile,v 1.1 2009/07/24 19:22:21 tibbs Exp $ NAME := zikula-module-scribite SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 73005ba09263eeefd58caffb87509dd907e89174 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:30:56 +0000 Subject: [PATCH 4/4] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 1 - 4 files changed, 23 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index de6aaa4..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: zikula-module-scribite -# $Id: Makefile,v 1.1 2009/07/24 19:22:21 tibbs Exp $ -NAME := zikula-module-scribite -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index dc32377..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-10 diff --git a/import.log b/import.log deleted file mode 100644 index aba13da..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -zikula-module-scribite-3_2-3_fc11:F-10:zikula-module-scribite-3.2-3.fc11.src.rpm:1248474559