From b7b98fbc2a578874f95da71cdfebc0276a774359 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toshio=20=E3=81=8F=E3=82=89=E3=81=A8=E3=81=BF?= Date: Tue, 3 Nov 2009 16:12:12 +0000 Subject: [PATCH 1/6] Initialize branch F-11 for xinha --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..25c7708 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-11 From 30659fd7a568093a23620b26f0215ab17c982ed6 Mon Sep 17 00:00:00 2001 From: Matthew Daniels Date: Tue, 3 Nov 2009 19:10:07 +0000 Subject: [PATCH 2/6] Initial addition to F-11 branch --- .cvsignore | 1 + import.log | 1 + sources | 1 + xinha.conf | 1 + xinha.spec | 139 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 143 insertions(+) create mode 100644 import.log create mode 100644 xinha.conf create mode 100644 xinha.spec diff --git a/.cvsignore b/.cvsignore index e69de29..ddab6b0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +xinha-0.96-0.1.b2.tar.gz diff --git a/import.log b/import.log new file mode 100644 index 0000000..74cc067 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +xinha-0_96-0_1_b2:F-11:xinha-0.96-0.1.b2.src.rpm:1257274961 diff --git a/sources b/sources index e69de29..8ad6bc7 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +6a7202c9fe279beae3f6b0945535ea56 xinha-0.96-0.1.b2.tar.gz diff --git a/xinha.conf b/xinha.conf new file mode 100644 index 0000000..126c0e9 --- /dev/null +++ b/xinha.conf @@ -0,0 +1 @@ +Alias /xinha /usr/share/js/xinha-0.96-0.1.b2 diff --git a/xinha.spec b/xinha.spec new file mode 100644 index 0000000..23fa693 --- /dev/null +++ b/xinha.spec @@ -0,0 +1,139 @@ +Name: xinha +Version: 0.96 +Release: 0.1.b2 +Summary: A WYSIWIG HTML editor component in Javascript + +Group: Development/Languages +License: BSD and PHP and LGPLv2+ and CC-BY-SA +URL: http://www.xinha.org + +# The source for this package was pulled from upstream's vcs. Use the +# following commands to generate the tarball (and add my conf file): +# +# svn export -r 1191 http://svn.xinha.org/trunk %{name}-%{version}-%{release} +# tar -czf %{name}-%{version}-%{release}.tar.gz %{name}-%{version}-%{release}/* + +Source0: http://fedorahosted.org/release/x/i/%{name}-%{version}-%{release}.tar.gz +Source1: xinha.conf + +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +BuildArch: noarch + +Requires: perl-XML-DOM +Requires: perl-Text-Aspell + +# These would be required for some plugins to work +# (those would be the plugins we conveniently remove in %setup) +# * Requires: php-magickwand +# * Requires: php-gd +# * Requires: Some other PEAR libraries which aren't in Fedora (yet) + +%description +Xinha is a Javascript component that can be used to enhance a textarea field in +HTML. It can be used on its own or as part of a larger WYSIWYG module such as +Scribite. + +%prep +%setup -q -c -n %{name}-%{version}-%{release} -a 0 +cp -p %SOURCE1 . + +# Remove precompiled binaries and other illegal files +find %{name}-%{version}-%{release} | grep \.jar$ | xargs rm +find %{name}-%{version}-%{release} | grep \.htaccess$ | xargs rm + +# Fix permissions on non-executables +find %{name}-%{version}-%{release} | grep \.js$ | xargs chmod a-x +find %{name}-%{version}-%{release} | grep \.php$ | xargs chmod a-x +find %{name}-%{version}-%{release} | grep \.css$ | xargs chmod a-x +find %{name}-%{version}-%{release} | grep \.html$ | xargs chmod a-x +find %{name}-%{version}-%{release} | grep \.svg$ | xargs chmod a-x + +# Remove plugins that contain unresolvable dependecies +rm -rf %{name}-%{version}-%{release}/plugins/ImageManager/ +rm -rf %{name}-%{version}-%{release}/plugins/ExtendedFileManager/ +rm -rf %{name}-%{version}-%{release}/unsupported_plugins/ +rm -rf %{name}-%{version}-%{release}/contrib/ + +# Remove carriage returns +cat %{name}-%{version}-%{release}/skins/inditreuse/README | tr -d "\r \n" > README.unix +mv README.unix %{name}-%{version}-%{release}/skins/inditreuse/README +cat %{name}-%{version}-%{release}/license.txt| tr -d "\r \n" > license.unix +mv license.unix %{name}-%{version}-%{release}/license.txt +cat %{name}-%{version}-%{release}/skins/titan/README | tr -d "\r \n" > README.unix +mv README.unix %{name}-%{version}-%{release}/skins/titan/README + + +# Organize the documentation files into folders. We can't just +# simply %doc them because they're often named the same +mkdir doc +mkdir doc/tango-images +mkdir doc/tango-icons doc/crystal-icons +mkdir doc/inditreuse-skin doc/titan-skin +mkdir doc/InsertSmiley doc/SmartReplace doc/Equation doc/SpellChecker +mkdir doc/SaveSubmit doc/FormOperations doc/InsertSnippet doc/InsertSnippet2 + +mv %{name}-%{version}-%{release}/license.txt doc +mv %{name}-%{version}-%{release}/release-notes.txt doc +mv %{name}-%{version}-%{release}/XinhaLoader_readme.txt doc + +mv %{name}-%{version}-%{release}/images/tango/COPYING doc/tango-images + +mv %{name}-%{version}-%{release}/iconsets/Tango/LICENSE doc/tango-icons +mv %{name}-%{version}-%{release}/iconsets/Tango/README doc/tango-icons +mv %{name}-%{version}-%{release}/iconsets/Crystal/LICENSE doc/crystal-icons +mv %{name}-%{version}-%{release}/iconsets/Crystal/README doc/crystal-icons + +mv %{name}-%{version}-%{release}/skins/inditreuse/README doc/inditreuse-skin +mv %{name}-%{version}-%{release}/skins/titan/README doc/titan-skin + +mv %{name}-%{version}-%{release}/plugins/InsertSmiley/README.txt doc/InsertSmiley +mv %{name}-%{version}-%{release}/plugins/SmartReplace/readme.txt doc/SmartReplace +mv %{name}-%{version}-%{release}/plugins/Equation/readme.txt doc/Equation +mv %{name}-%{version}-%{release}/plugins/SpellChecker/README doc/SpellChecker +mv %{name}-%{version}-%{release}/plugins/SpellChecker/readme-tech.html doc/SpellChecker +mv %{name}-%{version}-%{release}/plugins/SaveSubmit/README.txt doc/SaveSubmit +mv %{name}-%{version}-%{release}/plugins/FormOperations/README doc/FormOperations +mv %{name}-%{version}-%{release}/plugins/InsertSnippet/readme.html doc/InsertSnippet +mv %{name}-%{version}-%{release}/plugins/InsertSnippet2/readme.html doc/InsertSnippet2 + +mv %{name}-%{version}-%{release}/examples doc/examples + +%build + +# There's nothing to build here; we're just copying js/php. + +%install + +# Clean the build root +rm -rf $RPM_BUILD_ROOT + +# Create the directory (if not already there) where js is supposed to go +mkdir -p $RPM_BUILD_ROOT%{_datadir}/js +cp -a %{name}-%{version}-%{release} $RPM_BUILD_ROOT%{_datadir}/js/ + +# Create conf.d, if it's not there already, and copy over our .conf file +mkdir -p $RPM_BUILD_ROOT/etc/httpd/conf.d +install -p -m 0644 %{name}.conf $RPM_BUILD_ROOT/etc/httpd/conf.d/%{name}.conf + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root,-) +%{_datadir}/js/%{name}-%{version}-%{release} +%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf + +# Install documentation +# If removed plugins are reintegrated in the future, remember +# to include their documentation files. + +%doc doc/* + +# Note that this package includes locales, but they are implemented +# in JSON, not .mo files, so we can't currently handle them. We'll +# just have to let Xinha handle them as it sees fit until we have +# a better protocol for doing so. + +%changelog +* Mon Oct 19 2009 Matthew Daniels - 0.96-0.1.b2 +- Spec file submission (initial package creation) From b29374cc80a9fc8853fdfaffe2674a62c27bce52 Mon Sep 17 00:00:00 2001 From: Matthew Daniels Date: Sun, 6 Dec 2009 17:00:46 +0000 Subject: [PATCH 3/6] Edited the release tag with a dist macro and changed usage of release to alphtag throughout. --- xinha.spec | 86 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 45 insertions(+), 41 deletions(-) diff --git a/xinha.spec b/xinha.spec index 23fa693..9e7a8e0 100644 --- a/xinha.spec +++ b/xinha.spec @@ -1,6 +1,8 @@ +%global alphatag 0.1.b2 + Name: xinha Version: 0.96 -Release: 0.1.b2 +Release: 0.1.b2%{?dist}.1 Summary: A WYSIWIG HTML editor component in Javascript Group: Development/Languages @@ -13,7 +15,7 @@ URL: http://www.xinha.org # svn export -r 1191 http://svn.xinha.org/trunk %{name}-%{version}-%{release} # tar -czf %{name}-%{version}-%{release}.tar.gz %{name}-%{version}-%{release}/* -Source0: http://fedorahosted.org/release/x/i/%{name}-%{version}-%{release}.tar.gz +Source0: http://fedorahosted.org/release/x/i/%{name}-%{version}-%{alphatag}.tar.gz Source1: xinha.conf BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -34,33 +36,33 @@ HTML. It can be used on its own or as part of a larger WYSIWYG module such as Scribite. %prep -%setup -q -c -n %{name}-%{version}-%{release} -a 0 +%setup -q -c -n %{name}-%{version}-%{alphatag} -a 0 cp -p %SOURCE1 . # Remove precompiled binaries and other illegal files -find %{name}-%{version}-%{release} | grep \.jar$ | xargs rm -find %{name}-%{version}-%{release} | grep \.htaccess$ | xargs rm +find %{name}-%{version}-%{alphatag} | grep \.jar$ | xargs rm +find %{name}-%{version}-%{alphatag} | grep \.htaccess$ | xargs rm # Fix permissions on non-executables -find %{name}-%{version}-%{release} | grep \.js$ | xargs chmod a-x -find %{name}-%{version}-%{release} | grep \.php$ | xargs chmod a-x -find %{name}-%{version}-%{release} | grep \.css$ | xargs chmod a-x -find %{name}-%{version}-%{release} | grep \.html$ | xargs chmod a-x -find %{name}-%{version}-%{release} | grep \.svg$ | xargs chmod a-x +find %{name}-%{version}-%{alphatag} | grep \.js$ | xargs chmod a-x +find %{name}-%{version}-%{alphatag} | grep \.php$ | xargs chmod a-x +find %{name}-%{version}-%{alphatag} | grep \.css$ | xargs chmod a-x +find %{name}-%{version}-%{alphatag} | grep \.html$ | xargs chmod a-x +find %{name}-%{version}-%{alphatag} | grep \.svg$ | xargs chmod a-x # Remove plugins that contain unresolvable dependecies -rm -rf %{name}-%{version}-%{release}/plugins/ImageManager/ -rm -rf %{name}-%{version}-%{release}/plugins/ExtendedFileManager/ -rm -rf %{name}-%{version}-%{release}/unsupported_plugins/ -rm -rf %{name}-%{version}-%{release}/contrib/ +rm -rf %{name}-%{version}-%{alphatag}/plugins/ImageManager/ +rm -rf %{name}-%{version}-%{alphatag}/plugins/ExtendedFileManager/ +rm -rf %{name}-%{version}-%{alphatag}/unsupported_plugins/ +rm -rf %{name}-%{version}-%{alphatag}/contrib/ # Remove carriage returns -cat %{name}-%{version}-%{release}/skins/inditreuse/README | tr -d "\r \n" > README.unix -mv README.unix %{name}-%{version}-%{release}/skins/inditreuse/README -cat %{name}-%{version}-%{release}/license.txt| tr -d "\r \n" > license.unix -mv license.unix %{name}-%{version}-%{release}/license.txt -cat %{name}-%{version}-%{release}/skins/titan/README | tr -d "\r \n" > README.unix -mv README.unix %{name}-%{version}-%{release}/skins/titan/README +cat %{name}-%{version}-%{alphatag}/skins/inditreuse/README | tr -d "\r \n" > README.unix +mv README.unix %{name}-%{version}-%{alphatag}/skins/inditreuse/README +cat %{name}-%{version}-%{alphatag}/license.txt| tr -d "\r \n" > license.unix +mv license.unix %{name}-%{version}-%{alphatag}/license.txt +cat %{name}-%{version}-%{alphatag}/skins/titan/README | tr -d "\r \n" > README.unix +mv README.unix %{name}-%{version}-%{alphatag}/skins/titan/README # Organize the documentation files into folders. We can't just @@ -72,31 +74,31 @@ mkdir doc/inditreuse-skin doc/titan-skin mkdir doc/InsertSmiley doc/SmartReplace doc/Equation doc/SpellChecker mkdir doc/SaveSubmit doc/FormOperations doc/InsertSnippet doc/InsertSnippet2 -mv %{name}-%{version}-%{release}/license.txt doc -mv %{name}-%{version}-%{release}/release-notes.txt doc -mv %{name}-%{version}-%{release}/XinhaLoader_readme.txt doc +mv %{name}-%{version}-%{alphatag}/license.txt doc +mv %{name}-%{version}-%{alphatag}/release-notes.txt doc +mv %{name}-%{version}-%{alphatag}/XinhaLoader_readme.txt doc -mv %{name}-%{version}-%{release}/images/tango/COPYING doc/tango-images +mv %{name}-%{version}-%{alphatag}/images/tango/COPYING doc/tango-images -mv %{name}-%{version}-%{release}/iconsets/Tango/LICENSE doc/tango-icons -mv %{name}-%{version}-%{release}/iconsets/Tango/README doc/tango-icons -mv %{name}-%{version}-%{release}/iconsets/Crystal/LICENSE doc/crystal-icons -mv %{name}-%{version}-%{release}/iconsets/Crystal/README doc/crystal-icons +mv %{name}-%{version}-%{alphatag}/iconsets/Tango/LICENSE doc/tango-icons +mv %{name}-%{version}-%{alphatag}/iconsets/Tango/README doc/tango-icons +mv %{name}-%{version}-%{alphatag}/iconsets/Crystal/LICENSE doc/crystal-icons +mv %{name}-%{version}-%{alphatag}/iconsets/Crystal/README doc/crystal-icons -mv %{name}-%{version}-%{release}/skins/inditreuse/README doc/inditreuse-skin -mv %{name}-%{version}-%{release}/skins/titan/README doc/titan-skin +mv %{name}-%{version}-%{alphatag}/skins/inditreuse/README doc/inditreuse-skin +mv %{name}-%{version}-%{alphatag}/skins/titan/README doc/titan-skin -mv %{name}-%{version}-%{release}/plugins/InsertSmiley/README.txt doc/InsertSmiley -mv %{name}-%{version}-%{release}/plugins/SmartReplace/readme.txt doc/SmartReplace -mv %{name}-%{version}-%{release}/plugins/Equation/readme.txt doc/Equation -mv %{name}-%{version}-%{release}/plugins/SpellChecker/README doc/SpellChecker -mv %{name}-%{version}-%{release}/plugins/SpellChecker/readme-tech.html doc/SpellChecker -mv %{name}-%{version}-%{release}/plugins/SaveSubmit/README.txt doc/SaveSubmit -mv %{name}-%{version}-%{release}/plugins/FormOperations/README doc/FormOperations -mv %{name}-%{version}-%{release}/plugins/InsertSnippet/readme.html doc/InsertSnippet -mv %{name}-%{version}-%{release}/plugins/InsertSnippet2/readme.html doc/InsertSnippet2 +mv %{name}-%{version}-%{alphatag}/plugins/InsertSmiley/README.txt doc/InsertSmiley +mv %{name}-%{version}-%{alphatag}/plugins/SmartReplace/readme.txt doc/SmartReplace +mv %{name}-%{version}-%{alphatag}/plugins/Equation/readme.txt doc/Equation +mv %{name}-%{version}-%{alphatag}/plugins/SpellChecker/README doc/SpellChecker +mv %{name}-%{version}-%{alphatag}/plugins/SpellChecker/readme-tech.html doc/SpellChecker +mv %{name}-%{version}-%{alphatag}/plugins/SaveSubmit/README.txt doc/SaveSubmit +mv %{name}-%{version}-%{alphatag}/plugins/FormOperations/README doc/FormOperations +mv %{name}-%{version}-%{alphatag}/plugins/InsertSnippet/readme.html doc/InsertSnippet +mv %{name}-%{version}-%{alphatag}/plugins/InsertSnippet2/readme.html doc/InsertSnippet2 -mv %{name}-%{version}-%{release}/examples doc/examples +mv %{name}-%{version}-%{alphatag}/examples doc/examples %build @@ -109,7 +111,7 @@ rm -rf $RPM_BUILD_ROOT # Create the directory (if not already there) where js is supposed to go mkdir -p $RPM_BUILD_ROOT%{_datadir}/js -cp -a %{name}-%{version}-%{release} $RPM_BUILD_ROOT%{_datadir}/js/ +cp -a %{name}-%{version}-%{alphatag} $RPM_BUILD_ROOT%{_datadir}/js/ # Create conf.d, if it's not there already, and copy over our .conf file mkdir -p $RPM_BUILD_ROOT/etc/httpd/conf.d @@ -135,5 +137,7 @@ rm -rf $RPM_BUILD_ROOT # a better protocol for doing so. %changelog +* Sun Dec 6 2009 Matthew Daniels - 0.96-0.1.b2.1 +- Changed release tag format to add the dist tag and a build number * Mon Oct 19 2009 Matthew Daniels - 0.96-0.1.b2 - Spec file submission (initial package creation) From e3986c08c94f3cae255c00bfec4ff3bfe1f3c24c Mon Sep 17 00:00:00 2001 From: Matthew Daniels Date: Sun, 6 Dec 2009 17:08:04 +0000 Subject: [PATCH 4/6] Edited build tag to avoid a CVS tag clash --- xinha.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xinha.spec b/xinha.spec index 9e7a8e0..2ec5154 100644 --- a/xinha.spec +++ b/xinha.spec @@ -2,7 +2,7 @@ Name: xinha Version: 0.96 -Release: 0.1.b2%{?dist}.1 +Release: 0.1.b2%{?dist}.2 Summary: A WYSIWIG HTML editor component in Javascript Group: Development/Languages @@ -137,7 +137,7 @@ rm -rf $RPM_BUILD_ROOT # a better protocol for doing so. %changelog -* Sun Dec 6 2009 Matthew Daniels - 0.96-0.1.b2.1 +* Sun Dec 6 2009 Matthew Daniels - 0.96-0.1.b2.2 - Changed release tag format to add the dist tag and a build number * Mon Oct 19 2009 Matthew Daniels - 0.96-0.1.b2 - Spec file submission (initial package creation) From bb7bac6d50186a9313c5cc75ac63e1d67aaa115d Mon Sep 17 00:00:00 2001 From: Matthew Daniels Date: Sun, 6 Dec 2009 17:19:06 +0000 Subject: [PATCH 5/6] Fixed a problem in the spec file where a {release} should have been {alphatag} --- xinha.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/xinha.spec b/xinha.spec index 2ec5154..b8273f9 100644 --- a/xinha.spec +++ b/xinha.spec @@ -2,7 +2,7 @@ Name: xinha Version: 0.96 -Release: 0.1.b2%{?dist}.2 +Release: 0.1.b2%{?dist}.3 Summary: A WYSIWIG HTML editor component in Javascript Group: Development/Languages @@ -122,7 +122,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%{_datadir}/js/%{name}-%{version}-%{release} +%{_datadir}/js/%{name}-%{version}-%{alphatag} %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf # Install documentation @@ -137,6 +137,8 @@ rm -rf $RPM_BUILD_ROOT # a better protocol for doing so. %changelog +* Sun Dec 6 2009 Matthew Daniels - 0.96-0.1.b2.3 +- Missed a release <-> alphatag interchange on line 125; fixed now. * Sun Dec 6 2009 Matthew Daniels - 0.96-0.1.b2.2 - Changed release tag format to add the dist tag and a build number * Mon Oct 19 2009 Matthew Daniels - 0.96-0.1.b2 From a903772a0ac697cd1360aa5330d84875bd9054a0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:53:46 +0000 Subject: [PATCH 6/6] 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 4ffc573..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xinha -# $Id$ -NAME := xinha -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 25c7708..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-11 diff --git a/import.log b/import.log deleted file mode 100644 index 74cc067..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -xinha-0_96-0_1_b2:F-11:xinha-0.96-0.1.b2.src.rpm:1257274961