commit OpenOffice_org-extensions for openSUSE:Factory
Hello community, here is the log from the commit of package OpenOffice_org-extensions for openSUSE:Factory checked in at Mon May 31 01:02:26 CEST 2010. -------- --- OpenOffice_org-extensions/OpenOffice_org-extensions.changes 2010-05-13 21:44:09.000000000 +0200 +++ /mounts/work_src_done/STABLE/OpenOffice_org-extensions/OpenOffice_org-extensions.changes 2010-05-28 17:58:22.000000000 +0200 @@ -1,0 +2,21 @@ +Fri May 28 17:37:09 CEST 2010 - pmladek@suse.cz + +- updated to the milestone ooo320-m19 +- updated ooo-build to version 3.2.1.3 (3.2.1-rc3) +- removed WatchWindow extension; was not mature enough (bnc#604638) + +------------------------------------------------------------------- +Tue May 25 17:44:26 CEST 2010 - pmladek@suse.cz + +- updated to the milestone ooo320-m18 (3.2.1-rc2) +- updated ooo-build to version 3.2.1.2 (3.2.1-rc2) +- added missing sources for the GDocs extension (bnc#590838) + +------------------------------------------------------------------- +Tue May 18 17:34:37 CEST 2010 - pmladek@suse.cz + +- fixed build on MeeGo: + + added ant-nodeps into BuildRequires + + saved mysqlc source directory + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- WatchWindow_1.1.2.oxt WatchWindow_1.1.2.tar.bz2 ooo320-m17-extensions.tar.bz2 New: ---- AbsoluteLayout.tar.bz2 mail-1.4-sources.jar ooo320-m19-extensions.tar.bz2 swing-layout-1.0.4-doc.zip swing-layout-1.0.4-src.zip ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-extensions.spec ++++++ --- /var/tmp/diff_new_pack.RxSGC3/_old 2010-05-31 01:02:11.000000000 +0200 +++ /var/tmp/diff_new_pack.RxSGC3/_new 2010-05-31 01:02:11.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-extensions (Version 3.2.1.1) +# spec file for package OpenOffice_org-extensions (Version 3.2.1.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,18 +19,17 @@ Name: OpenOffice_org-extensions -Version: 3.2.1.1 +Version: 3.2.1.3 Release: 1 -%define ooo_build_version 3.2.1.1 +%define ooo_build_version 3.2.1.3 %define piece extensions %define ct2n_version 1.3.2 %define gdocs_version 2.1.0 %define numbertext_version 0.8.2 -%define watchwidnow_version 1.1.2 #!BuildIgnore: OpenOffice_org -BuildRequires: ImageMagick ant ant-apache-regexp bison boost-devel ccache cups-devel curl-devel flac-devel flex gnome-vfs2-devel gperf gtk2-devel icu java-devel libexif mono-devel neon-devel pam-devel perl-Archive-Zip perl-Compress-Zlib python-devel recode unixODBC-devel unzip xml-commons-apis zip +BuildRequires: ImageMagick ant ant-apache-regexp ant-nodeps bison boost-devel ccache cups-devel curl-devel flac-devel flex gnome-vfs2-devel gperf gtk2-devel icu java-devel libexif mono-devel neon-devel pam-devel perl-Archive-Zip perl-Compress-Zlib python-devel recode unixODBC-devel unzip xml-commons-apis zip %if 0%{?suse_version} -BuildRequires: ant-nodeps db-devel kdelibs3-devel krb5 openldap2-devel python-xml xorg-x11 +BuildRequires: db-devel kdelibs3-devel krb5 openldap2-devel python-xml xorg-x11 %endif %if 0%{?meego_version} BuildRequires: db4-devel krb5-devel openldap-devel @@ -61,7 +60,7 @@ %endif %define ooo_prefix %_libdir %define ooo_home ooo3 -%define ooo_build_tag ooo320-m17 +%define ooo_build_tag ooo320-m19 License: GPLv2 ; LGPLv2.1+ ; LGPLv3 ; Other uncritical OpenSource License Group: Productivity/Office/Suite AutoReqProv: on @@ -75,11 +74,25 @@ # 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 +# gdocs sources Source500: gdocs_%{gdocs_version}.tar.bz2 Source501: gdocs_%{gdocs_version}.diff -Source502: WatchWindow_%{watchwidnow_version}.tar.bz2 +# gdata-*.jar and google-*.jar are under Apache License, Version 2.0 +# activation.jar is part of "JavaTM Web Services Developer Pack 1.5 Release +# Notes" and is mentioned there between "Redistributable Components", see +# http://java.sun.com/webservices/docs/1.5/ReleaseNotes.html#RedistributableCo... +# mail-1.4-sources.jar is taken from http://ftp.us.xemacs.org/pub/mirrors/maven2/javax/mail/mail/1.4/ +# the mail-1.4.jar in the above URL is not exactly the same but it is evident that it is built from the same sources: +# class files are exactly the same; sligtly newer ant and Sun JRE has been used for the build; +# text files has DOS end of lines +Source502: mail-1.4-sources.jar +# taken from netbeans-6.8 installed from netbeans-6.8-ml-javase-linux.sh +Source503: AbsoluteLayout.tar.bz2 +# taken from netbeans-6.8 installed from netbeans-6.8-ml-javase-linux.sh +Source504: swing-layout-1.0.4-doc.zip +# taken from netbeans-6.8 installed from netbeans-6.8-ml-javase-linux.sh +Source505: swing-layout-1.0.4-src.zip BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 ppc @@ -164,7 +177,6 @@ - Convert Text to Number - New Functions NUMBERTEXT and MONEYTEXT - Solver for Nonlinear Programming -- Watch Window %package -n OpenOffice_org-draw-extensions License: LGPLv3 @@ -321,7 +333,6 @@ yes yes | LANG=EN_US.UTF-8 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 @@ -329,7 +340,6 @@ 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 @@ -411,6 +421,12 @@ %setup -c -q -n %ooo_build_tag-%piece # hack to move sources to a reasonable location mv ooo/*/* . && rm -rf ooo +# we do not want to build mysql on Meego +%if 0%{?meego_version} +mkdir -p ooo-build/ooo/do-not-build +mv mysqlc ooo-build/ooo/do-not-build +%endif +# README-scsolver.txt cp %{S:2} . # nlpsolver stuff mkdir -p nlpsolver/download @@ -436,7 +452,6 @@ # 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 # unpack the mysql extension on newer distros %if 0%{?suse_version} >= 01120 cd $RPM_BUILD_ROOT%ooo_prefix/%ooo_home/share/extension/install/ @@ -471,7 +486,6 @@ %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) ++++++ ooo320-m17-extensions.tar.bz2 -> ooo320-m19-extensions.tar.bz2 ++++++ OpenOffice_org-extensions/ooo320-m17-extensions.tar.bz2 /mounts/work_src_done/STABLE/OpenOffice_org-extensions/ooo320-m19-extensions.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de