November 2009 - openSUSE Commits - openSUSE Mailing Lists

commit OpenOffice_org-l10n for openSUSE:Factory
by root＠Hilbert.suse.de 20 Nov '09

20 Nov '09

Hello community, here is the log from the commit of package OpenOffice_org-l10n for openSUSE:Factory checked in at Fri Nov 20 01:20:09 CET 2009. -------- --- OpenOffice_org-l10n/OpenOffice_org-l10n.changes 2009-10-20 17:17:06.000000000 +0200 +++ /mounts/work_src_done/STABLE/OpenOffice_org-l10n/OpenOffice_org-l10n.changes 2009-11-13 18:37:22.000000000 +0100 @@ -1,0 +2,10 @@ +Fri Nov 13 17:34:52 CET 2009 - pmladek(a)suse.cz + +- updated to version 3.1.99.2 + +------------------------------------------------------------------- +Thu Oct 29 22:57:28 CET 2009 - pmladek(a)suse.cz + +- updated to version 3.1.99.1 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-l10n.spec ++++++ --- /var/tmp/diff_new_pack.rTUq3X/_old 2009-11-20 01:19:53.000000000 +0100 +++ /var/tmp/diff_new_pack.rTUq3X/_new 2009-11-20 01:19:53.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-l10n (Version 3.1.1.4) +# spec file for package OpenOffice_org-l10n (Version 3.1.99.2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,10 +19,10 @@ Name: OpenOffice_org-l10n -Version: 3.1.1.4 +Version: 3.1.99.2 Release: 1 %define piece l10n -%define ooo_build_version 3.1.1.4 +%define ooo_build_version 3.1.99.2 # test_build_langs: 1 = de and cs # 2 = all supported languages %define test_build_langs 2 @@ -55,7 +55,7 @@ BuildRequires: OpenOffice_org-l10n-extras-prebuilt = %version BuildRequires: OpenOffice_org-writer-l10n-prebuilt = %version BuildRequires: unzip -%define ooo_basis_dir basis3.1 +%define ooo_basis_dir basis3.2 %define ooo_home ooo3 License: LGPL v3 only Group: Productivity/Office/Suite ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit OpenOffice_org-impress for openSUSE:Factory
by root＠Hilbert.suse.de 20 Nov '09

20 Nov '09

Hello community, here is the log from the commit of package OpenOffice_org-impress for openSUSE:Factory checked in at Fri Nov 20 01:19:05 CET 2009. -------- --- OpenOffice_org-impress/OpenOffice_org-impress.changes 2009-10-20 17:17:04.000000000 +0200 +++ /mounts/work_src_done/STABLE/OpenOffice_org-impress/OpenOffice_org-impress.changes 2009-11-13 18:37:16.000000000 +0100 @@ -1,0 +2,12 @@ +Fri Nov 13 17:34:52 CET 2009 - pmladek(a)suse.cz + +- updated to the milestone ooo320-m4 +- updated ooo-build to version 3.1.99.2 (3.2-beta2) + +------------------------------------------------------------------- +Thu Oct 29 22:57:28 CET 2009 - pmladek(a)suse.cz + +- updated to the milestone ooo320-m2 +- updated ooo-build to version 3.1.99.1 (3.2-beta1) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- ooo310-m19-impress.tar.bz2 New: ---- ooo320-m4-impress.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-impress.spec ++++++ --- /var/tmp/diff_new_pack.goSyI1/_old 2009-11-20 01:18:59.000000000 +0100 +++ /var/tmp/diff_new_pack.goSyI1/_new 2009-11-20 01:18:59.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-impress (Version 3.1.1.4) +# spec file for package OpenOffice_org-impress (Version 3.1.99.2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,9 +19,9 @@ Name: OpenOffice_org-impress -Version: 3.1.1.4 +Version: 3.1.99.2 Release: 1 -%define ooo_build_version 3.1.1.4 +%define ooo_build_version 3.1.99.2 %define piece impress #!BuildIgnore: OpenOffice_org #!BuildIgnore: OpenOffice_org-filters-optional @@ -38,7 +38,7 @@ %endif %define ooo_prefix %_libdir %define ooo_home ooo3 -%define ooo_build_tag ooo310-m19 +%define ooo_build_tag ooo320-m4 License: LGPL v3 only Group: Productivity/Office/Suite AutoReqProv: on @@ -106,7 +106,9 @@ %prep -%setup -q -a1 -n %ooo_build_tag-%piece +%setup -c -q -a1 -n %ooo_build_tag-%piece +# hack to move sources to a reasonable location +mv ooo/*/* . && rm -rf ooo %build # setup env. ++++++ ooo310-m19-impress.tar.bz2 -> ooo320-m4-impress.tar.bz2 ++++++ ++++ 1008821 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit OpenOffice_org-icon-themes for openSUSE:Factory
by root＠Hilbert.suse.de 20 Nov '09

20 Nov '09

Hello community, here is the log from the commit of package OpenOffice_org-icon-themes for openSUSE:Factory checked in at Fri Nov 20 01:18:49 CET 2009. -------- --- OpenOffice_org-icon-themes/OpenOffice_org-icon-themes.changes 2009-10-20 17:17:01.000000000 +0200 +++ /mounts/work_src_done/STABLE/OpenOffice_org-icon-themes/OpenOffice_org-icon-themes.changes 2009-11-13 18:37:10.000000000 +0100 @@ -1,0 +2,10 @@ +Fri Nov 13 17:34:52 CET 2009 - pmladek(a)suse.cz + +- updated to version 3.1.99.2 + +------------------------------------------------------------------- +Thu Oct 29 22:57:28 CET 2009 - pmladek(a)suse.cz + +- updated to version 3.1.99.1 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-icon-themes.spec ++++++ --- /var/tmp/diff_new_pack.RQr0m0/_old 2009-11-20 01:16:50.000000000 +0100 +++ /var/tmp/diff_new_pack.RQr0m0/_new 2009-11-20 01:16:50.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-icon-themes (Version 3.1.1.4) +# spec file for package OpenOffice_org-icon-themes (Version 3.1.99.2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,11 +19,11 @@ Name: OpenOffice_org-icon-themes -Version: 3.1.1.4 +Version: 3.1.99.2 Release: 1 -%define ooo_build_version 3.1.1.4 +%define ooo_build_version 3.1.99.2 BuildRequires: OpenOffice_org-icon-themes-prebuilt = %version -%define ooo_basis_dir basis3.1 +%define ooo_basis_dir basis3.2 %define ooo_home ooo3 License: LGPL v2.1 only ; LGPL v3 only Group: Productivity/Office/Suite ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit OpenOffice_org-help-en-US for openSUSE:Factory
by root＠Hilbert.suse.de 20 Nov '09

20 Nov '09

