--- rpms/smeserver-openoffice-portable/contribs7/smeserver-openoffice-portable.spec	2008/03/14 13:42:41	1.2
+++ rpms/smeserver-openoffice-portable/contribs7/smeserver-openoffice-portable.spec	2008/03/14 19:46:22	1.5
@@ -2,7 +2,7 @@ Summary: OpenOfficePortable integration
 %define name smeserver-openoffice-portable
 Name: %{name}
 %define version 2.3.1
-%define release 8
+%define release 9
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -15,17 +15,21 @@ Requires: perl-XML-Twig >= 3.29
 BuildRequires: e-smith-devtools
 AutoReq: no
 Patch0: smeserver-openoffice-portable-2.3.1-pathesfix.patch
+Patch1: smeserver-openoffice-portable-2.3.1-inifile.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
+* Thu Mar 14 2008 Michael Weinberger <mweinber@neddix.de> 2.3.1-9
+  rename OpenOfficePortable.ini to OpenOfficePortable.ini.contrib
 * Thu Mar 14 2008 Michael Weinberger <mweinber@neddix.de> 2.3.1-8
   OO Pathes fixed
   OpenOfficePortable.ini added
@@ -40,6 +44,7 @@ See http://wiki.contribs.org/OpenOffice_
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1
+%patch1 -p1 -b .inifile
 
 %build
 
@@ -50,7 +55,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 'attr(644,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