--- rpms/smeserver-openoffice-portable/contribs7/smeserver-openoffice-portable.spec	2008/02/28 18:58:50	1.1
+++ rpms/smeserver-openoffice-portable/contribs7/smeserver-openoffice-portable.spec	2008/04/21 20:56:19	1.11
@@ -1,8 +1,12 @@
+# $Id: smeserver-openoffice-portable.spec,v 1.10 2008/04/21 14:20:17 slords Exp $
+# Authority: mweinber
+# Name: Michael Weinberger
+
 Summary: OpenOfficePortable integration
 %define name smeserver-openoffice-portable
 Name: %{name}
-%define version 2.3.1
-%define release 7
+%define version 2.4.0
+%define release 2
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -11,22 +15,45 @@ Source: %{name}-%{version}.tar.gz
 BuildRoot: /var/tmp/%{name}-buildroot/
 BuildArch: noarch
 Requires: smeserver-release >= 7.1.2
+Requires: perl-XML-Twig >= 3.29
 BuildRequires: e-smith-devtools
 AutoReq: no
+Patch0: smeserver-openoffice-portable-2.4.0-touchlicense.patch
+
+%description
+Integrates the OpenOfficePortable application into the SME environment
+
+After installation run:
+config gettype openoffice || config set openoffice service
+setprop openoffice status enable
+signal-event workgroup-update
+
+See http://wiki.contribs.org/OpenOffice_for_Windows for full documentation.
 
 %changelog
+* Mon Apr 21 2008 Michael Weinberger <mweinber@neddix.de> 2.4.0-2
+  Touch license files to avoid license dialog
+* Mon Apr 21 2008 Michael Weinberger <mweinber@neddix.de> 2.4.0-1
+  Update to 2.4
+  Fix ownership of /opt/openoffice in script openoffice-init
+* Sun Mar 16 2008 Michael Weinberger <mweinber@neddix.de> 2.3.1-11
+  openoffice-delete-history as seperate script
+* Sat Mar 15 2008 Michael Weinberger <mweinber@neddix.de> 2.3.1-10
+  openoffice-delete-history added
+* Fri Mar 14 2008 Michael Weinberger <mweinber@neddix.de> 2.3.1-9
+  rename OpenOfficePortable.ini to OpenOfficePortable.ini.contrib
+* Thu Mar 13 2008 Michael Weinberger <mweinber@neddix.de> 2.3.1-8
+  OO Pathes fixed
+  OpenOfficePortable.ini added
+  openoffice configuration db record for enable/disable program share
 * Thu Feb 28 2008 Michael Weinberger <mweinber@neddix.de> 2.3.1-7
   Spec file fix
-
 * Thu Feb 14 2008 Michael Weinberger <mweinber@neddix.de>
 - Initial release
 
-%description
-Integrates the OpenOfficePortable application into the SME environment
-Visit: http://wiki.contribs.org/OpenOffice_for_Windows
-
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1 
 
 %build
 
@@ -37,6 +64,7 @@ rm -f %{name}-%{version}-filelist
 /sbin/e-smith/genfilelist  $RPM_BUILD_ROOT  \
 --dir /opt/openoffice 'attr(755,admin,admin)' \
 --dir /opt/openoffice/OpenOfficePortable 'attr(755,admin,admin)' \
+--file /opt/openoffice/OpenOfficePortable/OpenOfficePortable.ini.contrib 'attr(644,admin,admin)' \
 --file /opt/openoffice/download.url 'attr(644,admin,admin)' \
  >> %{name}-%{version}-filelist