Hello community, here is the log from the commit of package OpenOffice_org-help-en-US for openSUSE:Factory checked in at Fri Nov 20 01:16:34 CET 2009. -------- --- OpenOffice_org-help-en-US/OpenOffice_org-help-en-US.changes 2009-10-20 17:16:48.000000000 +0200 +++ /mounts/work_src_done/STABLE/OpenOffice_org-help-en-US/OpenOffice_org-help-en-US.changes 2009-11-13 18:36:53.000000000 +0100 @@ -1,0 +2,13 @@ +Fri Nov 13 17:34:52 CET 2009 - pmladek(a)suse.cz + +- updated to the milestone ooo320-m4 +- updated ooo-build to version 3.1.99.2 (3.2-beta2) + +------------------------------------------------------------------- +Thu Oct 29 22:57:28 CET 2009 - pmladek(a)suse.cz + +- updated to the milestone ooo320-m2 +- updated ooo-build to version 3.1.99.1 (3.2-beta1) +- added perl-Archive-Zip into BuildRequires + +------------------------------------------------------------------- --- OpenOffice_org-help-en-US/OpenOffice_org-help-group1.changes 2009-10-20 17:16:51.000000000 +0200 +++ /mounts/work_src_done/STABLE/OpenOffice_org-help-en-US/OpenOffice_org-help-group1.changes 2009-11-13 18:36:54.000000000 +0100 @@ -1,0 +2,15 @@ +Fri Nov 13 17:34:52 CET 2009 - pmladek(a)suse.cz + +- updated to the milestone ooo320-m4 +- updated ooo-build to version 3.1.99.2 (3.2-beta2) +- added perl-Compress-Zlib into BuildRequires for SLED10; needed by + perl-Archive-Zip; was included in the main perl package on newer distros + +------------------------------------------------------------------- +Thu Oct 29 22:57:28 CET 2009 - pmladek(a)suse.cz + +- updated to the milestone ooo320-m2 +- updated ooo-build to version 3.1.99.1 (3.2-beta1) +- added perl-Archive-Zip into BuildRequires + +------------------------------------------------------------------- OpenOffice_org-help-group2.changes: same change OpenOffice_org-help-group3.changes: same change OpenOffice_org-help-group4.changes: same change OpenOffice_org-help-group5.changes: same change calling whatdependson for head-i586 Old: ---- ooo310-m19-help.tar.bz2 New: ---- ooo320-m4-help.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-help-en-US.spec ++++++ --- /var/tmp/diff_new_pack.sJn5tx/_old 2009-11-20 01:14:51.000000000 +0100 +++ /var/tmp/diff_new_pack.sJn5tx/_new 2009-11-20 01:14:51.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-help-en-US (Version 3.1.1.4) +# spec file for package OpenOffice_org-help-en-US (Version 3.1.99.2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,24 +19,27 @@ Name: OpenOffice_org-help-en-US -Version: 3.1.1.4 +Version: 3.1.99.2 Release: 1 -%define ooo_build_version 3.1.1.4 +%define ooo_build_version 3.1.99.2 %define piece help %define ooo_langs "en-US" -%define ooo_basis_dir basis3.1 +%define ooo_basis_dir basis3.2 %define ooo_home ooo3 #!BuildIgnore: OpenOffice_org -BuildRequires: java-devel unzip zip +# both zip and perl-Archive-Zip are needed; tested with ooo320-m3, 2009-10-22 +BuildRequires: java-devel perl-Archive-Zip unzip zip BuildRequires: OpenOffice_org-artwork-devel = %version BuildRequires: OpenOffice_org-libs-core-devel = %version %if %suse_version == 1010 # is not required by Java SDKs by mistake on SLED10 BuildRequires: update-alternatives +# needed by perl-Archive-Zip; is included in main perl package on newer distros +BuildRequires: perl-Compress-Zlib %endif %define ooo_prefix %_libdir %define ooo_home ooo3 -%define ooo_build_tag ooo310-m19 +%define ooo_build_tag ooo320-m4 License: LGPL v3 only Group: Productivity/Office/Suite AutoReqProv: on @@ -77,7 +80,9 @@ %prep -%setup -q -a1 -n %ooo_build_tag-%piece +%setup -c -q -a1 -n %ooo_build_tag-%piece +# hack to move sources to a reasonable location +mv ooo/*/* . && rm -rf ooo %build # setup env. ++++++ OpenOffice_org-help-group1.spec ++++++ --- /var/tmp/diff_new_pack.sJn5tx/_old 2009-11-20 01:14:51.000000000 +0100 +++ /var/tmp/diff_new_pack.sJn5tx/_new 2009-11-20 01:14:51.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-help-group1 (Version 3.1.1.4) +# spec file for package OpenOffice_org-help-group1 (Version 3.1.99.2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,9 +19,9 @@ Name: OpenOffice_org-help-group1 -Version: 3.1.1.4 +Version: 3.1.99.2 Release: 1 -%define ooo_build_version 3.1.1.4 +%define ooo_build_version 3.1.99.2 %define piece help # test_build_langs: 1 = de and cs # 2 = all supported languages @@ -43,19 +43,22 @@ %define ooo_langs "ar cs da de en-GB" %endif %endif -%define ooo_basis_dir basis3.1 +%define ooo_basis_dir basis3.2 %define ooo_home ooo3 #!BuildIgnore: OpenOffice_org -BuildRequires: java-devel unzip zip +# both zip and perl-Archive-Zip are needed; tested with ooo320-m3, 2009-10-22 +BuildRequires: java-devel perl-Archive-Zip unzip zip BuildRequires: OpenOffice_org-artwork-devel = %version BuildRequires: OpenOffice_org-libs-core-devel = %version %if %suse_version == 1010 # is not required by Java SDKs by mistake on SLED10 BuildRequires: update-alternatives +# needed by perl-Archive-Zip; is included in main perl package on newer distros +BuildRequires: perl-Compress-Zlib %endif %define ooo_prefix %_libdir %define ooo_home ooo3 -%define ooo_build_tag ooo310-m19 +%define ooo_build_tag ooo320-m4 License: LGPL v3 only Group: Productivity/Office/Suite AutoReqProv: on @@ -167,7 +170,9 @@ %endif %prep -%setup -q -a1 -n %ooo_build_tag-%piece +%setup -c -q -a1 -n %ooo_build_tag-%piece +# hack to move sources to a reasonable location +mv ooo/*/* . && rm -rf ooo %build # setup env. ++++++ OpenOffice_org-help-group2.spec ++++++ --- /var/tmp/diff_new_pack.sJn5tx/_old 2009-11-20 01:14:51.000000000 +0100 +++ /var/tmp/diff_new_pack.sJn5tx/_new 2009-11-20 01:14:51.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-help-group2 (Version 3.1.1.4) +# spec file for package OpenOffice_org-help-group2 (Version 3.1.99.2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,9 +19,9 @@ Name: OpenOffice_org-help-group2 -Version: 3.1.1.4 +Version: 3.1.99.2 Release: 1 -%define ooo_build_version 3.1.1.4 +%define ooo_build_version 3.1.99.2 %define piece help # test_build_langs: 1 = de and cs # 2 = all supported languages @@ -43,19 +43,22 @@ %define ooo_langs "en-ZA es et fr gl" %endif %endif -%define ooo_basis_dir basis3.1 +%define ooo_basis_dir basis3.2 %define ooo_home ooo3 #!BuildIgnore: OpenOffice_org -BuildRequires: java-devel unzip zip +# both zip and perl-Archive-Zip are needed; tested with ooo320-m3, 2009-10-22 +BuildRequires: java-devel perl-Archive-Zip unzip zip BuildRequires: OpenOffice_org-artwork-devel = %version BuildRequires: OpenOffice_org-libs-core-devel = %version %if %suse_version == 1010 # is not required by Java SDKs by mistake on SLED10 BuildRequires: update-alternatives +# needed by perl-Archive-Zip; is included in main perl package on newer distros +BuildRequires: perl-Compress-Zlib %endif %define ooo_prefix %_libdir %define ooo_home ooo3 -%define ooo_build_tag ooo310-m19 +%define ooo_build_tag ooo320-m4 License: LGPL v3 only Group: Productivity/Office/Suite AutoReqProv: on @@ -155,7 +158,9 @@ %endif %prep -%setup -q -a1 -n %ooo_build_tag-%piece +%setup -c -q -a1 -n %ooo_build_tag-%piece +# hack to move sources to a reasonable location +mv ooo/*/* . && rm -rf ooo %build # setup env. ++++++ OpenOffice_org-help-group3.spec ++++++ --- /var/tmp/diff_new_pack.sJn5tx/_old 2009-11-20 01:14:51.000000000 +0100 +++ /var/tmp/diff_new_pack.sJn5tx/_new 2009-11-20 01:14:51.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-help-group3 (Version 3.1.1.4) +# spec file for package OpenOffice_org-help-group3 (Version 3.1.99.2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,9 +19,9 @@ Name: OpenOffice_org-help-group3 -Version: 3.1.1.4 +Version: 3.1.99.2 Release: 1 -%define ooo_build_version 3.1.1.4 +%define ooo_build_version 3.1.99.2 %define piece help # test_build_langs: 1 = de and cs # 2 = all supported languages @@ -43,19 +43,22 @@ %define ooo_langs "gu-IN hi-IN hu it ja km" %endif %endif -%define ooo_basis_dir basis3.1 +%define ooo_basis_dir basis3.2 %define ooo_home ooo3 #!BuildIgnore: OpenOffice_org -BuildRequires: java-devel unzip zip +# both zip and perl-Archive-Zip are needed; tested with ooo320-m3, 2009-10-22 +BuildRequires: java-devel perl-Archive-Zip unzip zip BuildRequires: OpenOffice_org-artwork-devel = %version BuildRequires: OpenOffice_org-libs-core-devel = %version %if %suse_version == 1010 # is not required by Java SDKs by mistake on SLED10 BuildRequires: update-alternatives +# needed by perl-Archive-Zip; is included in main perl package on newer distros +BuildRequires: perl-Compress-Zlib %endif %define ooo_prefix %_libdir %define ooo_home ooo3 -%define ooo_build_tag ooo310-m19 +%define ooo_build_tag ooo320-m4 License: LGPL v3 only Group: Productivity/Office/Suite AutoReqProv: on @@ -182,7 +185,9 @@ %endif %prep -%setup -q -a1 -n %ooo_build_tag-%piece +%setup -c -q -a1 -n %ooo_build_tag-%piece +# hack to move sources to a reasonable location +mv ooo/*/* . && rm -rf ooo %build # setup env. ++++++ OpenOffice_org-help-group4.spec ++++++ --- /var/tmp/diff_new_pack.sJn5tx/_old 2009-11-20 01:14:51.000000000 +0100 +++ /var/tmp/diff_new_pack.sJn5tx/_new 2009-11-20 01:14:51.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-help-group4 (Version 3.1.1.4) +# spec file for package OpenOffice_org-help-group4 (Version 3.1.99.2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,9 +19,9 @@ Name: OpenOffice_org-help-group4 -Version: 3.1.1.4 +Version: 3.1.99.2 Release: 1 -%define ooo_build_version 3.1.1.4 +%define ooo_build_version 3.1.99.2 %define piece help # test_build_langs: 1 = de and cs # 2 = all supported languages @@ -43,19 +43,22 @@ %define ooo_langs "ko nl pa-IN pl pt" %endif %endif -%define ooo_basis_dir basis3.1 +%define ooo_basis_dir basis3.2 %define ooo_home ooo3 #!BuildIgnore: OpenOffice_org -BuildRequires: java-devel unzip zip +# both zip and perl-Archive-Zip are needed; tested with ooo320-m3, 2009-10-22 +BuildRequires: java-devel perl-Archive-Zip unzip zip BuildRequires: OpenOffice_org-artwork-devel = %version BuildRequires: OpenOffice_org-libs-core-devel = %version %if %suse_version == 1010 # is not required by Java SDKs by mistake on SLED10 BuildRequires: update-alternatives +# needed by perl-Archive-Zip; is included in main perl package on newer distros +BuildRequires: perl-Compress-Zlib %endif %define ooo_prefix %_libdir %define ooo_home ooo3 -%define ooo_build_tag ooo310-m19 +%define ooo_build_tag ooo320-m4 License: LGPL v3 only Group: Productivity/Office/Suite AutoReqProv: on @@ -155,7 +158,9 @@ %endif %prep -%setup -q -a1 -n %ooo_build_tag-%piece +%setup -c -q -a1 -n %ooo_build_tag-%piece +# hack to move sources to a reasonable location +mv ooo/*/* . && rm -rf ooo %build # setup env. ++++++ OpenOffice_org-help-group5.spec ++++++ --- /var/tmp/diff_new_pack.sJn5tx/_old 2009-11-20 01:14:51.000000000 +0100 +++ /var/tmp/diff_new_pack.sJn5tx/_new 2009-11-20 01:14:51.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-help-group5 (Version 3.1.1.4) +# spec file for package OpenOffice_org-help-group5 (Version 3.1.99.2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,9 +19,9 @@ Name: OpenOffice_org-help-group5 -Version: 3.1.1.4 +Version: 3.1.99.2 Release: 1 -%define ooo_build_version 3.1.1.4 +%define ooo_build_version 3.1.99.2 %define piece help # test_build_langs: 1 = de and cs # 2 = all supported languages @@ -43,19 +43,22 @@ %define ooo_langs "pt-BR ru sl sv zh-CN zh-TW" %endif %endif -%define ooo_basis_dir basis3.1 +%define ooo_basis_dir basis3.2 %define ooo_home ooo3 #!BuildIgnore: OpenOffice_org -BuildRequires: java-devel unzip zip +# both zip and perl-Archive-Zip are needed; tested with ooo320-m3, 2009-10-22 +BuildRequires: java-devel perl-Archive-Zip unzip zip BuildRequires: OpenOffice_org-artwork-devel = %version BuildRequires: OpenOffice_org-libs-core-devel = %version %if %suse_version == 1010 # is not required by Java SDKs by mistake on SLED10 BuildRequires: update-alternatives +# needed by perl-Archive-Zip; is included in main perl package on newer distros +BuildRequires: perl-Compress-Zlib %endif %define ooo_prefix %_libdir %define ooo_home ooo3 -%define ooo_build_tag ooo310-m19 +%define ooo_build_tag ooo320-m4 License: LGPL v3 only Group: Productivity/Office/Suite AutoReqProv: on @@ -170,7 +173,9 @@ %endif %prep -%setup -q -a1 -n %ooo_build_tag-%piece +%setup -c -q -a1 -n %ooo_build_tag-%piece +# hack to move sources to a reasonable location +mv ooo/*/* . && rm -rf ooo %build # setup env. ++++++ OpenOffice_org-help-en-US.spec.in ++++++ --- /var/tmp/diff_new_pack.sJn5tx/_old 2009-11-20 01:14:51.000000000 +0100 +++ /var/tmp/diff_new_pack.sJn5tx/_new 2009-11-20 01:14:51.000000000 +0100 @@ -20,24 +20,27 @@ @DO_NOT_EDIT_COMMENT@ Name: OpenOffice_org-help-en-US -Version: 3.1.1.4 +Version: 3.1.99.2 Release: 1 -%define ooo_build_version 3.1.1.4 +%define ooo_build_version 3.1.99.2 %define piece help %define ooo_langs "en-US" -%define ooo_basis_dir basis3.1 +%define ooo_basis_dir basis3.2 %define ooo_home ooo3 #!BuildIgnore: OpenOffice_org -BuildRequires: java-devel unzip zip +# both zip and perl-Archive-Zip are needed; tested with ooo320-m3, 2009-10-22 +BuildRequires: java-devel unzip zip perl-Archive-Zip BuildRequires: OpenOffice_org-artwork-devel = %version BuildRequires: OpenOffice_org-libs-core-devel = %version %if %suse_version == 1010 # is not required by Java SDKs by mistake on SLED10 BuildRequires: update-alternatives +# needed by perl-Archive-Zip; is included in main perl package on newer distros +BuildRequires: perl-Compress-Zlib %endif %define ooo_prefix %_libdir %define ooo_home ooo3 -%define ooo_build_tag ooo310-m19 +%define ooo_build_tag ooo320-m4 License: LGPL v3 only Group: Productivity/Office/Suite AutoReqProv: on @@ -78,7 +81,9 @@ %prep -%setup -q -a1 -n %ooo_build_tag-%piece +%setup -c -q -a1 -n %ooo_build_tag-%piece +# hack to move sources to a reasonable location +mv ooo/*/* . && rm -rf ooo %build # setup env. @@ -119,7 +124,7 @@ %_datadir/%ooo_home/link-to-ooo-home %_datadir/%ooo_home/files-%piece-devel.txt || true %preun devel -test "$1" = "0" && cp %_datadir/%ooo_home/files-%piece-devel.txt.postun %_datadir/%ooo_home/files-%piece-devel.txt.postun || true +test "$1" = "0" && cp %_datadir/%ooo_home/files-%piece-devel.txt %_datadir/%ooo_home/files-%piece-devel.txt.postun || true %postun devel test "$1" = "0" && %_datadir/%ooo_home/link-to-ooo-home --unlink %_datadir/%ooo_home/files-%piece-devel.txt.postun || true ++++++ OpenOffice_org-help-groupX.spec.in ++++++ --- /var/tmp/diff_new_pack.sJn5tx/_old 2009-11-20 01:14:51.000000000 +0100 +++ /var/tmp/diff_new_pack.sJn5tx/_new 2009-11-20 01:14:51.000000000 +0100 @@ -20,9 +20,9 @@ @DO_NOT_EDIT_COMMENT@ Name: OpenOffice_org-help-group@GROUP_NUMBER@ -Version: 3.1.1.4 +Version: 3.1.99.2 Release: 1 -%define ooo_build_version 3.1.1.4 +%define ooo_build_version 3.1.99.2 %define piece help # test_build_langs: 1 = de and cs # 2 = all supported languages @@ -44,19 +44,22 @@ %define ooo_langs "@OOO_LANGS_MIN_2@" %endif %endif -%define ooo_basis_dir basis3.1 +%define ooo_basis_dir basis3.2 %define ooo_home ooo3 #!BuildIgnore: OpenOffice_org -BuildRequires: java-devel unzip zip +# both zip and perl-Archive-Zip are needed; tested with ooo320-m3, 2009-10-22 +BuildRequires: java-devel unzip zip perl-Archive-Zip BuildRequires: OpenOffice_org-artwork-devel = %version BuildRequires: OpenOffice_org-libs-core-devel = %version %if %suse_version == 1010 # is not required by Java SDKs by mistake on SLED10 BuildRequires: update-alternatives +# needed by perl-Archive-Zip; is included in main perl package on newer distros +BuildRequires: perl-Compress-Zlib %endif %define ooo_prefix %_libdir %define ooo_home ooo3 -%define ooo_build_tag ooo310-m19 +%define ooo_build_tag ooo320-m4 License: LGPL v3 only Group: Productivity/Office/Suite AutoReqProv: on @@ -79,7 +82,9 @@ @SUBPACKAGES_METAINFO@ %prep -%setup -q -a1 -n %ooo_build_tag-%piece +%setup -c -q -a1 -n %ooo_build_tag-%piece +# hack to move sources to a reasonable location +mv ooo/*/* . && rm -rf ooo %build # setup env. ++++++ ooo310-m19-help.tar.bz2 -> ooo320-m4-help.tar.bz2 ++++++ OpenOffice_org-help-en-US/ooo310-m19-help.tar.bz2 /mounts/work_src_done/STABLE/OpenOffice_org-help-en-US/ooo320-m4-help.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit OpenOffice_org-filters for openSUSE:Factory
by root＠Hilbert.suse.de 20 Nov '09

