From ccd254a7da45043635fe566c90b3bd0e3317a805 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:39:20 +0000 Subject: [PATCH 1/8] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 9d1ba9f..7cab22c 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ 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 70f5081da7c1bb05331c3f5d919e89ecda527f2d Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:08:53 +0000 Subject: [PATCH 2/8] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 9d1ba9f..7cab22c 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ 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 d99f04dfa8c1d36e841f3f2709206c60b357a73f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 8 May 2010 02:30:18 +0000 Subject: [PATCH 3/8] Initialize branch EL-6 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..46381b9 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-6 From 775e7eeb2c836ecf6958c432e9763b25f3f3568e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:30:57 +0000 Subject: [PATCH 4/8] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- import.log | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile 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 7cab22c..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: zikula-module-scribite -# $Id$ -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/import.log b/import.log deleted file mode 100644 index b198ef7..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -zikula-module-scribite-3_2-3_fc11:HEAD:zikula-module-scribite-3.2-3.fc11.src.rpm:1248471298 From 0936b037f31902abffe7c4e9b6361377770b7772 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:30:58 +0000 Subject: [PATCH 5/8] 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 7cab22c..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: zikula-module-scribite -# $Id$ -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 46381b9..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-6 diff --git a/import.log b/import.log deleted file mode 100644 index b198ef7..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -zikula-module-scribite-3_2-3_fc11:HEAD:zikula-module-scribite-3.2-3.fc11.src.rpm:1248471298 From 2326c1421a63b5a4a863488a6ccfbf9f2ad15d76 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 8 Feb 2011 03:01:35 -0600 Subject: [PATCH 6/8] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- zikula-module-scribite.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zikula-module-scribite.spec b/zikula-module-scribite.spec index 480443e..1269c38 100644 --- a/zikula-module-scribite.spec +++ b/zikula-module-scribite.spec @@ -4,7 +4,7 @@ Name: zikula-module-%{zikula_modname} Version: 3.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Integration of several JavaScript text editors with Zikula Group: Applications/Publishing @@ -62,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Feb 08 2011 Fedora Release Engineering - 3.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Wed Jul 22 2009 Eric "Sparks" Christensen - 3.2-3 - Updated source with new version of scribite!. From 8de8dbe4f3c7e18fc6bc7b1ee65214fc8e6c2458 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 23 Feb 2011 17:14:05 -0500 Subject: [PATCH 7/8] Retire zikula-module-scribite. --- dead.package | 1 + sources | 1 - zikula-module-scribite.spec | 79 ------------------------------------- 3 files changed, 1 insertion(+), 80 deletions(-) create mode 100644 dead.package delete mode 100644 sources delete mode 100644 zikula-module-scribite.spec diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..de91ae3 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +This package was retired due to no active owner on 2011-02-23 diff --git a/sources b/sources deleted file mode 100644 index 5e8451b..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -84cfdce4a38f7eb1dd44bb3d8359b561 scribite_3_2_basic.zip diff --git a/zikula-module-scribite.spec b/zikula-module-scribite.spec deleted file mode 100644 index 1269c38..0000000 --- a/zikula-module-scribite.spec +++ /dev/null @@ -1,79 +0,0 @@ -%global zikula_base %{_datadir}/zikula -%global zikula_moddir %{zikula_base}/modules -%global zikula_modname scribite - -Name: zikula-module-%{zikula_modname} -Version: 3.2 -Release: 4%{?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 -* Tue Feb 08 2011 Fedora Release Engineering - 3.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* 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 e3fa247ec5973d58e51f23e967bd910f2cd22e72 Mon Sep 17 00:00:00 2001 From: Till Maas Date: Sat, 20 Dec 2014 11:38:26 +0100 Subject: [PATCH 8/8] 2014-12-20: Retired orphaned package, because it was not built. --- .gitignore | 1 - dead.package | 2 + sources | 1 - zikula-module-scribite.spec | 76 ------------------------------------- 4 files changed, 2 insertions(+), 78 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 sources delete mode 100644 zikula-module-scribite.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 25312d8..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -scribite_3_2_basic.zip diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..c842c49 --- /dev/null +++ b/dead.package @@ -0,0 +1,2 @@ +2014-12-20: Retired orphaned package, because it was not built. + diff --git a/sources b/sources deleted file mode 100644 index 5e8451b..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -84cfdce4a38f7eb1dd44bb3d8359b561 scribite_3_2_basic.zip diff --git a/zikula-module-scribite.spec b/zikula-module-scribite.spec deleted file mode 100644 index 480443e..0000000 --- a/zikula-module-scribite.spec +++ /dev/null @@ -1,76 +0,0 @@ -%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