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

[nobody at svn.erp5.org]

Author: kevin
Date: Thu Nov 30 16:05:13 2006
New Revision: 11546

URL: http://svn.erp5.org?rev=11546&view=rev
Log:
Update to version 0.1.8
Macro-ize some hard-coded path reference

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=11546&r1=11545&r2=11546&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 30 16:05:13 2006
@@ -1,12 +1,13 @@
 %define prefix       openoffice.org-
 %define deamon_name  oood
 
-%define version      0.1.7
+%define version      0.1.8
 %define release      1
 
 %define server_user   oood
 %define config_dir    %{_sysconfdir}/oood
 %define server_dir    %{_var}/lib/oood
+%define run_dir       %{_var}/run/oood
 
 Summary:       Standalone server for converting various types of docs to/from OpenOffice format, extracting and editing metadata.
 Name:          %{prefix}%{deamon_name}
@@ -50,7 +51,7 @@
 %{__mkdir_p} %{buildroot}%{_initrddir}
 %{__mv} %{deamon_name}/oood.rc %{buildroot}%{_initrddir}/oood
 
-# Create and populate /var/lib/oood/tmp/
+# Create /var/lib/oood/tmp/
 %{__mkdir_p} %{buildroot}/%{server_dir}/tmp
 
 # Create and populate /var/lib/oood/
@@ -63,7 +64,7 @@
 %{__cp} -a  %{PATCH2}  %{buildroot}/%{server_dir}/patches/
 
 # Create and populate /var/run/oood
-%{__mkdir_p} %{buildroot}/var/run/oood
+%{__mkdir_p} %{buildroot}%{run_dir}
 
 cat %{deamon_name}/README > README.urpmi
 
@@ -101,11 +102,11 @@
 %{__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
+%__service oood restart
 
 
 %preun
-service oood stop
+%__service oood stop
 %_preun_service oood
 
 
@@ -121,7 +122,7 @@
 %attr(-,%{server_user},%{server_user}) %{server_dir}
 %attr(755,root,root) %{_initrddir}/oood
 %{logrotate_dir}/oood
-/var/run/oood
+%{run_dir}
 %config(noreplace) %{config_dir}
 %config(noreplace) %{_sysconfdir}/logrotate.d/oood
 %doc %{deamon_name}/VERSION.txt %{deamon_name}/README %{deamon_name}/MAINTAINERS.txt
@@ -129,6 +130,10 @@
 
 #----------------------------------------------------------------------
 %changelog
+* Thu Nov 30 2006 Kevin Deldycke <kevin at nexedi.com> 0.1.8-1mdk
+- Update to version 0.1.8
+- Macro-ize some hard-coded path reference
+
 * Thu Nov 30 2006 Kevin Deldycke <kevin at nexedi.com> 0.1.7-1mdk
 - Update to version 0.1.7
 - Add xorg-x11-Xvfb requirement