20 Nov '09

Hello community, here is the log from the commit of package OpenOffice_org-filters for openSUSE:Factory checked in at Fri Nov 20 01:14:10 CET 2009. -------- --- OpenOffice_org-filters/OpenOffice_org-filters.changes 2009-10-20 17:16:45.000000000 +0200 +++ /mounts/work_src_done/STABLE/OpenOffice_org-filters/OpenOffice_org-filters.changes 2009-11-13 18:36:43.000000000 +0100 @@ -1,0 +2,12 @@ +Fri Nov 13 17:34:52 CET 2009 - pmladek(a)suse.cz + +- updated to the milestone ooo320-m4 +- updated ooo-build to version 3.1.99.2 (3.2-beta2) + +------------------------------------------------------------------- +Thu Oct 29 22:57:28 CET 2009 - pmladek(a)suse.cz + +- updated to the milestone ooo320-m2 +- updated ooo-build to version 3.1.99.1 (3.2-beta1) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- docx-import-fixes-pieces.diff ooo310-m19-filters.tar.bz2 New: ---- ooo320-m4-filters.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-filters.spec ++++++ --- /var/tmp/diff_new_pack.qTBwYL/_old 2009-11-20 01:11:43.000000000 +0100 +++ /var/tmp/diff_new_pack.qTBwYL/_new 2009-11-20 01:11:43.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-filters (Version 3.1.1.4) +# spec file for package OpenOffice_org-filters (Version 3.1.99.2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,9 +19,9 @@ Name: OpenOffice_org-filters -Version: 3.1.1.4 +Version: 3.1.99.2 Release: 1 -%define ooo_build_version 3.1.1.4 +%define ooo_build_version 3.1.99.2 %define piece filters #!BuildIgnore: OpenOffice_org 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 @@ -41,7 +41,7 @@ %endif %define ooo_prefix %_libdir %define ooo_home ooo3 -%define ooo_build_tag ooo310-m19 +%define ooo_build_tag ooo320-m4 License: LGPL v3 only Group: Productivity/Office/Suite AutoReqProv: on @@ -57,8 +57,6 @@ %define __find_requires /bin/sh %_sourcedir/ooo-filters-req %name Source100: ooo-filters-prov Source101: ooo-filters-req -# FIXME: hotfixes -Patch990: docx-import-fixes-pieces.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 ppc @@ -137,10 +135,9 @@ %prep -%setup -q -a1 -n %ooo_build_tag-%piece -# hotfixes -mkdir -p ooo-build/hotfixes -cp %{P:990} ooo-build/hotfixes +%setup -c -q -a1 -n %ooo_build_tag-%piece +# hack to move sources to a reasonable location +mv ooo/*/* . && rm -rf ooo %build # setup env. ++++++ ooo310-m19-filters.tar.bz2 -> ooo320-m4-filters.tar.bz2 ++++++ OpenOffice_org-filters/ooo310-m19-filters.tar.bz2 /mounts/work_src_done/STABLE/OpenOffice_org-filters/ooo320-m4-filters.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit OpenOffice_org-extensions for openSUSE:Factory
by root＠Hilbert.suse.de 20 Nov '09

20 Nov '09

