commit OpenOffice_org-extensions for openSUSE:Factory

26 Mar 2010

Hello community,

here is the log from the commit of package OpenOffice_org-extensions for openSUSE:Factory
checked in at Fri Mar 26 16:24:14 CET 2010.



--------

--- OpenOffice_org-extensions/OpenOffice_org-extensions.changes	2010-03-12 17:52:45.000000000 +0100
+++ /mounts/work_src_done/STABLE/OpenOffice_org-extensions/OpenOffice_org-extensions.changes	2010-03-25 21:48:33.000000000 +0100
@@ -1,0 +2,7 @@
+Thu Mar 25 21:38:09 CET 2010 - pmladek@suse.cz
+
+- updated ooo-build to version 3.2.0.99.2 (3.2.1-beta2)
+- added WatchWindow Calc extension (fate#309182)
+- added java to Requires of -calc-extensions; needed by WatchWidnow
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
  piece-reportbuilder.diff

New:
----
  WatchWindow_1.1.2.oxt
  WatchWindow_1.1.2.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ OpenOffice_org-extensions.spec ++++++
--- /var/tmp/diff_new_pack.LjDD2o/_old	2010-03-26 16:24:02.000000000 +0100
+++ /var/tmp/diff_new_pack.LjDD2o/_new	2010-03-26 16:24:02.000000000 +0100
@@ -1,5 +1,5 @@
 #
-# spec file for package OpenOffice_org-extensions (Version 3.2.0.99.1)
+# spec file for package OpenOffice_org-extensions (Version 3.2.0.99.2)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -19,13 +19,14 @@
 
 
 Name:           OpenOffice_org-extensions
-Version:        3.2.0.99.1
+Version:        3.2.0.99.2
 Release:        1
-%define         ooo_build_version 3.2.0.99.1
+%define         ooo_build_version 3.2.0.99.2
 %define         piece      extensions
 %define		ct2n_version		1.3.2
 %define		gdocs_version		2.1.0
 %define		numbertext_version	0.7.1
+%define		watchwidnow_version	1.1.2
 #!BuildIgnore:  OpenOffice_org
 BuildRequires:  ImageMagick ant ant-apache-regexp ant-nodeps bison boost-devel ccache cups-devel curl-devel db-devel flac-devel flex gnome-vfs2-devel gperf gtk2-devel icu java-devel kdelibs3-devel krb5 libexif mono-devel neon-devel openldap2-devel pam-devel perl-Archive-Zip perl-Compress-Zlib python-devel python-xml recode unixODBC-devel unzip xml-commons-apis xorg-x11 zip
 BuildRequires:  OpenOffice_org-libs-core-devel = %version
@@ -55,10 +56,11 @@
 # prebuilt extensions
 Source100:      gdocs_%{gdocs_version}_modified.oxt
 Source101:      numbertext-%{numbertext_version}.oxt
+Source102:      WatchWindow_%{watchwidnow_version}.oxt
 # FIXME: this is just because of license; we do not build gdocs from sources now
-Source500:      gdocs_2.1.0.tar.bz2
-Source501:      gdocs_2.1.0.diff
-Patch990:       piece-reportbuilder.diff
+Source500:      gdocs_%{gdocs_version}.tar.bz2
+Source501:      gdocs_%{gdocs_version}.diff
+Source502:      WatchWindow_%{watchwidnow_version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  %ix86 x86_64 ppc
 
@@ -82,12 +84,32 @@
 
 
 %package -n OpenOffice_org-calc-extensions
-License:        LGPLv2.1+
+License:        LGPLv2.1+,LGPLv3
 Summary:        OpenOffice.org Calc Extensions
 Group:          Productivity/Office/Suite
 Requires:       OpenOffice_org-calc = %version
 # pyuno is needed for the numbertext extension
 Requires:       OpenOffice_org-pyuno = %version
+# the watchWindow extension is written in java
+# the gcj is required by the main package on 10.2 and lower
+%if %suse_version > 1020
+%ifarch %ix86 ppc
+# the 32-bit build requires 32-bit JRE, bnc#222708
+Recommends:     jre-32 >= 1.6
+%if %suse_version > 1110
+# jre-32 is not provided by the preferred openjdk until openSUSE-11.2
+Requires:       jre-32 > 1.5
+%endif
+%endif
+# ---
+%ifarch x86_64
+Recommends:     jre-64 >= 1.6
+%if %suse_version > 1110
+# jre-64 is not provided by the preferred openjdk until openSUSE-11.2
+Requires:       jre-64 > 1.5
+%endif
+%endif
+%endif
 
 %description -n OpenOffice_org-calc-extensions
 This package provides extensions for OpenOffice.org Calc:
@@ -95,6 +117,7 @@
 - Convert Text to Number
 - New Functions NUMBERTEXT and MONEYTEXT
 - Solver for Nonlinear Programming
+- Watch Window
 
 %package -n OpenOffice_org-draw-extensions
 License:        LGPLv3
@@ -125,7 +148,7 @@
 
 
 %package -n OpenOffice_org-writer-extensions
-License:        LGPLv3 ; ASLv..
+License:        LGPLv3 ; ASLv.. ; CDDL ; Other uncritical OpenSource License
 Summary:        OpenOffice.org Writer Extensions
 Group:          Productivity/Office/Suite
 Requires:       OpenOffice_org-writer = %version
@@ -193,6 +216,9 @@
     if unopkg list --shared | grep -q "org.numbertext-calc-addin" ; then
 	unopkg remove --shared "org.numbertext-calc-addin" || true;
     fi
+    if unopkg list --shared | grep -q "org.openoffice.extensions.watchwindow.WatchWindow" ; then
+	unopkg remove --shared "org.openoffice.extensions.watchwindow.WatchWindow" || true;
+    fi
     # clear disk cache
     unopkg list --shared > /dev/null 2>&1 || true
 fi
@@ -202,6 +228,7 @@
 unopkg add --shared --force %ooo_prefix/%ooo_home/share/extension/install/ConvertTextToNumber-%{ct2n_version}.oxt || true;
 unopkg add --shared --force %ooo_prefix/%ooo_home/share/extension/install/NLPSolver.oxt || true;
 unopkg add --shared --force %ooo_prefix/%ooo_home/share/extension/install/numbertext-%{numbertext_version}.oxt || true;
+unopkg add --shared --force %ooo_prefix/%ooo_home/share/extension/install/WatchWindow_%{watchwidnow_version}.oxt || true;
 
 %preun -n OpenOffice_org-calc-extensions
 if test $1 = 0 ; then
@@ -209,6 +236,7 @@
     unopkg remove --shared "nl.nouenoff.ct2n" || true;
     unopkg remove --shared "com.sun.star.comp.Calc.NLPSolver" || true;
     unopkg remove --shared "org.numbertext-calc-addin" || true;
+    unopkg remove --shared "org.openoffice.extensions.watchwindow.WatchWindow" || true;
     # clear disk cache
     unopkg list --shared > /dev/null 2>&1 || true
 fi
@@ -297,9 +325,6 @@
 # ct2n stuff
 mkdir -p ct2n/download
 cp %{S:4} ct2n/download
-# hotfix
-mkdir -p ooo-build/hotfixes
-cp %{P:990} ooo-build/hotfixes
 
 %build
 # setup env.
@@ -318,6 +343,7 @@
 # prebuilt extensions
 cp %{S:100} $RPM_BUILD_ROOT%ooo_prefix/%ooo_home/share/extension/install
 cp %{S:101} $RPM_BUILD_ROOT%ooo_prefix/%ooo_home/share/extension/install
+cp %{S:102} $RPM_BUILD_ROOT%ooo_prefix/%ooo_home/share/extension/install
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -332,6 +358,7 @@
 %ooo_prefix/%ooo_home/share/extension/install/ConvertTextToNumber-%{ct2n_version}.oxt
 %ooo_prefix/%ooo_home/share/extension/install/NLPSolver.oxt
 %ooo_prefix/%ooo_home/share/extension/install/numbertext-%{numbertext_version}.oxt
+%ooo_prefix/%ooo_home/share/extension/install/WatchWindow_%{watchwidnow_version}.oxt
 
 %files -n OpenOffice_org-draw-extensions
 %defattr(-,root,root)




++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠Hilbert.suse.de

tags

participants (1)