Hello community, here is the log from the commit of package OpenOffice_org-components for openSUSE:Factory checked in at Thu Dec 10 12:48:05 CET 2009. -------- --- OpenOffice_org-components/OpenOffice_org-components.changes 2009-11-13 18:36:20.000000000 +0100 +++ /mounts/work_src_done/STABLE/OpenOffice_org-components/OpenOffice_org-components.changes 2009-12-07 22:22:27.000000000 +0100 @@ -1,0 +2,15 @@ +Mon Dec 7 17:53:37 CET 2009 - pmladek@suse.cz + +- updated to the milestone ooo320-m7 +- updated ooo-build to version 3.1.99.4 (3.2-beta4) +- removed obsolete extra localization sources + +------------------------------------------------------------------- +Tue Nov 24 16:57:27 CET 2009 - pmladek@suse.cz + +- updated to the milestone ooo320-m5 +- updated ooo-build to version 3.1.99.3 (3.2-beta3) +- added define use_xulrunner191 that would allow to use xulrunner191 + on SLED11-SP1 (bnc#540726) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- ooo320-m4-components.tar.bz2 ooo-sdf-components.tar.bz2 New: ---- ooo320-m7-components.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-components.spec ++++++ --- /var/tmp/diff_new_pack.1cEmq6/_old 2009-12-10 12:47:18.000000000 +0100 +++ /var/tmp/diff_new_pack.1cEmq6/_new 2009-12-10 12:47:18.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-components (Version 3.1.99.2) +# spec file for package OpenOffice_org-components (Version 3.1.99.4) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,19 +19,21 @@ Name: OpenOffice_org-components -Version: 3.1.99.2 +# allow to use xulrunner191 on SLED11-SP1 (bnc#540726) +%define use_xulrunner191 no +Version: 3.1.99.4 Release: 1 -%define ooo_build_version 3.1.99.2 +%define ooo_build_version 3.1.99.4 %define piece components #!BuildIgnore: OpenOffice_org BuildRequires: OpenOffice_org-artwork-devel = %version BuildRequires: OpenOffice_org-libs-core-devel = %version BuildRequires: ImageMagick ant ant-apache-regexp 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 recode unixODBC-devel unzip xml-commons-apis xorg-x11 zip # mozilla stuff -%if %suse_version > 1110 +%if %suse_version > 1110 || %use_xulrunner191 == yes BuildRequires: mozilla-xulrunner191-devel %endif -%if %suse_version > 1100 && %suse_version <= 1110 +%if %suse_version > 1100 && %suse_version <= 1110 && %use_xulrunner191 != yes BuildRequires: mozilla-xulrunner190-devel %endif %if %suse_version > 1010 && %suse_version <= 1100 @@ -50,15 +52,14 @@ %endif %define ooo_prefix %_libdir %define ooo_home ooo3 -%define ooo_build_tag ooo320-m4 -License: Artistic License .. ; BSD 3-clause (or similar) ; GPL v2 or later ; LPPL .. ; LGPL v2.1 or later ; LGPL v3 only ; MPL .. ; MIT License (or similar) +%define ooo_build_tag ooo320-m7 +License: Artistic ; BSD3c ; GPLv2+ ; LPPL .. ; LGPLv2.1+ ; LGPLv3 ; MPL .. ; MIT Group: Productivity/Office/Suite AutoReqProv: on Requires: OpenOffice_org-libs-core = %version Summary: OpenOffice.org Components Url: http://www.openoffice.org/ Source0: %ooo_build_tag-%piece.tar.bz2 -Source1: ooo-sdf-%piece.tar.bz2 Patch1000: hotfix-bean-openjdk-ppc.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 ppc @@ -70,7 +71,7 @@ %package -n OpenOffice_org-officebean -License: LGPL v3 only +License: LGPLv3 Summary: OfficeBean Java Bean component for OpenOffice.org Group: Productivity/Office/Suite Provides: OpenOffice_org:/usr/lib/ooo-2.0/program/libofficebean.so @@ -97,7 +98,7 @@ %package -n OpenOffice_org-testtool -License: LGPL v3 only +License: LGPLv3 Summary: OpenOffice.org Test Tool Group: Productivity/Office/Suite Provides: OpenOffice_org:%ooo_prefix/%ooo_home/program/testtool.bin @@ -114,7 +115,7 @@ Requires: OpenOffice_org-testtool = %version Requires: OpenOffice_org-ure-devel = %version Requires: OpenOffice_org-libs-extern-devel = %version -License: Artistic License .. ; BSD 3-clause (or similar) ; GPL v2 or later ; LPPL .. ; LGPL v2.1 or later ; LGPL v3 only ; MPL .. ; MIT License (or similar) +License: Artistic ; BSD3c ; GPLv2+ ; LPPL .. ; LGPLv2.1+ ; LGPLv3 ; MPL .. ; MIT Summary: OpenOffice.org Components Development Group: Productivity/Office/Suite AutoReqProv: off @@ -126,7 +127,7 @@ %package l10n-prebuilt -License: Artistic License .. ; BSD 3-clause (or similar) ; GPL v2 or later ; LPPL .. ; LGPL v2.1 or later ; LGPL v3 only ; MPL .. ; MIT License (or similar) +License: Artistic ; BSD3c ; GPLv2+ ; LPPL .. ; LGPLv2.1+ ; LGPLv3 ; MPL .. ; MIT Summary: Prebuilt OpenOffice.org Components Localizations Group: Productivity/Office/Suite AutoReqProv: off @@ -142,7 +143,7 @@ %prep -%setup -c -q -a1 -n %ooo_build_tag-%piece +%setup -c -q -n %ooo_build_tag-%piece # hack to move sources to a reasonable location mv ooo/*/* . && rm -rf ooo mkdir -p ooo-build/hotfixes ++++++ ooo320-m4-components.tar.bz2 -> ooo320-m7-components.tar.bz2 ++++++ ++++ 1271690 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org