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

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Thu Nov 27 21:25:21 2008
New Revision: 24732

URL: http://svn.erp5.org?rev=24732&view=rev
Log:
- requires pyuno metapackage instead of openoffice.org64-pyuno or
  openoffice.org-pyuno.

Added:
    spec/mandriva/2008.0/openoffice.org-oood/oood.logrotate.conf
Modified:
    spec/mandriva/2008.0/openoffice.org-oood/openoffice.org-oood.spec

Added: spec/mandriva/2008.0/openoffice.org-oood/oood.logrotate.conf
URL: http://svn.erp5.org/spec/mandriva/2008.0/openoffice.org-oood/oood.logrotate.conf?rev=24732&view=auto
==============================================================================
--- spec/mandriva/2008.0/openoffice.org-oood/oood.logrotate.conf (added)
+++ spec/mandriva/2008.0/openoffice.org-oood/oood.logrotate.conf [utf8] Thu Nov 27 21:25:21 2008
@@ -1,0 +1,10 @@
+/var/log/oood/oood.log {
+    sharedscripts
+    rotate 10
+    weekly
+    missingok
+    compress
+    postrotate
+        service oood restart >& /dev/null
+    endscript
+}

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=24732&r1=24731&r2=24732&view=diff
==============================================================================
--- spec/mandriva/2008.0/openoffice.org-oood/openoffice.org-oood.spec [utf8] (original)
+++ spec/mandriva/2008.0/openoffice.org-oood/openoffice.org-oood.spec [utf8] Thu Nov 27 21:25:21 2008
@@ -2,8 +2,8 @@
 %define deamon_name  oood
 
 %define version      0.3.1
-%define revision     24214
-%define release      12
+%define revision     24534
+%define release      15
 
 %define server_user   oood
 %define config_dir    %{_sysconfdir}/oood
@@ -20,18 +20,12 @@
 License:       GPL
 Group:         System/Servers
 Source0:       %{deamon_name}-%{revision}.tar.bz2
+Source1:       %{deamon_name}.logrotate.conf
 URL:           http://svn.erp5.org/erp5/trunk/utils/ooodoc_server/
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-rootdir
-Requires:      python >= 2.4, OpenOffice.org >= 2.0, xorg-x11-Xvfb
-%if %mdkversion >= 200810
-%ifarch x86_64
-Requires:      openoffice.org64-pyuno
-%else
-Requires:      openoffice.org-pyuno
-%endif
-%else
+Requires:      python >= 2.4, x11-server-xvfb
+Requires:      pyuno
 BuildArch:     noarch
-%endif
 Requires(pre): rpm-helper
 BuildRequires: python >= 2.4
 
@@ -78,18 +72,7 @@
 # Create logrotate file
 %define logrotate_dir %{_sysconfdir}/logrotate.d
 %{__mkdir_p} %{buildroot}/%{logrotate_dir}
-echo "
-/var/log/oood/oood.log {
-    sharedscripts
-    rotate 10
-    daily
-    missingok
-    compress
-    postrotate
-        service oood restart
-    endscript
-}
-" > %{buildroot}/%{logrotate_dir}/oood
+%{__cp} -a %{SOURCE1} %{buildroot}/%{logrotate_dir}/oood
 
 # Create /var/tmp/tmp/
 %{__mkdir_p} %{buildroot}/%{tmp_dir}
@@ -136,6 +119,21 @@
 
 #----------------------------------------------------------------------
 %changelog
+* Thu Nov 27 2008 Kazuhiko Shiozaki <kazuhiko at nexedi.com> 0.3.1-15nxd2008.1
+- requires pyuno metapackage instead of openoffice.org64-pyuno or
+  openoffice.org-pyuno.
+
+* Mon Nov 10 2008 Kazuhiko Shiozaki <kazuhiko at nexedi.com> 0.3.1-14nxd2008.1
+- build from the SVN repository (SVN rev: 24534).
+- add 'Requires: x11-server-xvfb' (that depends much less than
+  xorg-x11-Xvfb)
+
+* Thu Nov  6 2008 Kazuhiko Shiozaki <kazuhiko at nexedi.com> 0.3.1-13nxd2008.1
+- build from the SVN repository (SVN rev: 24504).
+- remove 'Requires: xorg-x11-Xvfb'.
+- modify the configuration for logrotate so as to rotate weekly instead of
+  daily.
+
 * Thu Oct 16 2008 Kazuhiko Shiozaki <kazuhiko at nexedi.com> 0.3.1-12nxd2008.1
 - build from the SVN repository (SVN rev: 24214).