--- rpms/smeserver-ajaxterm/contribs7/smeserver-ajaxterm.spec	2008/02/29 10:20:01	1.3
+++ rpms/smeserver-ajaxterm/contribs7/smeserver-ajaxterm.spec	2008/03/01 12:17:07	1.4
@@ -1,7 +1,7 @@
 Summary: ajaxterm is a web-based terminal
 %define realname smeserver-ajaxterm
 %define version 1.0.5
-%define release 1
+%define release 2
 Name: %{realname}
 Version: %{version}
 Release: %{release}%{?dist}
@@ -10,14 +10,21 @@ License: GPL
 Group: System Environment/Libraries
 Source: %{name}-%{version}.tar.gz
 Source1: Ajaxterm-0.10.tar.gz
+Patch0: smeserver-ajaxterm-1.0.5-DocumentationFromSpecFile.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
 URL: http://antony.lesuisse.org/qweb/trac/wiki/AjaxTerm
 Requires: smeserver-release > 7.1.3
 BuildRequires: e-smith-devtools
 
 %changelog
+* Sat Mar 01 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.0.5-2
+- Moved documentation from spec file
+- Changed description (copied from )
+- Fixed whitelines in changelog between entries
+
 * Fri Feb 29 2008 Michael Weinberger <mweinber@neddix.de> 1.0.5-1
   Fix spec file
+
 * Thu Nov 15 2007 Michael Weinberger <mweinber@neddix.de>
   Version 1.0.5
   Bug fix: SysV start: do not fall back do user root if user ajaxterm does not exist
@@ -34,48 +41,14 @@ BuildRequires: e-smith-devtools
   Promtps for SSHPort at ssh login
 
 %description
-see http://wiki.contribs.org/Ajaxterm
-
-Usage: https://yourdomain.com/ajaxterm/index.html
-
-Configuration
-1) To allow only local login on localhost:
-config setprop Ajaxterm allowOnlyLocalhost yes
-service ajaxterm restart
-
-2) To allow ssh login on all hosts:
-config setprop Ajaxterm allowOnlyLocalhost no
-service ajaxterm restart
-
-3) Terminal size (default is 80 x 25)
-config setprop Ajaxterm width NEWWIDTH
-config setprop Ajaxterm height NEWHEIGHT
-service ajaxterm restart
-
-4) Basic Auth Users (Browser login)
-config setprop Ajaxterm basicAuthUsers "user [user] ..."
-expand-template /etc/httpd/conf/httpd.conf
-service httpd-e-smith restart
-
-5) Web alias (default: ajaxterm)
-config setprop Ajaxterm webAlias NEWALIAS
-expand-template /etc/httpd/conf/httpd.conf
-service httpd-e-smith restart
-
-6) Changing the ajaxterm service port (default is 8022):
-config setprop Ajaxterm servicePort NEWPORT
-expand-template /etc/httpd/conf/httpd.conf
-service httpd-e-smith restart
-service ajaxterm restart
-
+Ajaxterm is a web based terminal. It was totally inspired and works almost exactly like http://anyterm.org/ except it's much easier to install (see comparaison with anyterm below).
 
 %prep
 %setup -n %{realname}-%{version}
-
+%patch0 -p1
 
 %build
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 tar xzvf $RPM_SOURCE_DIR/Ajaxterm-0.10.tar.gz
@@ -92,11 +65,9 @@ rm -f %{name}-%{version}-filelist
 find $RPM_BUILD_ROOT -depth -type l -print |\
  sed "s@^$RPM_BUILD_ROOT@@g" >> %{name}-%{version}-filelist
 
-
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && %{__rm} -rf $RPM_BUILD_ROOT
 
-
 %files -f %{name}-%{version}-filelist
 %defattr(-,root,root)
-
+%attr(0755,root,root)    %doc %dir          /usr/share/doc/smeserver-ajaxterm-1.0.5/