packages: ckeditor/ckeditor.spec - php package - update licenses - webserve...

Thu Feb 11 20:27:59 CET 2010

Author: glen                         Date: Thu Feb 11 19:27:59 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- php package
- update licenses
- webserver configs in separate sources
- tested, samples worked

---- Files affected:
packages/ckeditor:
   ckeditor.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/ckeditor/ckeditor.spec
diff -u packages/ckeditor/ckeditor.spec:1.1 packages/ckeditor/ckeditor.spec:1.2

--- packages/ckeditor/ckeditor.spec:1.1	Thu Feb 11 10:16:20 2010
+++ packages/ckeditor/ckeditor.spec	Thu Feb 11 20:27:54 2010
@@ -1,17 +1,21 @@
 # $Revision$, $Date$
 # TODO
-# - handle plugin languages
+# - separate packages for plugins
+# - uicolor for example bundles yui framework (30% of the whole plugins dir)
 Summary:	The text editor for Internet
 Summary(pl.UTF-8):	Edytor tekstowy dla Internetu
 Name:		ckeditor
 Version:	3.1
-Release:	0.16
-License:	LGPL v2.1
+Release:	0.17
+License:	LGPL v2.1+ / GPL v2+ / MPL
 Group:		Applications/WWW
 Source0:	http://download.cksource.com/CKEditor/CKEditor/CKEditor%20%{version}/%{name}_%{version}.tar.gz
 # Source0-md5:	9c4a9e54f756e24c6aac24888c4599d0
 URL:		http://www.ckeditor.com/
 Source1:	find-lang.sh
+Source2:	apache.conf
+Source3:	lighttpd.conf
+BuildRequires:	lynx
 BuildRequires:	rpmbuild(macros) > 1.268
 BuildRequires:	sed >= 4.0
 Requires:	webserver(access)
@@ -36,59 +40,63 @@
 edytorów biurowych, takich jak MS Word. Jest lekki i nie wymaga żadnej
 inicjalizacji na komputerze klienckim.
 
+%package -n php-%{name}
+Summary:	PHP class to create editors instances
+Group:		Development/Languages/PHP
+
+%description -n php-%{name}
+CKEditor class that can be used to create editor instances in PHP
+pages on server side.
+
 %prep
 %setup -qc
 mkdir config
 mv ckeditor/* .
 mv ckeditor/.htaccess config/htaccess
 rmdir ckeditor
-mv _samples samples
 
 # force php5 only
 rm ckeditor_php4.php
 mv ckeditor_php5.php ckeditor.php
 
-find -name _source | xargs rm -rf
+rm -rf _source
 rm -f *_source.js
 
 rm lang/_translationstatus.txt
 
+# used only in samples
+mv lang/_languages.js _samples
+%{__sed} -i -e 's,\.\./lang/_languages\.js,_languages.js,' _samples/ui_languages.html
+
 # undos the files
 %{__sed} -i -e 's,\r$,,' ckeditor*
 find '(' -name '*.js' -o -name '*.css' -o -name '*.txt' -o -name '*.html' -o -name '*.php' ')' -print0 | xargs -0 sed -i -e 's,\r$,,'
 
-# apache1/apache2 conf
-cat > config/apache.conf <<'EOF'
-Alias /%{name} %{_appdir}
-<Directory %{_appdir}>
-	Allow from all
-</Directory>
-EOF
-
-# lighttpd conf
-cat > config/lighttpd.conf <<'EOF'
-alias.url += (
-	"/%{name}" => "%{_appdir}",
-)
-EOF
+%build
+lynx -dump -nolist -width 1024 CHANGES.html | sed -e '/___/,$d' > CHANGES
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_appdir}
 
-cp -a ckeditor.js $RPM_BUILD_ROOT%{_appdir}
+cp -a ckeditor.js config.js contents.css $RPM_BUILD_ROOT%{_appdir}
 cp -a plugins skins themes lang $RPM_BUILD_ROOT%{_appdir}
 
+install -d $RPM_BUILD_ROOT%{php_data_dir}
+cp -a ckeditor.php $RPM_BUILD_ROOT%{php_data_dir}
+
 install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
-cp -a samples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+cp -a _samples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 install -d $RPM_BUILD_ROOT%{_sysconfdir}
-cp -a config/apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
-cp -a config/apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
-cp -a config/lighttpd.conf $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
+cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
+cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
 
 %find_lang %{name}.lang
 
+# already listed by plugin dir
+%{__sed} -i -e '/plugins/d' %{name}.lang
 %triggerin -- apache1 < 1.3.37-3, apache1-base
 %webapp_register apache %{_webapp}
 
@@ -112,24 +120,65 @@
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
+%doc CHANGES
 %dir %attr(750,root,http) %{_sysconfdir}
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apache.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/lighttpd.conf
 %dir %{_appdir}
 %{_appdir}/*.js
-%{_appdir}/skins
-%{_appdir}/themes
-%{_appdir}/plugins
-%{_appdir}/lang/_languages.js
+%{_appdir}/*.css
+%dir %{_appdir}/themes
+%{_appdir}/themes/default
+
+%dir %{_appdir}/skins
+%{_appdir}/skins/kama
+%{_appdir}/skins/office2003
+%{_appdir}/skins/v2
+
+%dir %{_appdir}/plugins
+%{_appdir}/plugins/about
+%{_appdir}/plugins/clipboard
+%{_appdir}/plugins/colordialog
+%{_appdir}/plugins/dialog
+%{_appdir}/plugins/div
+%{_appdir}/plugins/find
+%{_appdir}/plugins/flash
+%{_appdir}/plugins/forms
+%{_appdir}/plugins/iframedialog
+%{_appdir}/plugins/image
+%{_appdir}/plugins/link
+%{_appdir}/plugins/pagebreak
+%{_appdir}/plugins/pastefromword
+%{_appdir}/plugins/pastetext
+%{_appdir}/plugins/scayt
+%{_appdir}/plugins/showblocks
+%{_appdir}/plugins/smiley
+%{_appdir}/plugins/specialchar
+%{_appdir}/plugins/stylescombo
+%{_appdir}/plugins/table
+%{_appdir}/plugins/tabletools
+%{_appdir}/plugins/templates
+%{_appdir}/plugins/uicolor
+%{_appdir}/plugins/wsc
 
 %{_examplesdir}/%{name}-%{version}
 
+%files -n php-%{name}
+%defattr(644,root,root,755)
+%{php_data_dir}/ckeditor.php
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2010/02/11 19:27:54  glen
+- php package
+- update licenses
+- webserver configs in separate sources
+- tested, samples worked
+
 Revision 1.1  2010/02/11 09:16:20  glen
 - initial based on fckeditor.spec
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ckeditor/ckeditor.spec?r1=1.1&r2=1.2&f=u

