--- rpms/smeserver-ajaxterm/contribs7/smeserver-ajaxterm.spec	2008/02/27 17:53:47	1.1
+++ rpms/smeserver-ajaxterm/contribs7/smeserver-ajaxterm.spec	2013/06/20 20:51:27	1.9
@@ -1,20 +1,34 @@
+# $Id: smeserver-ajaxterm.spec,v 1.8 2008/11/25 16:20:18 slords Exp $
+# Authority: mweinber
+# Name: Michael Weinberger
+
+Summary: ajaxterm is a web-based terminal
 %define realname smeserver-ajaxterm
 %define version 1.0.5
-Summary: ajaxterm is a web-based terminal
+%define release 2
 Name: %{realname}
 Version: %{version}
-Release: 0
+Release: %{release}%{?dist}
 BuildArch: noarch
 License: GPL
 Group: System Environment/Libraries
 Source: %{name}-%{version}.tar.gz
 Source1: Ajaxterm-0.10.tar.gz
-Packager: Michael Weinberger Michael.Weinberger@nedix.de
+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 http://antony.lesuisse.org/qweb/trac/wiki/AjaxTerm)
+- 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
@@ -31,48 +45,14 @@ Requires: smeserver-release > 7.1.3
   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
@@ -88,44 +68,11 @@ rm -f %{name}-%{version}-filelist
  >> %{name}-%{version}-filelist
 find $RPM_BUILD_ROOT -depth -type l -print |\
  sed "s@^$RPM_BUILD_ROOT@@g" >> %{name}-%{version}-filelist
-
+/usr/lib/rpm/brp-python-bytecompile
 
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && %{__rm} -rf $RPM_BUILD_ROOT
 
-%pre
-/usr/sbin/useradd ajaxterm  &> /dev/null
-/sbin/e-smith/config printtype Ajaxterm > /dev/null || /sbin/e-smith/config set Ajaxterm service
-exit 0;
-
-%post
-if [ "x`/bin/cat /proc/1/cmdline`" = "xinit [7]" ] ; then
-	/sbin/e-smith/expand-template /etc/httpd/conf/httpd.conf
-	/sbin/e-smith/service httpd-e-smith restart
-	/sbin/e-smith/service ajaxterm restart
-fi
-exit 0;
-
-%preun
-if [ "x`/bin/cat /proc/1/cmdline`" = "xinit [7]" ] ; then
-	if [ $1 = 0 ] ; then # uninstall
-		/sbin/e-smith/service ajaxterm stop
-	fi
-fi
-exit 0;
-
-%postun
-if [ "x`/bin/cat /proc/1/cmdline`" = "xinit [7]" ] ; then
-	if [ $1 = 0 ] ; then # uninstall
-		/sbin/e-smith/expand-template /etc/httpd/conf/httpd.conf
-		/sbin/e-smith/service httpd-e-smith restart
-	fi
-fi
-if [ $1 = 0 ] ; then # uninstall
-	/usr/sbin/userdel -r ajaxterm &> /dev/null
-fi
-exit 0;
-
 %files -f %{name}-%{version}-filelist
 %defattr(-,root,root)
-
+%attr(0755,root,root)    %doc %dir          /usr/share/doc/smeserver-ajaxterm-1.0.5/