[Erp5-report] r11456 - /spec/mandriva/2006.0/openoffice.org-oood/openoffice.org-oood.spec

[nobody at svn.erp5.org]

Author: kevin
Date: Thu Nov 23 11:55:03 2006
New Revision: 11456

URL: http://svn.erp5.org?rev=11456&view=rev
Log:
- Update to version 0.1.4
- Do not define initrd files as config files
- Start and stop service automaticcaly at install and uninstall
- Include server directories
- Don't include ReadMe file twice
- Add rc.d/init.d file to manage oood as a service
- Add oood service to system on install
- Delete oood service on uninstall
- Patch openoffice to skip registration form at first run
- Don't use custom shell script to start server
- Save patches in a separate folder

Modified:
    spec/mandriva/2006.0/openoffice.org-oood/openoffice.org-oood.spec

Modified: spec/mandriva/2006.0/openoffice.org-oood/openoffice.org-oood.spec
URL: http://svn.erp5.org/spec/mandriva/2006.0/openoffice.org-oood/openoffice.org-oood.spec?rev=11456&r1=11455&r2=11456&view=diff
==============================================================================
--- spec/mandriva/2006.0/openoffice.org-oood/openoffice.org-oood.spec (original)
+++ spec/mandriva/2006.0/openoffice.org-oood/openoffice.org-oood.spec Thu Nov 23 11:55:03 2006
@@ -1,7 +1,7 @@
 %define prefix       openoffice.org-
 %define deamon_name  oood
 
-%define version      0.1.2
+%define version      0.1.4
 %define release      1
 
 %define server_user   oood
@@ -16,9 +16,11 @@
 Group:         System/Servers
 Source0:       %{deamon_name}-%{version}.tar.bz2
 Patch1:        SimpleXMLRPCServer.patch
+Patch2:        openoffice.org-2.0.3-skip-registration.patch
 URL:           http://svn.erp5.org/erp5/trunk/utils/ooodoc_server/
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-rootdir
 Requires:      python >= 2.4, openoffice.org-pyuno >= 2.0.3
+Requires(pre): rpm-helper
 BuildRequires: python >= 2.4
 
 #----------------------------------------------------------------------
@@ -39,16 +41,29 @@
 %install
 %{__rm} -rf  %{buildroot}
 
+# Create and populate /etc/oood/
 %{__mkdir_p} %{buildroot}/%{config_dir}
 %{__mv} %{deamon_name}/config.py   %{buildroot}/%{config_dir}/
-%{__mv} %{deamon_name}/runserw.sh  %{buildroot}/%{config_dir}/
-%{__mv} %{deamon_name}/start.sh    %{buildroot}/%{config_dir}/
-%py_compile %{buildroot}/%{config_dir}
+%py_compile %{buildroot}/%{config_dir}  # XXXXXXXXXXXX Is this necessary ?
 
+# For next 2007 release, look at http://qa.mandriva.com/twiki/bin/view/Main/InitscriptHowto
+%{__mkdir_p} %{buildroot}%{_initrddir}
+%{__mv} %{deamon_name}/oood.rc %{buildroot}%{_initrddir}/oood
+
+# Create and populate /var/lib/oood/tmp/
 %{__mkdir_p} %{buildroot}/%{server_dir}/tmp
+
+# Create and populate /var/lib/oood/
 %{__cp} -a  %{deamon_name}/*  %{buildroot}/%{server_dir}/
-%{__cp} -a  %{PATCH1}         %{buildroot}/%{server_dir}/
 %py_compile %{buildroot}/%{server_dir}
+
+# Create and populate /var/lib/oood/patches/
+%{__mkdir_p} %{buildroot}/%{server_dir}/patches
+%{__cp} -a  %{PATCH1}  %{buildroot}/%{server_dir}/patches/
+%{__cp} -a  %{PATCH2}  %{buildroot}/%{server_dir}/patches/
+
+# Create and populate /var/run/oood
+%{__mkdir_p} %{buildroot}/var/run/oood
 
 cat %{deamon_name}/README > README.urpmi
 
@@ -62,27 +77,60 @@
 
 
 %post
-# Hack: Silent patch
+# Hack: Silent patch 1
+%define patches_dir %{server_dir}/patches
 %{__cp} -a %{py_libdir}/SimpleXMLRPCServer.py %{py_libdir}/SimpleXMLRPCServer.py.rpmsave
-%{__patch} %{py_libdir}/SimpleXMLRPCServer.py --input=%{server_dir}/SimpleXMLRPCServer.patch
+%{__patch} %{py_libdir}/SimpleXMLRPCServer.py --input=%{patches_dir}/SimpleXMLRPCServer.patch
+# Hack: Silent patch 2
+%define ooo_setup_path /opt/openoffice.org2.0/share/registry/data/org/openoffice/
+%define ooo_setup_file Setup.xcu
+%{__cp} -a %{ooo_setup_path}%{ooo_setup_file} %{ooo_setup_path}%{ooo_setup_file}.rpmsave
+%{__patch} %{ooo_setup_path}%{ooo_setup_file} --input=%{patches_dir}/openoffice.org-2.0.3-skip-registration.patch
+# Add service and start server
+%_post_service oood
+service oood restart
+
+
+%preun
+service oood stop
+%_preun_service oood
 
 
 %postun
 %_postun_userdel %{server_user}
-# Restore patched file
+# Restore patched files
 %{__mv} %{py_libdir}/SimpleXMLRPCServer.py.rpmsave %{py_libdir}/SimpleXMLRPCServer.py
+%{__mv} %{ooo_setup_path}%{ooo_setup_file}.rpmsave %{ooo_setup_path}%{ooo_setup_file}
+
 
 
 %files
 %defattr(0755,root,root,755)
-%doc %{deamon_name}/VERSION.txt %{deamon_name}/README %{deamon_name}/MAINTAINERS.txt README.urpmi
-%config(noreplace) %{config_dir}/*
-%{server_dir}/*
-%attr(-,%{server_user},%{server_user}) %{server_dir}/*
+%attr(-,%{server_user},%{server_user}) %{server_dir}
+%doc %{deamon_name}/VERSION.txt %{deamon_name}/README %{deamon_name}/MAINTAINERS.txt
+%config(noreplace) %{config_dir}
+%attr(755,root,root) %{_initrddir}/oood
+/var/run/oood
 
 
 #----------------------------------------------------------------------
 %changelog
+* Thu Nov 23 2006 Kevin Deldycke <kevin at nexedi.com> 0.1.4-1mdk
+- Update to version 0.1.4
+- Do not define initrd files as config files
+- Start and stop service automaticcaly at install and uninstall
+
+* Mon Nov 21 2006 Kevin Deldycke <kevin at nexedi.com> 0.1.3-1mdk
+- Update to version 0.1.3
+- Include server directories
+- Don't include ReadMe file twice
+- Add rc.d/init.d file to manage oood as a service
+- Add oood service to system on install
+- Delete oood service on uninstall
+- Patch openoffice to skip registration form at first run
+- Don't use custom shell script to start server
+- Save patches in a separate folder
+
 * Mon Nov 20 2006 Kevin Deldycke <kevin at nexedi.com> 0.1.2-1mdk
 - Update to version 0.1.2
 - Change package name from OOoDocument_server to openoffice.org-oood