[Erp5-report] r21046 - /spec/mandriva/2008.0/openoffice.org-oood/

nobody at svn.erp5.org nobody at svn.erp5.org
Wed May 21 00:12:10 CEST 2008


Author: kazuhiko
Date: Wed May 21 00:12:10 2008
New Revision: 21046

URL: http://svn.erp5.org?rev=21046&view=rev
Log:
* Tue May 20 2008 Kazuhiko Shiozaki <kazuhiko at nexedi.com> 0.3.1-5nxd2008.1
- build from the SVN repository (SVN rev: 21045)
- patch is no longer needed
- add /var/tmp/oood

* Fri May 02 2008 Kazuhiko Shiozaki <kazuhiko at nexedi.com> 0.3.1-4nxd2008.1
- requires openoffice.org-pyuno for Mandriva 2008.1

Removed:
    spec/mandriva/2008.0/openoffice.org-oood/openoffice.org-2.0.3-skip-registration.patch
Modified:
    spec/mandriva/2008.0/openoffice.org-oood/openoffice.org-oood.spec

Removed: spec/mandriva/2008.0/openoffice.org-oood/openoffice.org-2.0.3-skip-registration.patch
URL: http://svn.erp5.org/spec/mandriva/2008.0/openoffice.org-oood/openoffice.org-2.0.3-skip-registration.patch?rev=21045&view=auto
==============================================================================
--- spec/mandriva/2008.0/openoffice.org-oood/openoffice.org-2.0.3-skip-registration.patch (original)
+++ spec/mandriva/2008.0/openoffice.org-oood/openoffice.org-2.0.3-skip-registration.patch (removed)
@@ -1,17 +1,0 @@
---- Setup.xcu-orig	2006-11-20 17:35:48.842111864 +0100
-+++ Setup.xcu	2006-11-20 17:35:10.663178777 +0100
-@@ -23,9 +23,12 @@
- 	</node>
- 	<node oor:name="Office">
- 		<prop oor:name="ooSetupInstCompleted">
--			<value>false</value>
-+			<value>true</value>
-+		</prop>
-+		<prop oor:name="LicenseAcceptDate">
-+			<value>2999-11-20T17:04:16</value>
- 		</prop>
--		<prop oor:name="ooSetupShowIntro">
-+		<prop oor:name="FirstStartWizardCompleted">
- 			<value>true</value>
- 		</prop>
- 		<node oor:name="Factories">

Modified: spec/mandriva/2008.0/openoffice.org-oood/openoffice.org-oood.spec
URL: http://svn.erp5.org/spec/mandriva/2008.0/openoffice.org-oood/openoffice.org-oood.spec?rev=21046&r1=21045&r2=21046&view=diff
==============================================================================
--- spec/mandriva/2008.0/openoffice.org-oood/openoffice.org-oood.spec (original)
+++ spec/mandriva/2008.0/openoffice.org-oood/openoffice.org-oood.spec Wed May 21 00:12:10 2008
@@ -2,13 +2,15 @@
 %define deamon_name  oood
 
 %define version      0.3.1
-%define release      3
+%define revision     21045
+%define release      5
 
 %define server_user   oood
 %define config_dir    %{_sysconfdir}/oood
 %define server_dir    %{_usr}/share/oood
 %define run_dir       %{_var}/run/oood
 %define log_dir       %{_var}/log/oood
+%define tmp_dir       %{_var}/tmp/oood
 
 
 Summary:       Standalone server for converting various types of docs to/from OpenOffice format, extracting and editing metadata.
@@ -17,13 +19,20 @@
 Release:       %mkrel %{release}
 License:       GPL
 Group:         System/Servers
-Source0:       %{deamon_name}-%{version}.tar.bz2
-Patch1:        openoffice.org-2.0.3-skip-registration.patch
+Source0:       %{deamon_name}-%{revision}.tar.bz2
 URL:           http://svn.erp5.org/erp5/trunk/utils/ooodoc_server/
-BuildArch:     noarch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-rootdir
 Requires:      python >= 2.4, OpenOffice.org >= 2.0, xorg-x11-Xvfb
-Requires(pre): rpm-helper, patch
+%if %mdkversion >= 200810
+%ifarch x86_64
+Requires:      openoffice.org64-pyuno
+%else
+Requires:      openoffice.org-pyuno
+%endif
+%else
+BuildArch:     noarch
+%endif
+Requires(pre): rpm-helper
 BuildRequires: python >= 2.4
 
 #----------------------------------------------------------------------
@@ -35,7 +44,7 @@
 #----------------------------------------------------------------------
 
 %prep
-%setup -q -c
+%setup -q -c -n %{name}
 
 
 %build
@@ -54,15 +63,11 @@
 %{__mv} %{deamon_name}/oood.rc %{buildroot}%{_initrddir}/oood
 
 # Create /var/lib/oood/tmp/
-%{__mkdir_p} %{buildroot}/%{server_dir}/tmp
+%{__mkdir_p} %{buildroot}/%{server_dir}
 
 # Create and populate /usr/share/oood/
 %{__cp} -a  %{deamon_name}/*  %{buildroot}/%{server_dir}/
 %py_compile %{buildroot}/%{server_dir}
-
-# Create and populate /usr/share/oood/patches/
-%{__mkdir_p} %{buildroot}/%{server_dir}/patches
-%{__cp} -a  %{PATCH1}  %{buildroot}/%{server_dir}/patches/
 
 # Create and populate /var/run/oood
 %{__mkdir_p} %{buildroot}%{run_dir}
@@ -86,6 +91,9 @@
 }
 " > %{buildroot}/%{logrotate_dir}/oood
 
+# Create /var/tmp/tmp/
+%{__mkdir_p} %{buildroot}/%{tmp_dir}
+
 # Create README file
 cat %{deamon_name}/README > README.urpmi
 
@@ -135,10 +143,19 @@
 %{server_dir}
 %{run_dir}
 %{log_dir}
+%{tmp_dir}
 
 
 #----------------------------------------------------------------------
 %changelog
+* Tue May 20 2008 Kazuhiko Shiozaki <kazuhiko at nexedi.com> 0.3.1-5nxd2008.1
+- build from the SVN repository (SVN rev: 21045)
+- patch is no longer needed
+- add /var/tmp/oood
+
+* Fri May 02 2008 Kazuhiko Shiozaki <kazuhiko at nexedi.com> 0.3.1-4nxd2008.1
+- requires openoffice.org-pyuno for Mandriva 2008.1
+
 * Mon Jan  7 2008 Julien Gormotte <julien at nexedi.com> 0.3.1-3mdv2008.0
 - New build from the SVN repository (SVN rev: 18630)
 




More information about the Erp5-report mailing list