Hello community, here is the log from the commit of package OpenOffice_org-extensions for openSUSE:Factory checked in at Fri Nov 20 01:11:32 CET 2009. -------- --- OpenOffice_org-extensions/OpenOffice_org-extensions.changes 2009-10-20 17:16:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/OpenOffice_org-extensions/OpenOffice_org-extensions.changes 2009-11-13 18:36:32.000000000 +0100 @@ -1,0 +2,20 @@ +Fri Nov 13 17:34:52 CET 2009 - pmladek(a)suse.cz + +- updated to the milestone ooo320-m4 +- updated ooo-build to version 3.1.99.2 (3.2-beta2) + +------------------------------------------------------------------- +Thu Oct 29 22:57:28 CET 2009 - pmladek(a)suse.cz + +- updated to the milestone ooo320-m2 +- updated ooo-build to version 3.1.99.1 (3.2-beta1) +- added ant-nodeps and OpenOffice_org-filters-devel into BuildRequires +- added NLPSolver extension (fate#304653) +- added oooblogger extension (fate#304555) +- added Google Docs and Zoho extension (fate#304577) +- added CDDL into the license tag; some parts of Google Docs and Zoho extension + are under this license +- removed strict dependency on jre-32 >= 1.6 for openSUSE <= 11.1; + it was not provided by openjdk there + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- ooo310-m19-extensions.tar.bz2 New: ---- gdocs-1.8.2-src.tar.bz2 gdocs-1.8.2.patch gdocs_1.8.2_modified.oxt nlpsolver-0.9.tar.bz2 ooo320-m4-extensions.tar.bz2 oooblogger-0.1.oxt ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-extensions.spec ++++++ --- /var/tmp/diff_new_pack.9LgaiA/_old 2009-11-20 01:08:52.000000000 +0100 +++ /var/tmp/diff_new_pack.9LgaiA/_new 2009-11-20 01:08:52.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-extensions (Version 3.1.1.4) +# spec file for package OpenOffice_org-extensions (Version 3.1.99.2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,16 +19,18 @@ Name: OpenOffice_org-extensions -Version: 3.1.1.4 +Version: 3.1.99.2 Release: 1 -%define ooo_build_version 3.1.1.4 +%define ooo_build_version 3.1.99.2 %define piece extensions #!BuildIgnore: OpenOffice_org -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 python-xml recode unixODBC-devel unzip xml-commons-apis xorg-x11 zip +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 BuildRequires: OpenOffice_org-l10n-extras-devel = %version BuildRequires: OpenOffice_org-components-devel = %version BuildRequires: OpenOffice_org-artwork-devel = %version +# filters-devel provides odt2mediawiki.xsl and other files for the mediawiki extension +BuildRequires: OpenOffice_org-filters-devel = %version # poppler is needed to build the PDF import extension # the needed version 0.8.0 has been avaiable only since openSUSE-11.0 %if %suse_version >= 1100 @@ -36,8 +38,8 @@ %endif %define ooo_prefix %_libdir %define ooo_home ooo3 -%define ooo_build_tag ooo310-m19 -License: LGPL v2.1 or later ; LGPL v3 only ; Other uncritical OpenSource License ; Apache Software License .. +%define ooo_build_tag ooo320-m4 +License: LGPL v2.1 or later ; LGPL v3 only ; Other uncritical OpenSource License ; Apache Software License .. ; CDDL Group: Productivity/Office/Suite AutoReqProv: on Requires: OpenOffice_org-libs-core = %version @@ -46,6 +48,13 @@ Source0: %ooo_build_tag-%piece.tar.bz2 Source1: ooo-sdf-%piece.tar.bz2 Source2: README-scsolver.txt +Source3: nlpsolver-0.9.tar.bz2 +# prebuilt extensions +Source100: gdocs_1.8.2_modified.oxt +Source101: oooblogger-0.1.oxt +# FIXME: this is just because of license; we do not build gdocs from sources now +Source500: gdocs-1.8.2-src.tar.bz2 +Source501: gdocs-1.8.2.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 ppc @@ -123,13 +132,19 @@ %if %suse_version > 1020 %ifarch %ix86 ppc # the 32-bit build requires 32-bit JRE, bnc#222708 -Requires: jre-32 > 1.5 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 -Requires: jre-64 > 1.5 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 @@ -167,9 +182,22 @@ # Calc solver has been completely removed in 3.0.99.6 (bnc#523588) if unopkg list --shared | grep -q "org.go-oo.CalcSolver" ; then unopkg remove --shared org.go-oo.CalcSolver || true; + fi + unopkg remove --shared com.sun.star.comp.Calc.NLPSolver || true; + # clear disk cache + unopkg list --shared > /dev/null 2>&1 || true +fi + +%post -n OpenOffice_org-calc-extensions +echo "Registering OpenOffice.org Calc extensions..." +unopkg add --shared --force %ooo_prefix/%ooo_home/share/extension/install/NLPSolver.oxt || true; + +%preun -n OpenOffice_org-calc-extensions +if test $1 = 0 ; then + echo "Unregistering OpenOffice.org Calc extensions..." + unopkg remove --shared com.sun.star.comp.Calc.NLPSolver || true; # clear disk cache unopkg list --shared > /dev/null 2>&1 || true - fi fi # draw @@ -221,6 +249,8 @@ %pre -n OpenOffice_org-writer-extensions if test $1 -gt 1 ; then echo "Unregistering the older OpenOffice.org Writer extensions..." + unopkg remove --shared org.openoffice.gdocs.oxt || true; + unopkg remove --shared org.openoffice.caolan.blogger || true; unopkg remove --shared com.sun.wiki-publisher || true; # clear disk cache unopkg list --shared > /dev/null 2>&1 || true @@ -228,19 +258,28 @@ %post -n OpenOffice_org-writer-extensions echo "Registering OpenOffice.org Writer extensions..." +unopkg add --shared --force %ooo_prefix/%ooo_home/share/extension/install/gdocs_1.8.2_modified.oxt || true; +unopkg add --shared --force %ooo_prefix/%ooo_home/share/extension/install/oooblogger-0.1.oxt || true; unopkg add --shared --force %ooo_prefix/%ooo_home/share/extension/install/wiki-publisher.oxt || true; %preun -n OpenOffice_org-writer-extensions if test $1 = 0 ; then echo "Unregistering OpenOffice.org Writer extensions..." + unopkg remove --shared org.openoffice.gdocs.oxt || true; + unopkg remove --shared org.openoffice.caolan.blogger || true; unopkg remove --shared com.sun.wiki-publisher || true; # clear disk cache unopkg list --shared > /dev/null 2>&1 || true fi %prep -%setup -q -a1 -n %ooo_build_tag-%piece +%setup -c -q -a1 -n %ooo_build_tag-%piece +# hack to move sources to a reasonable location +mv ooo/*/* . && rm -rf ooo cp %{S:2} . +# nlpsolver stuff +mkdir -p nlpsolver/download +cp %{S:3} nlpsolver/download %build # setup env. @@ -256,6 +295,8 @@ # hack to install the extensions mkdir -p $RPM_BUILD_ROOT%ooo_prefix/%ooo_home/share/extension/install find . -name "*.oxt" -exec cp {} $RPM_BUILD_ROOT%ooo_prefix/%ooo_home/share/extension/install \; +# prebuilt extensions +cp %{S:100} %{S:101} $RPM_BUILD_ROOT%ooo_prefix/%ooo_home/share/extension/install %clean rm -rf $RPM_BUILD_ROOT @@ -267,6 +308,7 @@ %files -n OpenOffice_org-calc-extensions %defattr(-,root,root) %doc README-scsolver.txt +%ooo_prefix/%ooo_home/share/extension/install/NLPSolver.oxt %files -n OpenOffice_org-draw-extensions %defattr(-,root,root) @@ -279,6 +321,8 @@ %files -n OpenOffice_org-writer-extensions %defattr(-,root,root) +%ooo_prefix/%ooo_home/share/extension/install/oooblogger-0.1.oxt +%ooo_prefix/%ooo_home/share/extension/install/gdocs_1.8.2_modified.oxt %ooo_prefix/%ooo_home/share/extension/install/wiki-publisher.oxt %changelog ++++++ gdocs-1.8.2.patch ++++++ diff -u -EbwB --strip-trailing-cr -r -N Addons.xcu gdocs-1.8.1/Addons.xcu --- Addons.xcu 2009-10-29 10:42:45.000000000 +0100 +++ Addons.xcu 2009-10-29 10:42:32.000000000 +0100 @@ -1,4 +1,4 @@ -<?xml version='1.0' encoding='UTF-8'?> +<?xml version="1.0" encoding="UTF-8"?> <oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="Addons" oor:package="org.openoffice.Office"> <node oor:name="AddonUI"> <node oor:name="OfficeMenuBarMerging"> @@ -184,7 +179,6 @@ </prop> <prop oor:name="Context" oor:type="xs:string"> <value>com.sun.star.sheet.SpreadsheetDocument,com.sun.star.text.TextDocument,com.sun.star.presentation.PresentationDocument</value> - <value/> </prop> <prop oor:name="Title" oor:type="xs:string"> <value/> @@ -206,7 +199,7 @@ <value>_self</value> </prop> <prop oor:name="Context" oor:type="xs:string"> - <value/> + <value>com.sun.star.sheet.SpreadsheetDocument,com.sun.star.text.TextDocument,com.sun.star.presentation.PresentationDocument</value> </prop> <prop oor:name="Title" oor:type="xs:string"> <value/> @@ -229,7 +221,6 @@ </prop> <prop oor:name="Context" oor:type="xs:string"> <value>com.sun.star.sheet.SpreadsheetDocument,com.sun.star.text.TextDocument,com.sun.star.presentation.PresentationDocument</value> - <value/> </prop> <prop oor:name="Title" oor:type="xs:string"> <value/> @@ -251,7 +241,7 @@ <value>_self</value> </prop> <prop oor:name="Context" oor:type="xs:string"> - <value/> + <value>com.sun.star.sheet.SpreadsheetDocument,com.sun.star.text.TextDocument,com.sun.star.presentation.PresentationDocument</value> </prop> <prop oor:name="Title" oor:type="xs:string"> <value/> @@ -273,7 +262,7 @@ <value>_self</value> </prop> <prop oor:name="Context" oor:type="xs:string"> - <value/> + <value>com.sun.star.sheet.SpreadsheetDocument,com.sun.star.text.TextDocument,com.sun.star.presentation.PresentationDocument</value> </prop> <prop oor:name="Title" oor:type="xs:string"> <value/> @@ -293,6 +281,15 @@ <prop oor:name="ImageSmallURL"> <value>%origin%/images/ooo2gd.png</value> </prop> + <prop oor:name="ImageBigURL"> + <value>%origin%/images/ooo2gd.png</value> + </prop> + <prop oor:name="ImageSmallHCURL"> + <value>%origin%/images/ooo2gd.png</value> + </prop> + <prop oor:name="ImageBigHCURL"> + <value>%origin%/images/ooo2gd.png</value> + </prop> </node> </node> <node oor:name="org.openoffice.gdocs.gdocs.export.images" oor:op="replace"> @@ -303,6 +300,15 @@ <prop oor:name="ImageSmallURL"> <value>%origin%/images/upload-doc.png</value> </prop> + <prop oor:name="ImageBigURL"> + <value>%origin%/images/upload-doc.png</value> + </prop> + <prop oor:name="ImageSmallHCURL"> + <value>%origin%/images/upload-doc.png</value> + </prop> + <prop oor:name="ImageBigHCURL"> + <value>%origin%/images/upload-doc.png</value> + </prop> </node> </node> <node oor:name="org.openoffice.gdocs.gdocs.import.images" oor:op="replace"> @@ -313,9 +319,17 @@ <prop oor:name="ImageSmallURL"> <value>%origin%/images/download-doc.png</value> </prop> + <prop oor:name="ImageBigURL"> + <value>%origin%/images/download-doc.png</value> + </prop> + <prop oor:name="ImageSmallHCURL"> + <value>%origin%/images/download-doc.png</value> + </prop> + <prop oor:name="ImageBigHCURL"> + <value>%origin%/images/download-doc.png</value> + </prop> </node> </node> - <node oor:name="org.openoffice.gdocs.gdocs.export.zoho.images" oor:op="replace"> <prop oor:name="URL" oor:type="xs:string"> <value>org.openoffice.gdocs.gdocs:Export to Zoho</value> @@ -324,9 +338,17 @@ <prop oor:name="ImageSmallURL"> <value>%origin%/images/upload-zoho.png</value> </prop> + <prop oor:name="ImageBigURL"> + <value>%origin%/images/upload-zoho.png</value> + </prop> + <prop oor:name="ImageSmallHCURL"> + <value>%origin%/images/upload-zoho.png</value> + </prop> + <prop oor:name="ImageBigHCURL"> + <value>%origin%/images/upload-zoho.png</value> + </prop> </node> </node> - <node oor:name="org.openoffice.gdocs.gdocs.import.zoho.images" oor:op="replace"> <prop oor:name="URL" oor:type="xs:string"> <value>org.openoffice.gdocs.gdocs:Import from Zoho</value> @@ -335,9 +357,17 @@ <prop oor:name="ImageSmallURL"> <value>%origin%/images/download-zoho.png</value> </prop> + <prop oor:name="ImageBigURL"> + <value>%origin%/images/download-zoho.png</value> + </prop> + <prop oor:name="ImageSmallHCURL"> + <value>%origin%/images/download-zoho.png</value> + </prop> + <prop oor:name="ImageBigHCURL"> + <value>%origin%/images/download-zoho.png</value> + </prop> </node> </node> - <node oor:name="org.openoffice.gdocs.gdocs.export.webdev.images" oor:op="replace"> <prop oor:name="URL" oor:type="xs:string"> <value>org.openoffice.gdocs.gdocs:ExportWebDAV</value> @@ -346,10 +376,17 @@ <prop oor:name="ImageSmallURL"> <value>%origin%/images/upload-webdav.png</value> </prop> + <prop oor:name="ImageBigURL"> + <value>%origin%/images/upload-webdav.png</value> + </prop> + <prop oor:name="ImageSmallHCURL"> + <value>%origin%/images/upload-webdav.png</value> + </prop> + <prop oor:name="ImageBigHCURL"> + <value>%origin%/images/upload-webdav.png</value> + </prop> </node> </node> - - </node> </node> </oor:component-data> diff -u -EbwB --strip-trailing-cr -r -N BaseWindowState.xcu gdocs-1.8.1/BaseWindowState.xcu --- BaseWindowState.xcu 1970-01-01 01:00:00.000000000 +0100 +++ BaseWindowState.xcu 2009-10-29 10:42:32.000000000 +0100 @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="BaseWindowState" oor:package="org.openoffice.Office.UI"> + <node oor:name="UIElements"> + <node oor:name="States"> + <node oor:name="private:resource/toolbar/addon_org.openoffice.gdocs.gdocs" oor:op="replace"> + <prop oor:name="UIName" oor:type="xs:string"> + <value>Google Docs & Zoho</value> + </prop> + </node> + </node> + </node> +</oor:component-data> diff -u -EbwB --strip-trailing-cr -r -N BasicIDEWindowState.xcu gdocs-1.8.1/BasicIDEWindowState.xcu --- BasicIDEWindowState.xcu 1970-01-01 01:00:00.000000000 +0100 +++ BasicIDEWindowState.xcu 2009-10-29 10:42:32.000000000 +0100 @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="BasicIDEWindowState" oor:package="org.openoffice.Office.UI"> + <node oor:name="UIElements"> + <node oor:name="States"> + <node oor:name="private:resource/toolbar/addon_org.openoffice.gdocs.gdocs" oor:op="replace"> + <prop oor:name="UIName" oor:type="xs:string"> + <value>Google Docs & Zoho</value> + </prop> + </node> + </node> + </node> +</oor:component-data> diff -u -EbwB --strip-trailing-cr -r -N CalcWindowState.xcu gdocs-1.8.1/CalcWindowState.xcu --- CalcWindowState.xcu 1970-01-01 01:00:00.000000000 +0100 +++ CalcWindowState.xcu 2009-10-29 10:42:32.000000000 +0100 @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="CalcWindowState" oor:package="org.openoffice.Office.UI"> + <node oor:name="UIElements"> + <node oor:name="States"> + <node oor:name="private:resource/toolbar/addon_org.openoffice.gdocs.gdocs" oor:op="replace"> + <prop oor:name="UIName" oor:type="xs:string"> + <value>Google Docs & Zoho</value> + </prop> + </node> + </node> + </node> +</oor:component-data> diff -u -EbwB --strip-trailing-cr -r -N DrawWindowState.xcu gdocs-1.8.1/DrawWindowState.xcu --- DrawWindowState.xcu 1970-01-01 01:00:00.000000000 +0100 +++ DrawWindowState.xcu 2009-10-29 10:42:32.000000000 +0100 @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="DrawWindowState" oor:package="org.openoffice.Office.UI"> + <node oor:name="UIElements"> + <node oor:name="States"> + <node oor:name="private:resource/toolbar/addon_org.openoffice.gdocs.gdocs" oor:op="replace"> + <prop oor:name="UIName" oor:type="xs:string"> + <value>Google Docs & Zoho</value> + </prop> + </node> + </node> + </node> +</oor:component-data> diff -u -EbwB --strip-trailing-cr -r -N ImpressWindowState.xcu gdocs-1.8.1/ImpressWindowState.xcu --- ImpressWindowState.xcu 1970-01-01 01:00:00.000000000 +0100 +++ ImpressWindowState.xcu 2009-10-29 10:42:32.000000000 +0100 @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="ImpressWindowState" oor:package="org.openoffice.Office.UI"> + <node oor:name="UIElements"> + <node oor:name="States"> + <node oor:name="private:resource/toolbar/addon_org.openoffice.gdocs.gdocs" oor:op="replace"> + <prop oor:name="UIName" oor:type="xs:string"> + <value>Google Docs & Zoho</value> + </prop> + </node> + </node> + </node> +</oor:component-data> diff -u -EbwB --strip-trailing-cr -r -N MathWindowState.xcu gdocs-1.8.1/MathWindowState.xcu --- MathWindowState.xcu 1970-01-01 01:00:00.000000000 +0100 +++ MathWindowState.xcu 2009-10-29 10:42:32.000000000 +0100 @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="MathWindowState" oor:package="org.openoffice.Office.UI"> + <node oor:name="UIElements"> + <node oor:name="States"> + <node oor:name="private:resource/toolbar/addon_org.openoffice.gdocs.gdocs" oor:op="replace"> + <prop oor:name="UIName" oor:type="xs:string"> + <value>Google Docs & Zoho</value> + </prop> + </node> + </node> + </node> +</oor:component-data> diff -u -EbwB --strip-trailing-cr -r -N META-INF/manifest.xml gdocs-1.8.1/META-INF/manifest.xml --- META-INF/manifest.xml 2009-10-05 22:53:54.000000000 +0200 +++ META-INF/manifest.xml 2009-10-21 10:17:56.000000000 +0200 @@ -1,9 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest"> - <manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-component;type=Java" - manifest:full-path="GDocs.jar"/> - <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data" - manifest:full-path="ProtocolHandler.xcu"/> - <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data" - manifest:full-path="Addons.xcu"/> + <manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-component;type=Java" manifest:full-path="GDocs.jar"/> + <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data" manifest:full-path="ProtocolHandler.xcu"/> + <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data" manifest:full-path="Addons.xcu"/> + <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data" manifest:full-path="CalcWindowState.xcu"/> + <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data" manifest:full-path="StartModuleWindowState.xcu"/> + <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data" manifest:full-path="WriterWindowState.xcu"/> + <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data" manifest:full-path="BaseWindowState.xcu"/> + <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data" manifest:full-path="ImpressWindowState.xcu"/> + <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data" manifest:full-path="BasicIDEWindowState.xcu"/> + <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data" manifest:full-path="MathWindowState.xcu"/> + <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data" manifest:full-path="DrawWindowState.xcu"/> </manifest:manifest> \ No newline at end of file diff -u -EbwB --strip-trailing-cr -r -N ProtocolHandler.xcu gdocs-1.8.1/ProtocolHandler.xcu --- ProtocolHandler.xcu 2009-10-29 10:42:45.000000000 +0100 +++ ProtocolHandler.xcu 2009-10-29 10:42:32.000000000 +0100 @@ -1,6 +1,5 @@ -<?xml version='1.0' encoding='UTF-8'?> - -<oor:component-data oor:name="ProtocolHandler" oor:package="org.openoffice.Office" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> +<?xml version="1.0" encoding="UTF-8"?> +<oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oor:name="ProtocolHandler" oor:package="org.openoffice.Office"> <node oor:name="HandlerSet"> <node oor:name="org.openoffice.gdocs.GDocs" oor:op="replace"> <prop oor:name="Protocols" oor:type="oor:string-list"> diff -u -EbwB --strip-trailing-cr -r -N StartModuleWindowState.xcu gdocs-1.8.1/StartModuleWindowState.xcu --- StartModuleWindowState.xcu 1970-01-01 01:00:00.000000000 +0100 +++ StartModuleWindowState.xcu 2009-10-29 10:42:32.000000000 +0100 @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="StartModuleWindowState" oor:package="org.openoffice.Office.UI"> + <node oor:name="UIElements"> + <node oor:name="States"> + <node oor:name="private:resource/toolbar/addon_org.openoffice.gdocs.gdocs" oor:op="replace"> + <prop oor:name="UIName" oor:type="xs:string"> + <value>Google Docs & Zoho</value> + </prop> + </node> + </node> + </node> +</oor:component-data> diff -u -EbwB --strip-trailing-cr -r -N WriterWindowState.xcu gdocs-1.8.1/WriterWindowState.xcu --- WriterWindowState.xcu 1970-01-01 01:00:00.000000000 +0100 +++ WriterWindowState.xcu 2009-10-29 10:42:32.000000000 +0100 @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="WriterWindowState" oor:package="org.openoffice.Office.UI"> + <node oor:name="UIElements"> + <node oor:name="States"> + <node oor:name="private:resource/toolbar/addon_org.openoffice.gdocs.gdocs" oor:op="replace"> + <prop oor:name="UIName" oor:type="xs:string"> + <value>Google Docs & Zoho</value> + </prop> + </node> + </node> + </node> +</oor:component-data> ++++++ ooo310-m19-extensions.tar.bz2 -> ooo320-m4-extensions.tar.bz2 ++++++ OpenOffice_org-extensions/ooo310-m19-extensions.tar.bz2 /mounts/work_src_done/STABLE/OpenOffice_org-extensions/ooo320-m4-extensions.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit OpenOffice_org-components for openSUSE:Factory
by root＠Hilbert.suse.de 20 Nov '09

20 Nov '09

Hello community, here is the log from the commit of package OpenOffice_org-components for openSUSE:Factory checked in at Fri Nov 20 01:08:36 CET 2009. -------- --- OpenOffice_org-components/OpenOffice_org-components.changes 2009-10-20 17:16:38.000000000 +0200 +++ /mounts/work_src_done/STABLE/OpenOffice_org-components/OpenOffice_org-components.changes 2009-11-13 18:36:20.000000000 +0100 @@ -1,0 +2,12 @@ +Fri Nov 13 17:34:52 CET 2009 - pmladek(a)suse.cz + +- updated to the milestone ooo320-m4 +- updated ooo-build to version 3.1.99.2 (3.2-beta2) + +------------------------------------------------------------------- +Thu Oct 29 22:57:28 CET 2009 - pmladek(a)suse.cz + +- updated to the milestone ooo320-m2 +- updated ooo-build to version 3.1.99.1 (3.2-beta1) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- ooo310-m19-components.tar.bz2 New: ---- ooo320-m4-components.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-components.spec ++++++ --- /var/tmp/diff_new_pack.J8X2Yp/_old 2009-11-20 01:08:16.000000000 +0100 +++ /var/tmp/diff_new_pack.J8X2Yp/_new 2009-11-20 01:08:16.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-components (Version 3.1.1.4) +# spec file for package OpenOffice_org-components (Version 3.1.99.2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,9 +19,9 @@ Name: OpenOffice_org-components -Version: 3.1.1.4 +Version: 3.1.99.2 Release: 1 -%define ooo_build_version 3.1.1.4 +%define ooo_build_version 3.1.99.2 %define piece components #!BuildIgnore: OpenOffice_org BuildRequires: OpenOffice_org-artwork-devel = %version @@ -50,7 +50,7 @@ %endif %define ooo_prefix %_libdir %define ooo_home ooo3 -%define ooo_build_tag ooo310-m19 +%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) Group: Productivity/Office/Suite AutoReqProv: on @@ -142,7 +142,9 @@ %prep -%setup -q -a1 -n %ooo_build_tag-%piece +%setup -c -q -a1 -n %ooo_build_tag-%piece +# hack to move sources to a reasonable location +mv ooo/*/* . && rm -rf ooo mkdir -p ooo-build/hotfixes cp %{P:1000} ooo-build/hotfixes ++++++ ooo310-m19-components.tar.bz2 -> ooo320-m4-components.tar.bz2 ++++++ ++++ 1456693 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit OpenOffice_org-calc for openSUSE:Factory
by root＠Hilbert.suse.de 20 Nov '09

20 Nov '09

Hello community, here is the log from the commit of package OpenOffice_org-calc for openSUSE:Factory checked in at Fri Nov 20 01:08:01 CET 2009. -------- --- OpenOffice_org-calc/OpenOffice_org-calc.changes 2009-10-20 17:16:35.000000000 +0200 +++ /mounts/work_src_done/STABLE/OpenOffice_org-calc/OpenOffice_org-calc.changes 2009-11-13 18:36:14.000000000 +0100 @@ -1,0 +2,12 @@ +Fri Nov 13 17:34:52 CET 2009 - pmladek(a)suse.cz + +- updated to the milestone ooo320-m4 +- updated ooo-build to version 3.1.99.2 (3.2-beta2) + +------------------------------------------------------------------- +Thu Oct 29 22:57:28 CET 2009 - pmladek(a)suse.cz + +- updated to the milestone ooo320-m2 +- updated ooo-build to version 3.1.99.1 (3.2-beta1) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- ooo310-m19-calc.tar.bz2 New: ---- ooo320-m4-calc.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-calc.spec ++++++ --- /var/tmp/diff_new_pack.e57ueZ/_old 2009-11-20 01:07:57.000000000 +0100 +++ /var/tmp/diff_new_pack.e57ueZ/_new 2009-11-20 01:07:57.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-calc (Version 3.1.1.4) +# spec file for package OpenOffice_org-calc (Version 3.1.99.2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,9 +19,9 @@ Name: OpenOffice_org-calc -Version: 3.1.1.4 +Version: 3.1.99.2 Release: 1 -%define ooo_build_version 3.1.1.4 +%define ooo_build_version 3.1.99.2 %define piece calc #!BuildIgnore: OpenOffice_org #!BuildIgnore: OpenOffice_org-filters-optional @@ -32,7 +32,7 @@ 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 update-desktop-files xml-commons-apis xorg-x11 zip %define ooo_prefix %_libdir %define ooo_home ooo3 -%define ooo_build_tag ooo310-m19 +%define ooo_build_tag ooo320-m4 License: LGPL v3 only Group: Productivity/Office/Suite AutoReqProv: on @@ -83,7 +83,9 @@ %prep -%setup -q -a1 -n %ooo_build_tag-%piece +%setup -c -q -a1 -n %ooo_build_tag-%piece +# hack to move sources to a reasonable location +mv ooo/*/* . && rm -rf ooo %build # setup env. ++++++ ooo310-m19-calc.tar.bz2 -> ooo320-m4-calc.tar.bz2 ++++++ OpenOffice_org-calc/ooo310-m19-calc.tar.bz2 /mounts/work_src_done/STABLE/OpenOffice_org-calc/ooo320-m4-calc.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit OpenOffice_org-branding-upstream for openSUSE:Factory
by root＠Hilbert.suse.de 20 Nov '09

20 Nov '09

Hello community, here is the log from the commit of package OpenOffice_org-branding-upstream for openSUSE:Factory checked in at Fri Nov 20 01:07:42 CET 2009. -------- --- OpenOffice_org-branding-upstream/OpenOffice_org-branding-upstream.changes 2009-10-20 17:16:32.000000000 +0200 +++ /mounts/work_src_done/STABLE/OpenOffice_org-branding-upstream/OpenOffice_org-branding-upstream.changes 2009-11-13 18:36:08.000000000 +0100 @@ -1,0 +2,10 @@ +Fri Nov 13 17:34:52 CET 2009 - pmladek(a)suse.cz + +- updated to version 3.1.99.2 + +------------------------------------------------------------------- +Thu Oct 29 22:57:28 CET 2009 - pmladek(a)suse.cz + +- updated to version 3.1.99.1 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-branding-upstream.spec ++++++ --- /var/tmp/diff_new_pack.SNm2KM/_old 2009-11-20 01:07:28.000000000 +0100 +++ /var/tmp/diff_new_pack.SNm2KM/_new 2009-11-20 01:07:28.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-branding-upstream (Version 3.1.1.4) +# spec file for package OpenOffice_org-branding-upstream (Version 3.1.99.2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: OpenOffice_org-branding-upstream -Version: 3.1.1.4 +Version: 3.1.99.2 Release: 1 -%define ooo_build_version 3.1.1.4 +%define ooo_build_version 3.1.99.2 #!BuildIgnore: OpenOffice_org BuildRequires: OpenOffice_org-artwork-devel >= 2.99 -%define ooo_basis_dir basis3.1 +%define ooo_basis_dir basis3.2 %define ooo_home ooo3 License: LGPL v3 only Group: Productivity/Office/Suite ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit OpenOffice_org-bootstrap for openSUSE:Factory
by root＠Hilbert.suse.de 20 Nov '09

20 Nov '09

Hello community, here is the log from the commit of package OpenOffice_org-bootstrap for openSUSE:Factory checked in at Fri Nov 20 01:07:15 CET 2009. Wide character in print at /work/src/bin/tools/get_bugzilla line 45. -------- --- OpenOffice_org-bootstrap/OpenOffice_org-bootstrap.changes 2009-10-20 17:16:29.000000000 +0200 +++ /mounts/work_src_done/STABLE/OpenOffice_org-bootstrap/OpenOffice_org-bootstrap.changes 2009-11-16 12:53:44.000000000 +0100 @@ -1,0 +2,125 @@ +Mon Nov 16 12:51:32 CET 2009 - pmladek(a)suse.cz + +- defuzzed diffs to apply in factory + +------------------------------------------------------------------- +Fri Nov 13 17:34:52 CET 2009 - pmladek(a)suse.cz + +- updated to the milestone ooo320-m4 +- updated ooo-build to version 3.1.99.2 (3.2-beta2): + * speed up: + * do not call `uname` during start (i#106891) + * Common bits: + * broken find&search dialog (bnc#552450) + * broken colors in PDF export (i#106523) + * erasing elements in toolkit layout code (i#106575) + * Calc bits: + * more on automatic adjusting decimal numbers (bnc#541973) + * disable paste mode when the input mode is active (i#102456) + * rot. text + border in XLS import (i#38709, bnc#549728) + * Writer bits: + * recorded changes editing (bnc#545815) + * image size DOC export (bnc#554549, i#59648) + * background color and bullet indentation DOC import (bnc#547308) + * OOXML bits: + * more on shapes DOCX import + * VBA bits: + * control name override logic + * selection reset after paste + * combobox binding data import in userform (bnc#539220) + * build bits: + * switch back to the internal saxon (bnc#547157) + +------------------------------------------------------------------- +Thu Oct 29 22:57:28 CET 2009 - pmladek(a)suse.cz + +- updated to the milestone ooo320-m2 +- updated ooo-build to version 3.1.99.1 (3.2-beta1): + * features: + * NLPSolver extension (fate#304653) + * oooblogger extension (fate#304555) + * Google Docs and Zoho extension (fate#304577) + * optional icon themes (i#105062, bnc#529404, bnc#537541) + * speed up: + * use stringbuf in SVG export + * cache fontconfig's pre-match substitution results (bnc#529532) + * common bits: + * XML parser crasher + * opacity SVG import + * WebDAV locking stuff rework + * many KDE4 integration fixes + * set dev-install icons to small ones + * regression in WMF import (bnc#417818) + * more on fontconfig/cairofont stuff + * wrong kerning on Linux (bnc#464436, i#26519) + * inserting uiconfiguration ( menus/toolbar ) (i#105154) + * keep locks after saving documents via WebDAV (bnc#464568) + * better fix for quick-starter unload crasher (i#101245) + * save non-English file names with KDE4 dialog (deb#536664) + * driver string action and font object EMF+ import (bnc#519715) + * prevent multiple window resize when maximised (i#104469) + * Base bits: + * UPDATE db record failure (i#104088) + * Calc bits: + * selection change and status icon (bnc#548116) + * range selection for RTL languages (bnc#542684) + * Force-interpret formula cell results (bnc#540563) + * check for the General number format type (i#46511) + * broken SUBTOTAL cell function after undo (bnc#545287) + * erroneous export of OCX combo box controls (bnc#540566) + * automatically adjust the number of decimals (bnc#541973) + * skip filtered cells during search or replace (bnc#539282) + * unicode strings in external ref URIs (i#103918, i#104166) + * disable context menu on non-selectable cells (bnc#542024) + * SHA1 hash algorithm for sheet and doc password by default + * zero bytes encryption inside cond. formatting (bnc#541058) + * selection of cells on protected sheets by default (bnc#538559) + * cell selection handling when cell is being edited (bnc#541269) + * Draw bits: + * slides printing page offset (bnc#537931) + * Impress bits: + * wrong text bounds + * missing drag rect on mac + * PPT import crasher (bnc#546758) + * bullet size PPT import (bnc#515972) + * dock presentation minimizer toolbar + * Writer bits: + * Non-breaking spaces fixes + * UNO API related to fields + * unknown fields DOC import (i#61075, i#89667) + * allow to add param into form field during import + * two consecutive text fields in DOC import (bnc#546416) + * OOXML bits: + * collapsed paragraphs at the end of the sections DOCX import + * VML shapes missing and bad sizes in DOCX import (bnc#549300) + * styles without stylesheet definition DOCX import (bnc#545717) + * VBA bits: + * some wae fixes + * controls visibility (bnc#542132) + * AutoFilterMode macro (bnc#549383) + * more on transient imported autotext + * misc IBM fixes (i#104203, i#103653) + * support for default member with automation bridge + * boolean arguments to worksheet functions (bnc#541735) + * more fixes for automation (bnc#535086, bnc#535087, bnc#535088, + bnc#535089) + * Do While Not "foo"="" " causes date type mismatch (i#105321) + * IsEmpty RTL function fails with non-object params (bnc#541749) + * object not cleared when entering new stack frame (bnc#541755) + * l10n bits: + * lots fixes + * Russian and Slovak autocorection update (i#91304) + * split build: + * install extensions MIME type icon + * install startcenter.desktop (bnc#548534) + * Novell bits: + * use xulrunner-1.9.1 on openSUSE-11.2 + * branch configuration for openSUSE-11.2 + * enable EMFPlus section for SLED10 (bnc#232232) + * used internal boost on SLED10, openSUSE-10.3, openSUSE-11.0 +- updated setup_native_packinfo to version ooo320-m2 +- added new l10n source tarball +- removed saxon8 from BuildRequires; the internal one is really needed + (bnc#547157) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- ooo-build-3.1.1.4.tar.gz ooo310-m19-bootstrap.tar.bz2 setup_native_packinfo-ooo310-m2.tar.bz2 New: ---- ooo-build-3.1.98.0j-setup_native.diff ooo-build-3.1.99.2.tar.gz ooo320-m4-bootstrap.tar.bz2 ooo320-m4-l10n.tar.bz2 setup_native_packinfo-ooo320-m2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-bootstrap.spec ++++++ --- /var/tmp/diff_new_pack.wTd8Mo/_old 2009-11-20 01:07:08.000000000 +0100 +++ /var/tmp/diff_new_pack.wTd8Mo/_new 2009-11-20 01:07:08.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-bootstrap (Version 3.1.1.4) +# spec file for package OpenOffice_org-bootstrap (Version 3.1.99.2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -115,13 +115,13 @@ # %define ooo_prefix %_libdir %define ooo_home ooo3 -%define ooo_basis_dir basis3.1 +%define ooo_basis_dir basis3.2 %define ooo_build_dir build -%define ooo_build_version 3.1.1.4 -%define ooo_build_tag ooo310-m19 +%define ooo_build_version 3.1.99.2 +%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) Group: Productivity/Office/Suite -Version: 3.1.1.4 +Version: 3.1.99.2 Release: 1 AutoReqProv: on Summary: OpenOffice.org Build Bootstrap @@ -133,8 +133,10 @@ # necessary for SDK, http://udk.openoffice.org/common/man/spec/transparentofficecomponents.html # FIXME: can be built using mingw32 C++ compiler Source3: unowinreg.dll +# +Source4: %ooo_build_tag-l10n.tar.bz2 # hacked soures from setup_native -Source30: setup_native_packinfo-ooo310-m2.tar.bz2 +Source30: setup_native_packinfo-ooo320-m2.tar.bz2 # Hmm, rpmlint complains about devel files in non-devel package # We would like to keep the -bootstrap package name # So we need to disable these rpmlint checks @@ -146,6 +148,7 @@ # Patch0: ooo-build-2.4-enable-foo.diff # example Patch0: ooo-build-help-in-usr-share.diff Patch1: ooo-build-3.0.0.10-extensions-hack.diff +Patch2: ooo-build-3.1.98.0j-setup_native.diff # Patch1000: piece-disable-pyuno-registration.diff # @@ -169,7 +172,7 @@ # apply patches against ooo-build # %patch0 # example # -install -m 644 %{S:1} %{S:2} %{S:3} %{S:30} src/ +install -m 644 %{S:1} %{S:2} %{S:3} %{S:4} %{S:30} src/ %if %suse_version == 1010 install -m 644 %{S:150} src/ %endif @@ -177,6 +180,7 @@ # %patch0 # example %patch0 %patch1 +%patch2 %if %suse_version == 1010 # temporary disable registration of python components on SLED10 cp %{P:1000} patches/hotfixes @@ -298,7 +302,7 @@ --enable-split-opt-features %endif # FIXME: try to finish build even with the strange random build crash in officecfg -make || make || make || make +make || make || make %install %ifarch x86_64 ppc ++++++ ooo-build-3.0.0.10-extensions-hack.diff ++++++ --- /var/tmp/diff_new_pack.wTd8Mo/_old 2009-11-20 01:07:08.000000000 +0100 +++ /var/tmp/diff_new_pack.wTd8Mo/_new 2009-11-20 01:07:08.000000000 +0100 @@ -1,6 +1,6 @@ --- patches/dev300/apply +++ patches/dev300/apply -@@ -44,12 +44,12 @@ +@@ -47,12 +47,12 @@ # Sdk patches: a special distro; applied only when building with the sdk tarball unpacked Sdk : SdkFixes # special fragmented build patch distro @@ -13,19 +13,19 @@ -Extensions : ExtensionFixes +Extensions : UnstableWP : UnstableLibwpd + Gnome2-26 : GnomeSessionManagement - # Novell -@@ -2893,6 +2893,10 @@ - [ ExtensionFixes ] - pdfimport-lax-restrictions.diff, i#90468, thorsten +@@ -3389,6 +3389,10 @@ + # link with -lcolamd, needed because our liblpsolve55{,_pic}.a doesn't include it + system-lpsolve-link-with-colamd.diff, rengelha +[ PieceBits ] +piece-config-office-extensions.diff + + [ NovellOnlyWin32 ] - i92372.diff, i#92372, n#353143, tml - + # Don't attempt to restart soffice.bin immediately if it crashes. At + # such a restart, if the document recovery dialog is cancelled, an --- patches/dev300/piece-config-office-extensions.diff +++ patches/dev300/piece-config-office-extensions.diff @@ -0,0 +1,53 @@ ++++++ ooo-build-3.1.98.0j-setup_native.diff ++++++ --- bin/unpack +++ bin/unpack @@ -272,7 +272,7 @@ fi # ugly hack around odd positioning of this info echo "Unpacking setup_native .txt pieces" - ($OOO_DECOMPRESS_CMD $SRCDIR/setup_native_packinfo-ooo320-m1.tar.bz2 | $GNUTAR xpf - ) || exit + ($OOO_DECOMPRESS_CMD $SRCDIR/setup_native_packinfo-ooo320-m2.tar.bz2 | $GNUTAR xpf - ) || exit fi fi else --- download.in +++ download.in @@ -422,7 +422,7 @@ } if ('@PIECE@' eq 'bootstrap') { - source_file( 'setup_native_packinfo-ooo320-m1.tar.bz2' ); + source_file( 'setup_native_packinfo-ooo320-m2.tar.bz2' ); } if ('@GRAPHITE_SRC@' ne '') { ++++++ ooo-build-3.1.1.4.tar.gz -> ooo-build-3.1.99.2.tar.gz ++++++ OpenOffice_org-bootstrap/ooo-build-3.1.1.4.tar.gz /mounts/work_src_done/STABLE/OpenOffice_org-bootstrap/ooo-build-3.1.99.2.tar.gz differ: char 5, line 1 ++++++ ooo-build-help-in-usr-share.diff ++++++ --- /var/tmp/diff_new_pack.wTd8Mo/_old 2009-11-20 01:07:08.000000000 +0100 +++ /var/tmp/diff_new_pack.wTd8Mo/_new 2009-11-20 01:07:08.000000000 +0100 @@ -1,15 +1,15 @@ --- patches/dev300/apply +++ patches/dev300/apply -@@ -1019,6 +1019,9 @@ - scp2-user-config-ooo3.diff, pmladek - # Push fonts into the ps stream always - pushfont-psstream.diff, i#84481, michael +@@ -1084,6 +1084,9 @@ + + # Help Support page + help-support.diff, michael +# help is in /usr/share/ooo-2.0/help now +# FIXME: this should be configurable via ./configure +officecfg-help-in-usr-share.diff - - [ NovellOnlyUnix ] - # search also /usr/share for icons + # change user config dir name from ~/.openoffice.org3 to ~/.ooo3 + scp2-user-config-ooo3.diff, pmladek + # Push fonts into the ps stream always --- patches/dev300/officecfg-help-in-usr-share.diff +++ patches/dev300/officecfg-help-in-usr-share.diff @@ -0,0 +1,31 @@ ++++++ ooo310-m19-bootstrap.tar.bz2 -> ooo320-m4-bootstrap.tar.bz2 ++++++ OpenOffice_org-bootstrap/ooo310-m19-bootstrap.tar.bz2 /mounts/work_src_done/STABLE/OpenOffice_org-bootstrap/ooo320-m4-bootstrap.tar.bz2 differ: char 11, line 1 ++++++ setup_native_packinfo-ooo310-m2.tar.bz2 -> setup_native_packinfo-ooo320-m2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setup_native/source/packinfo/package_names_ext.txt new/setup_native/source/packinfo/package_names_ext.txt --- old/setup_native/source/packinfo/package_names_ext.txt 2009-02-21 00:05:14.000000000 +0100 +++ new/setup_native/source/packinfo/package_names_ext.txt 2009-10-15 14:52:41.000000000 +0200 @@ -8,10 +8,14 @@ SUNWgnome-base-libs GNOME base GUI libraries - platform dependent files, /usr filesystem SUNWgnome-config GNOME configuration framework - platform dependent files, /usr filesystem SUNWgnome-vfs GNOME Virtual File System Framework and application/MIME type registry - platform dependent files, /usr filesystem +SUNWgzip The GNU Zip (gzip) compression utility +SUNWmfrun Motif RunTime Kit SUNWkvm Core Architecture, (Kvm) SUNWlibC Sun Workshop Compilers Bundled libC +SUNWPython The Python interpreter, libraries and utilities SUNWxwplt X Window System platform software SUNWxwrtl X Window System & Graphics Runtime Library Links in /usr/lib +SUNWzlibr The Zip compression library (Root) SUNWbtool CCS tools bundled with SunOS SUNWxcu4 XCU4 Utilities diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setup_native/source/packinfo/packinfo_office.txt new/setup_native/source/packinfo/packinfo_office.txt --- old/setup_native/source/packinfo/packinfo_office.txt 2009-02-25 19:26:30.000000000 +0100 +++ new/setup_native/source/packinfo/packinfo_office.txt 2009-10-15 14:52:41.000000000 +0200 @@ -162,10 +162,10 @@ Start module = "gid_Module_Optional_Binfilter" solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-binfilter" -solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01" +solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05" packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-binfilter" -freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-calc,%BASISPACKAGEPREFIX%OOOBASEVERSION-draw,%BASISPACKAGEPREFIX%OOOBASEVERSION-impress,%BASISPACKAGEPREFIX%OOOBASEVERSION-math,%BASISPACKAGEPREFIX%OOOBASEVERSION-writer" -requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-calc,%BASISPACKAGEPREFIX%OOOBASEVERSION-draw,%BASISPACKAGEPREFIX%OOOBASEVERSION-impress,%BASISPACKAGEPREFIX%OOOBASEVERSION-math,%BASISPACKAGEPREFIX%OOOBASEVERSION-writer" +freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" +requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" copyright = "1999-2009 by OpenOffice.org" solariscopyright = "solariscopyrightfile" vendor = "OpenOffice.org" @@ -177,7 +177,7 @@ Start module = "gid_Module_Optional_Grfflt" solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-graphicfilter" -solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01" +solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05" packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-graphicfilter" freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" @@ -192,7 +192,7 @@ Start module = "gid_Module_Oooimprovement" solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-oooimprovement" -solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01" +solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05,SUNWmfrun" packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-oooimprovement" freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" @@ -207,7 +207,7 @@ Start module = "gid_Module_Optional_Testtool" solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-testtool" -solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01" +solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05,SUNWmfrun" packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-testtool" freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" @@ -282,7 +282,7 @@ Start module = "gid_Module_Optional_Onlineupdate" solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-onlineupdate" -solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, SUNWlibC" +solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, SUNWlibC, SUNWgzip" packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-onlineupdate" requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" copyright = "1999-2005 by Sun Microsystems" @@ -296,7 +296,7 @@ Start module = "gid_Module_Optional_Pyuno" solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-pyuno" -solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01" +solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, SUNWPython" packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-pyuno" freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" @@ -371,7 +371,7 @@ Start module = "gid_Module_Oo_Linguistic" solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-ooolinguistic" -solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01" +solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05" packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-ooolinguistic" freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" @@ -387,7 +387,7 @@ module = "gid_Module_Root_Files_2" script = "shellscripts_module.txt" solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02" -solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, SUNWlibC" +solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, SUNWlibC, SUNWmfrun" packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core02" requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" freebsdrequires = "" @@ -636,6 +636,22 @@ End Start +module = "gid_Module_Root_Extension_Dictionary_He" +script = "shellscripts_extensions.txt" +solarispackagename = "%PACKAGEPREFIX%WITHOUTDOTUNIXPRODUCTNAME%BRANDPACKAGEVERSION-dict-he" +solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%WITHOUTDOTUNIXPRODUCTNAME%BRANDPACKAGEVERSION" +packagename = "%UNIXPRODUCTNAME%BRANDPACKAGEVERSION-dict-he" +requires = "%UREPACKAGEPREFIX-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPRODUCTNAME%BRANDPACKAGEVERSION" +linuxpatchrequires = "" +copyright = "1999-2009 by Sun Microsystems" +solariscopyright = "solariscopyrightfile" +vendor = "Sun Microsystems, Inc." +description = "He dictionary for %PRODUCTNAME %PRODUCTVERSION" +destpath = "/opt" +packageversion = "%PACKAGEVERSION" +End + +Start module = "gid_Module_Root_Extension_Dictionary_Hu" script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%WITHOUTDOTUNIXPRODUCTNAME%BRANDPACKAGEVERSION-dict-hu" @@ -876,22 +892,6 @@ End Start -module = "gid_Module_Optional_ScSolver" -script = "shellscripts_extensions.txt" -solarispackagename = "%WITHOUTDOTUNIXPRODUCTNAME-scsolver" -solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME-calc" -packagename = "%UNIXPRODUCTNAME-scsolver" -linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-scsolver" -requires = "%UNIXPRODUCTNAME-calc" -freebsdrequires = "%UNIXPRODUCTNAME-calc" -copyright = "2005-2008 by Kohei Yoshida" -solariscopyright = "solariscopyrightfile" -vendor = "OpenOffice.org" -description = "Calc Solver extension for %PRODUCTNAME %PRODUCTVERSION" -destpath = "/opt" -packageversion = "%OOOPACKAGEVERSION" -End -Start module = "gid_Module_Root_Extension_Dictionary_Zu" script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%WITHOUTDOTUNIXPRODUCTNAME%BRANDPACKAGEVERSION-dict-zu" @@ -907,18 +907,18 @@ packageversion = "%PACKAGEVERSION" End + Start -module = "gid_Module_Optional_Writer2latex" -script = "shellscripts_extensions.txt" -solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-writer2latex" -solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-writer (Name="Writer module for OpenOffice.org %OOOBASEVERSION")" -packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-writer2latex" -requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%BASISPACKAGEPREFIX%OOOBASEVERSION-writer" -linuxpatchrequires = "" -copyright = "2002-2009 by Henrik Just" -vendor = "Henrik Just" -description = "Writer2LaTeX" +module = "gid_Module_Optional_OGLTrans" +solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-ogltrans" +solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-impress" +packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-ogltrans" +freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-impress" +requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-impress" +copyright = "1999-2007 by OpenOffice.org" +solariscopyright = "solariscopyrightfile" +vendor = "OpenOffice.org" +description = "OpenGL slide transitions module for OpenOffice.org %OOOBASEVERSION" destpath = "/opt" -packageversion = "0.5.0.2" +packageversion = "%OOOPACKAGEVERSION" End - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setup_native/source/packinfo/packinfo_office_lang.txt new/setup_native/source/packinfo/packinfo_office_lang.txt --- old/setup_native/source/packinfo/packinfo_office_lang.txt 2009-02-21 00:05:14.000000000 +0100 +++ new/setup_native/source/packinfo/packinfo_office_lang.txt 2009-10-15 14:52:41.000000000 +0200 @@ -29,6 +29,7 @@ description = "Language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" +pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01" End Start @@ -44,6 +45,7 @@ description = "Language fonts module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" +pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01" End Start @@ -59,6 +61,7 @@ description = "Language resource module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" +pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01" End Start @@ -74,6 +77,7 @@ description = "Language help module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" +pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01" End Start @@ -89,6 +93,7 @@ description = "Writer language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" +pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-writer" End Start @@ -104,6 +109,7 @@ description = "Calc language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" +pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-calc" End Start @@ -119,6 +125,7 @@ description = "Impress language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" +pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-impress" End Start @@ -134,6 +141,7 @@ description = "Draw language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" +pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-draw" End Start @@ -149,6 +157,7 @@ description = "Math language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" +pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-math" End Start @@ -164,6 +173,7 @@ description = "Base language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" +pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-base" End Start @@ -179,6 +189,7 @@ description = "Legacy filters (e.g. StarOffice 5.2) for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" +pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-binfilter" End Start @@ -194,4 +205,5 @@ description = "Online update language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" +pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-onlineupdate" End diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setup_native/source/packinfo/packinfo_ure.txt new/setup_native/source/packinfo/packinfo_ure.txt --- old/setup_native/source/packinfo/packinfo_ure.txt 2009-02-21 00:05:14.000000000 +0100 +++ new/setup_native/source/packinfo/packinfo_ure.txt 2009-10-15 14:52:41.000000000 +0200 @@ -32,6 +32,7 @@ Start module = "gid_Module_Root" solarispackagename = "%SOLSUREPACKAGEPREFIX-ure" +solarisrequires = "SUNWzlibr" packagename = "%UREPACKAGEPREFIX-ure" copyright = "2005-2009 by OpenOffice.org" solariscopyright = "solariscopyrightfile" @@ -44,6 +45,7 @@ Start module = "gid_Module_Root_Ure_Hidden" solarispackagename = "%SOLSUREPACKAGEPREFIX-ure" +solarisrequires = "SUNWzlibr" packagename = "%UREPACKAGEPREFIX-ure" copyright = "2005-2009 by OpenOffice.org" solariscopyright = "solariscopyrightfile" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setup_native/source/packinfo/private1copyrightfile new/setup_native/source/packinfo/private1copyrightfile --- old/setup_native/source/packinfo/private1copyrightfile 1970-01-01 01:00:00.000000000 +0100 +++ new/setup_native/source/packinfo/private1copyrightfile 2009-10-15 14:52:41.000000000 +0200 @@ -0,0 +1,2 @@ +Copyright 2007 Sun Microsystems, Inc. All rights reserved. +Use is subject to license terms. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setup_native/source/packinfo/shellscripts_extensions.txt new/setup_native/source/packinfo/shellscripts_extensions.txt --- old/setup_native/source/packinfo/shellscripts_extensions.txt 2009-02-21 00:05:14.000000000 +0100 +++ new/setup_native/source/packinfo/shellscripts_extensions.txt 2009-10-15 14:52:41.000000000 +0200 @@ -22,20 +22,32 @@ mkdir "$$INSTDIR" fi +# +# Need to check diskless service install and make sure use the correct unpkg +# +DISKLESS_SRVC=`echo $$BASEDIR | /usr/bin/grep export/Solaris_[1-9][0-9]/usr_$${ARCH}.all` +if [ "$$DISKLESS_SRVC" ]; then + UNOPKG=/export/Solaris_11/usr_`uname -p`.all/opt/staroffice9/program/unopkg + POSTRUN=$$PKG_INSTALL_ROOT/usr_`uname -p`.all/usr/lib/postrun + CLIENT_BASEDIR=$$PKG_INSTALL_ROOT/usr_$${ARCH}.all +else + UNOPKG=$$BASEDIR/PRODUCTDIRECTORYNAME/program/unopkg + POSTRUN=$$PKG_INSTALL_ROOT/usr/lib/postrun +fi # Use postrun command on Solaris where available (OpenSolaris) -if [ -x $$PKG_INSTALL_ROOT/usr/lib/postrun ]; then +if [ -x $$POSTRUN ]; then ( echo "test -x \"$$CLIENT_BASEDIR/PRODUCTDIRECTORYNAME/program/unopkg\" || exit 0" echo "umask 022" echo "\"$$CLIENT_BASEDIR/PRODUCTDIRECTORYNAME/program/unopkg\" add --shared --bundled \"$$CLIENT_BASEDIR/PRODUCTDIRECTORYNAME/share/extension/install/${OXTFILENAME}\" \"-env:UserInstallation=file:////$$INSTDIR\" '-env:UNO_JAVA_JFW_INSTALL_DATA=\$$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1'" -) | $$PKG_INSTALL_ROOT/usr/lib/postrun -b -c UNOPKG +) | $$POSTRUN -b -c UNOPKG if [ "$$?" != "0" ]; then echo "\nERROR: Installation of UNO extension ${OXTFILENAME}" - echo " through $$PKG_INSTALL_ROOT/usr/lib/postrun failed." + echo " through $$POSTRUN failed." exit 1 fi else # No postrun available, try running unopkg directly - "$$BASEDIR/PRODUCTDIRECTORYNAME/program/unopkg" add --shared --bundled "$$BASEDIR/PRODUCTDIRECTORYNAME/share/extension/install/${OXTFILENAME}" "-env:UserInstallation=file:////$$INSTDIR" '-env:UNO_JAVA_JFW_INSTALL_DATA=$$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1' + "$$UNOPKG" add --shared --bundled "$$BASEDIR/PRODUCTDIRECTORYNAME/share/extension/install/${OXTFILENAME}" "-env:UserInstallation=file:////$$INSTDIR" '-env:UNO_JAVA_JFW_INSTALL_DATA=$$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1' if [ "$$?" != "0" ]; then echo "\nERROR: Installation of UNO extension ${OXTFILENAME} failed." test "$$BASEDIR" = "$$CLIENT_BASEDIR" || echo "ERROR: alternate root install requires SUNWpostrun package to be installed" @@ -48,7 +60,7 @@ rm -rf "$$INSTDIR" fi -exit 0 +exit 0 END %preremove << END @@ -79,7 +91,7 @@ echo "umask 022" echo "\"$$CLIENT_BASEDIR/PRODUCTDIRECTORYNAME/program/unopkg\" remove --shared --bundled \"${OXTFILENAME}\" \"-env:UserInstallation=file:////$$INSTDIR\" '-env:UNO_JAVA_JFW_INSTALL_DATA=\$$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1'" echo "rm -rf \"$$INSTDIR\"" -) | $$PKG_INSTALL_ROOT/usr/lib/postrun -b -c UNOPKG +) | $$PKG_INSTALL_ROOT/usr/lib/postrun -c UNOPKG else # No postrun available, try running unopkg directly test -x $$BASEDIR/PRODUCTDIRECTORYNAME/program/unopkg || exit 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setup_native/source/packinfo/spellchecker_selection.txt new/setup_native/source/packinfo/spellchecker_selection.txt --- old/setup_native/source/packinfo/spellchecker_selection.txt 2009-02-21 00:05:14.000000000 +0100 +++ new/setup_native/source/packinfo/spellchecker_selection.txt 2009-10-15 14:52:41.000000000 +0200 @@ -4,6 +4,7 @@ # Second column: Assigned spellchecker languages. Comma separated list. af = "af,en-US" +ca = "ca,es,en,fr" cs = "cs,en-US" da = "da,de,en-US" de = "de,en-US,fr,it" @@ -12,15 +13,19 @@ et = "en-US,et" fr = "en-US,es,fr" gl = "en-US,pt,es,gl" +he = "en-US,he" hu = "de,en-US,hu" it = "de,en-US,fr,it" ja = "en-US" ko = "en-US" lt = "en-US,lt" +nb = "no,en,fr,de,es" ne = "en-US,ne" nl = "en-US,fr,de,nl" +nn = "no,en,fr,de,es" pl = "de,en-US,pl,ru" pt-BR = "en-US,es,pt" +ro = "ro,en,de,hu" ru = "de,en-US,ru" sk = "en-US,sk" sl = "en-US,sl" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0