Hello community, here is the log from the commit of package OpenOffice_org checked in at Mon Mar 31 01:17:41 CEST 2008. -------- --- arch/i386/OpenOffice_org/OpenOffice_org.changes 2008-03-14 13:18:14.000000000 +0100 +++ /mounts/work_src_done/STABLE/OpenOffice_org/OpenOffice_org.changes 2008-03-28 18:08:50.000000000 +0100 @@ -1,0 +2,25 @@ +Fri Mar 28 17:33:43 CET 2008 - pmladek@suse.cz + +- updated to the milestone ooh680-m12 (2.4rc6 == 2.4-final) +- updated ooo-build to ooo-build-2.4.0.5: + * better support for various formula syntax + * left-mouse click and protected cell crasher [n#371204] + * cell background painting improvements [n#361360, i#3907] + * wrong result of interactive functions, e.g MIN [n#372255] + * better floating-point rounding error fix [n#310706, i#86775] + * more on the localized arg separator stuff [n#358558, n#373479] + * detect the symlinked mozilla wrapper correctly [n#368532, i#87258] + * interference between R1C1 and localized arg separator stuff [n#372494] + * visual feedback for copied cell range [n#367489] + * keys that quits the paste on Enter mode [n#372446] + * output range format in the datapilot regression + * drag&drop with plus/minus signs in Navigator [i#64886, n#129410] + * unopkg wrapper and association with .oxt [n#352574] + * VBA bits: + * support worksheet_deactivate events +- updated branding packaging to the openSUSE >= 11.0 style: + * created branding-upstream subpackage + * moved openSUSE and SLED10 branding to extra packages + * kept compatibility when building for older distros + +------------------------------------------------------------------- --- arch/i386/OpenOffice_org/OpenOffice_org-i18n.changes 2008-03-14 12:54:17.000000000 +0100 +++ /mounts/work_src_done/STABLE/OpenOffice_org/OpenOffice_org-i18n.changes 2008-03-28 18:07:48.000000000 +0100 @@ -1,0 +2,8 @@ +Fri Mar 28 18:06:44 CET 2008 - pmladek@suse.cz + +- updated to the milestone ooh680-m12 (2.4rc6 == 2.4-final) +- updated ooo-build to ooo-build-2.4.0.5: + * more Hungarian translation fixes +- added the branding related changes to be in sync with the main package + +------------------------------------------------------------------- Old: ---- minmem ooh680-m11-binfilter.tar.bz2 ooh680-m11-core.tar.bz2 ooh680-m11-lang.tar.bz2 ooh680-m11-sdk_oo.tar.bz2 ooh680-m11-system.tar.bz2 ooo-build-2.4.0.3.tar.gz New: ---- kde-mime-desktop.tar.bz2 ooh680-m12-binfilter.tar.bz2 ooh680-m12-core.tar.bz2 ooh680-m12-lang.tar.bz2 ooh680-m12-sdk_oo.tar.bz2 ooh680-m12-system.tar.bz2 ooo-build-2.4.0.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-i18n.spec ++++++ --- /var/tmp/diff_new_pack.V12307/_old 2008-03-31 01:16:02.000000000 +0200 +++ /var/tmp/diff_new_pack.V12307/_new 2008-03-31 01:16:02.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-i18n (Version 2.4.0.3) +# spec file for package OpenOffice_org-i18n (Version 2.4.0.5) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -72,8 +72,8 @@ %define ooo_prefix %_libdir %define ooo_home ooo-2.0 %define ooo_build_dir build -%define ooo_build_version 2.4.0.3 -%define ooo_build_tag ooh680-m11 +%define ooo_build_version 2.4.0.5 +%define ooo_build_tag ooh680-m12 # source sripts for architectures %ifarch ppc %define ooo_source_script %ooo_build_dir/%ooo_build_tag/LinuxPPCEnv.Set.sh @@ -86,7 +86,7 @@ %endif License: GPL v2 or later; LGPL v2.1 or later Group: Productivity/Office/Suite -Version: 2.4.0.3 +Version: 2.4.0.5 Release: 1 AutoReqProv: on Summary: A Source Package for OpenOffice.org Localizations @@ -133,11 +133,13 @@ Source30: extra_localizations_sources.tar.bz2 # templates that can be used to create a new file on KDE desktop Source31: ooo-kde-templates.tar.bz2 -# branding stuff +%if %suse_version <= 1030 +# branding stuff; has been moved into separate packages in openSUSE-11.0 Source40: openintro_nld.bmp Source41: openabout_nld.bmp Source42: openintro_suse.bmp Source43: openabout_suse.bmp +%endif %if %suse_version <= 1010 # obsolete wrapper, removed in openSUSE 10.2 Source600: OOo-wrapper @@ -158,6 +160,7 @@ %if %test_build_langs >= 2 %package -n OpenOffice_org-af +License: GPL v2 or later; LGPL v2.1 or later Summary: African Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:af) @@ -174,6 +177,7 @@ %package -n OpenOffice_org-ar +License: GPL v2 or later; LGPL v2.1 or later Summary: Arabic Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:ar) @@ -188,6 +192,7 @@ %package -n OpenOffice_org-be-BY +License: GPL v2 or later; LGPL v2.1 or later Summary: Belorussian Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:be) @@ -202,6 +207,7 @@ %package -n OpenOffice_org-bg +License: GPL v2 or later; LGPL v2.1 or later Summary: Bulgarian Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:bg) @@ -226,6 +232,7 @@ %package -n OpenOffice_org-br +License: GPL v2 or later; LGPL v2.1 or later Summary: Breton French Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:br) @@ -237,6 +244,7 @@ %package -n OpenOffice_org-ca +License: GPL v2 or later; LGPL v2.1 or later Summary: Catalan Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:ca) @@ -256,6 +264,7 @@ %if %test_build_langs >= 1 %package -n OpenOffice_org-cs +License: GPL v2 or later; LGPL v2.1 or later Summary: Czech Localization Files for OpenOffice.org Group: Productivity/Office/Suite PreReq: coreutils @@ -278,6 +287,7 @@ %if %test_build_langs >= 2 %package -n OpenOffice_org-cy +License: GPL v2 or later; LGPL v2.1 or later Summary: Welsh Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:cy) @@ -294,6 +304,7 @@ %package -n OpenOffice_org-da +License: GPL v2 or later; LGPL v2.1 or later Summary: Danish Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:da) @@ -313,6 +324,7 @@ %if %test_build_langs >= 1 %package -n OpenOffice_org-de +License: GPL v2 or later; LGPL v2.1 or later Summary: German Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:de) @@ -334,6 +346,7 @@ %if %test_build_langs >= 2 %package -n OpenOffice_org-el +License: GPL v2 or later; LGPL v2.1 or later Summary: Greek Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:el) @@ -353,6 +366,7 @@ %package -n OpenOffice_org-en-GB +License: GPL v2 or later; LGPL v2.1 or later Summary: British Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:en_GB) @@ -369,6 +383,7 @@ %package -n OpenOffice_org-en-ZA +License: GPL v2 or later; LGPL v2.1 or later Summary: South Africa English Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:en_ZA) @@ -385,6 +400,7 @@ %package -n OpenOffice_org-es +License: GPL v2 or later; LGPL v2.1 or later Summary: Spanish Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:es) @@ -403,6 +419,7 @@ %package -n OpenOffice_org-et +License: GPL v2 or later; LGPL v2.1 or later Summary: Estonian Localization Files for OpenOffice.org Group: Productivity/Office/Suite PreReq: coreutils @@ -420,6 +437,7 @@ %package -n OpenOffice_org-fi +License: GPL v2 or later; LGPL v2.1 or later Summary: Finnish Localization Files for OpenOffice.org Group: Productivity/Office/Suite PreReq: coreutils @@ -432,6 +450,7 @@ %package -n OpenOffice_org-fr +License: GPL v2 or later; LGPL v2.1 or later Summary: French Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:fr) @@ -450,6 +469,7 @@ %package -n OpenOffice_org-ga +License: GPL v2 or later; LGPL v2.1 or later Summary: Gaelic Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:ga) @@ -466,6 +486,7 @@ %package -n OpenOffice_org-gl +License: GPL v2 or later; LGPL v2.1 or later Summary: Galician Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:gl) @@ -477,6 +498,7 @@ %package -n OpenOffice_org-he +License: GPL v2 or later; LGPL v2.1 or later Summary: Hebrew Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:he) @@ -493,6 +515,7 @@ %package -n OpenOffice_org-hi-IN +License: GPL v2 or later; LGPL v2.1 or later Summary: Hindi Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:hi) @@ -510,6 +533,7 @@ %package -n OpenOffice_org-hr +License: GPL v2 or later; LGPL v2.1 or later Summary: Croatian Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:hr) @@ -526,6 +550,7 @@ %package -n OpenOffice_org-gu-IN +License: GPL v2 or later; LGPL v2.1 or later Summary: Gujarati Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:gu) @@ -543,6 +568,7 @@ %package -n OpenOffice_org-hu +License: GPL v2 or later; LGPL v2.1 or later Summary: Hungarian Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:hu) @@ -559,6 +585,7 @@ %package -n OpenOffice_org-it +License: GPL v2 or later; LGPL v2.1 or later Summary: Italian Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:it) @@ -575,6 +602,7 @@ %package -n OpenOffice_org-ja +License: GPL v2 or later; LGPL v2.1 or later Summary: Japanese Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:ja) @@ -589,6 +617,7 @@ %package -n OpenOffice_org-ka +License: GPL v2 or later; LGPL v2.1 or later Summary: Georgian Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:ka) @@ -600,6 +629,7 @@ %package -n OpenOffice_org-km +License: GPL v2 or later; LGPL v2.1 or later Summary: Khmer Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:km) @@ -614,6 +644,7 @@ %package -n OpenOffice_org-ko +License: GPL v2 or later; LGPL v2.1 or later Summary: Korean Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:ko) @@ -628,6 +659,7 @@ %package -n OpenOffice_org-lt +License: GPL v2 or later; LGPL v2.1 or later Summary: Lithuanian Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:lt) @@ -644,6 +676,7 @@ %package -n OpenOffice_org-mk +License: GPL v2 or later; LGPL v2.1 or later Summary: Macedonian Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:mk) @@ -663,6 +696,7 @@ %package -n OpenOffice_org-nb +License: GPL v2 or later; LGPL v2.1 or later Summary: Norwegian Bokmaal Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:nb) @@ -681,6 +715,7 @@ %package -n OpenOffice_org-nl +License: GPL v2 or later; LGPL v2.1 or later Summary: Dutch Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:nl) @@ -697,6 +732,7 @@ %package -n OpenOffice_org-nn +License: GPL v2 or later; LGPL v2.1 or later Summary: Norwegian Nynorsk Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:nn) @@ -713,6 +749,7 @@ %package -n OpenOffice_org-nr +License: GPL v2 or later; LGPL v2.1 or later Summary: Ndebele Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:nr) @@ -729,6 +766,7 @@ %package -n OpenOffice_org-pa-IN +License: GPL v2 or later; LGPL v2.1 or later Summary: Punjabi Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:pa) @@ -743,6 +781,7 @@ %package -n OpenOffice_org-pl +License: GPL v2 or later; LGPL v2.1 or later Summary: Polish Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:pl) @@ -761,6 +800,7 @@ %package -n OpenOffice_org-pt +License: GPL v2 or later; LGPL v2.1 or later Summary: Portuguese Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:pt) @@ -779,6 +819,7 @@ %package -n OpenOffice_org-pt-BR +License: GPL v2 or later; LGPL v2.1 or later Summary: Brazilian Portuguese Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:pt_BR) @@ -795,6 +836,7 @@ %package -n OpenOffice_org-rw +License: GPL v2 or later; LGPL v2.1 or later Summary: Kinyarwanda Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:rw) @@ -811,6 +853,7 @@ %package -n OpenOffice_org-ru +License: GPL v2 or later; LGPL v2.1 or later Summary: Russian Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:ru) @@ -830,6 +873,7 @@ %package -n OpenOffice_org-sh-YU +License: GPL v2 or later; LGPL v2.1 or later Summary: Latin Serbian Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:sh_YU) @@ -841,6 +885,7 @@ %package -n OpenOffice_org-sk +License: GPL v2 or later; LGPL v2.1 or later Summary: Slovak Localization Files for OpenOffice.org Group: Productivity/Office/Suite PreReq: coreutils @@ -860,6 +905,7 @@ %package -n OpenOffice_org-sl +License: GPL v2 or later; LGPL v2.1 or later Summary: Slovene Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:sl) @@ -876,6 +922,7 @@ %package -n OpenOffice_org-sr-CS +License: GPL v2 or later; LGPL v2.1 or later Summary: Serbian Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:sr) @@ -890,6 +937,7 @@ %package -n OpenOffice_org-ss +License: GPL v2 or later; LGPL v2.1 or later Summary: Swazi Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:ss) @@ -901,6 +949,7 @@ %package -n OpenOffice_org-st +License: GPL v2 or later; LGPL v2.1 or later Summary: Sotho Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:st) @@ -915,6 +964,7 @@ %package -n OpenOffice_org-sv +License: GPL v2 or later; LGPL v2.1 or later Summary: Swedish Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:sv) @@ -931,6 +981,7 @@ %package -n OpenOffice_org-tg +License: GPL v2 or later; LGPL v2.1 or later Summary: Tajiki Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:tg) @@ -942,6 +993,7 @@ %package -n OpenOffice_org-th +License: GPL v2 or later; LGPL v2.1 or later Summary: Thai Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:th) @@ -953,6 +1005,7 @@ %package -n OpenOffice_org-tr +License: GPL v2 or later; LGPL v2.1 or later Summary: Turkish Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:tr) @@ -964,6 +1017,7 @@ %package -n OpenOffice_org-ts +License: GPL v2 or later; LGPL v2.1 or later Summary: Tsonga Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:ts) @@ -978,6 +1032,7 @@ %package -n OpenOffice_org-uk +License: GPL v2 or later; LGPL v2.1 or later Summary: Ukrainian Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:uk) @@ -994,6 +1049,7 @@ %package -n OpenOffice_org-ve +License: GPL v2 or later; LGPL v2.1 or later Summary: Venda Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:ve) @@ -1010,6 +1066,7 @@ %package -n OpenOffice_org-vi +License: GPL v2 or later; LGPL v2.1 or later Summary: Vietnamese Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:vi) @@ -1021,6 +1078,7 @@ %package -n OpenOffice_org-xh +License: GPL v2 or later; LGPL v2.1 or later Summary: Xhosa Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:xh) @@ -1035,6 +1093,7 @@ %package -n OpenOffice_org-zh-CN +License: GPL v2 or later; LGPL v2.1 or later Summary: Chinese Simplified Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:zh_CN) @@ -1049,6 +1108,7 @@ %package -n OpenOffice_org-zh-TW +License: GPL v2 or later; LGPL v2.1 or later Summary: Chinese Traditional Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:zh_TW) @@ -1063,6 +1123,7 @@ %package -n OpenOffice_org-zu +License: GPL v2 or later; LGPL v2.1 or later Summary: Zulu Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:zu) @@ -1081,6 +1142,7 @@ %endif %package -n OpenOffice_org-icon-themes +License: GPL v2 or later; LGPL v2.1 or later Summary: Icon Themes for OpenOffice.org Group: Productivity/Office/Suite Provides: OpenOffice_org:%ooo_prefix/%ooo_home/share/config/images.zip @@ -1150,8 +1212,10 @@ --with-binsuffix=%ooo_bin_suffix \ --with-installed-ooo-dirname=%ooo_home \ --with-distro="$with_distro" \ +%if %suse_version <= 1030 --with-intro-bitmaps="%{S:40} %{S:42}" \ --with-about-bitmaps="%{S:41} %{S:43}" \ +%endif --with-tag=%ooo_build_tag \ --with-lang=%ooo_langs \ --with-poor-help-localizations=%ooo_poor_help_localizations \ @@ -2109,6 +2173,11 @@ %defattr(-,root,root) %changelog +* Fri Mar 28 2008 pmladek@suse.cz +- updated to the milestone ooh680-m12 (2.4rc6 == 2.4-final) +- updated ooo-build to ooo-build-2.4.0.5: + * more Hungarian translation fixes +- added the branding related changes to be in sync with the main package * Thu Mar 13 2008 pmladek@suse.cz - updated to the milestone ooh680-m11 (2.4rc5) [fate#303312] - updated ooo-build to ooo-build-2.4.0.3 ++++++ OpenOffice_org.spec ++++++ --- /var/tmp/diff_new_pack.V12307/_old 2008-03-31 01:16:02.000000000 +0200 +++ /var/tmp/diff_new_pack.V12307/_new 2008-03-31 01:16:02.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org (Version 2.4.0.3) +# spec file for package OpenOffice_org (Version 2.4.0.5) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -120,11 +120,11 @@ %define ooo_prefix %_libdir %define ooo_home ooo-2.0 %define ooo_build_dir build -%define ooo_build_version 2.4.0.3 -%define ooo_build_tag ooh680-m11 +%define ooo_build_version 2.4.0.5 +%define ooo_build_tag ooh680-m12 License: Artistic License; BSD 3-Clause; GPL v2 or later; LaTeX Public License (LPPL); LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL); X11/MIT Group: Productivity/Office/Suite -Version: 2.4.0.3 +Version: 2.4.0.5 Release: 1 AutoReqProv: on PreReq: coreutils /usr/bin/update-mime-database @@ -137,6 +137,10 @@ Obsoletes: OpenOffice_org-hunspell %endif Obsoletes: OpenOffice_org2-hunspell +%if %suse_version > 1030 +Requires: %{name}-branding > 2 +Requires: %{name}-branding < 3 +%endif %if %suse_version > 1000 Recommends: myspell-american %else @@ -256,11 +260,13 @@ Source30: extra_localizations_sources.tar.bz2 # templates that can be used to create a new file on KDE desktop Source31: ooo-kde-templates.tar.bz2 -# branding stuff +%if %suse_version <= 1030 +# branding stuff; has been moved into separate packages in openSUSE-11.0 Source40: openintro_nld.bmp Source41: openabout_nld.bmp Source42: openintro_suse.bmp Source43: openabout_suse.bmp +%endif # Open XML MIME stuff Source500: ooo-2.0-openxml.xml Source501: openxml-gnome-icons.tar.bz2 @@ -273,6 +279,8 @@ Source512: ooo-2.0-vnd.oasis.opendocument.presentation.desktop Source513: ooo-2.0-vnd.oasis.opendocument.spreadsheet.desktop Source514: ooo-2.0-vnd.oasis.opendocument.text.desktop +# various MIME stuff +Source550: kde-mime-desktop.tar.bz2 %if %suse_version <= 1010 # obsolete wrapper, removed in openSUSE 10.2 Source600: OOo-wrapper @@ -331,6 +339,7 @@ %package base +License: GPL v2 or later; LGPL v2.1 or later Summary: OpenOffice.org Base Group: Productivity/Office/Suite Provides: OpenOffice_org:/usr/bin/oobase @@ -347,6 +356,7 @@ %package calc +License: GPL v2 or later; LGPL v2.1 or later Summary: OpenOffice.org Calc Group: Productivity/Office/Suite Provides: OpenOffice_org:/usr/bin/oocalc @@ -362,6 +372,7 @@ %package draw +License: GPL v2 or later; LGPL v2.1 or later Summary: OpenOffice.org Draw Group: Productivity/Office/Suite Provides: OpenOffice_org:/usr/bin/oodraw @@ -377,6 +388,7 @@ %package math +License: GPL v2 or later; LGPL v2.1 or later Summary: OpenOffice.org Math Group: Productivity/Office/Suite Provides: OpenOffice_org:/usr/bin/oomath @@ -392,6 +404,7 @@ %package impress +License: GPL v2 or later; LGPL v2.1 or later Summary: OpenOffice.org Impress Group: Productivity/Office/Suite Provides: OpenOffice_org:/usr/bin/ooimpress @@ -407,6 +420,7 @@ %package writer +License: GPL v2 or later; LGPL v2.1 or later Summary: OpenOffice.org Writer and Web Group: Productivity/Office/Suite Provides: OpenOffice_org:/usr/bin/oowriter @@ -422,6 +436,7 @@ %package filters +License: GPL v2 or later; LGPL v2.1 or later Summary: Additional Import and Export Filters for OpenOffice.org Group: Productivity/Office/Suite Provides: OpenOffice_org:%ooo_prefix/%ooo_home/share/xslt/docbook/DocBookTemplate.stw @@ -451,6 +466,7 @@ %package mailmerge +License: GPL v2 or later; LGPL v2.1 or later Summary: Mail Merge Functionality for OpenOffice.org Group: Productivity/Office/Suite Provides: OpenOffice_org:%ooo_prefix/%ooo_home/program/mailmerge.py @@ -466,6 +482,7 @@ %package pyuno +License: GPL v2 or later; LGPL v2.1 or later Summary: Python UNO Bridge for OpenOffice.org Group: Productivity/Office/Suite Provides: OpenOffice_org:%ooo_prefix/%ooo_home/program/pyuno.so @@ -486,6 +503,7 @@ %package testtool +License: GPL v2 or later; LGPL v2.1 or later Summary: OpenOffice.org Test Tool Group: Productivity/Office/Suite Provides: OpenOffice_org:%ooo_prefix/%ooo_home/program/testtool.bin @@ -497,6 +515,7 @@ %package gnome +License: GPL v2 or later; LGPL v2.1 or later Summary: GNOME Extensions for OpenOffice.org Group: Productivity/Office/Suite Provides: ooo:/usr/lib/ooo-1.9/program/libevoab2.so @@ -514,6 +533,7 @@ %package kde +License: GPL v2 or later; LGPL v2.1 or later Summary: KDE Extensions for OpenOffice.org Group: Productivity/Office/Suite Provides: OpenOffice_org17-kde @@ -529,7 +549,10 @@ +%if %suse_version <= 1030 + %package nld +License: GPL v2 or later; LGPL v2.1 or later Summary: NLD Branding for OpenOffice.org Group: Productivity/Office/Suite Requires: %name = %version @@ -544,9 +567,41 @@ +%else + +%package branding-upstream +License: GPL v2 or later; LGPL v2.1 or later +Summary: Original Branding for OpenOffice.org +Group: Productivity/Office/Suite +Provides: %{name}-branding = %{version} +Supplements: branding-upstream +#BRAND: source: %ooo_build_tag-core.tar.bz2:%ooo_build_tag/default_images/introabout/intro.bmp +#BRAND: type: PC bitmap data, Windows 3.x format, 400 x 299 x 24 (BMP) +#BRAND: purpose: "splash" image displayed for a short time, when the application is launching +#BRAND: text: should mention the app name "OpenOffice.org" and the major version "2" +#BRAND: context: no border is being displayed around the splash windows +#BRAND: the picture is overlapped by the progress bar: x,y=212,216; w,h=263,8 +#BRAND: the default progress bar color is 0,0,128 (blue) +#BRAND: the progress bar has 1 pixel width white border +#BRAND: +#BRAND: source: %ooo_build_tag-core.tar.bz2:%ooo_build_tag/default_images/introabout/about.bmp +#BRAND: type: PC bitmap data, Windows 3.x format, 415 x 95 x 24 (BMP) +#BRAND: purpose: displayed on top of the Help/About OpenOffice.org dialog +#BRAND: text: should mention the app name "OpenOffice.org" and the major version "2" +#BRAND: context: there are displayed several lines of some text below the picture +#BRAND: the text is black on a white background + +%description branding-upstream +This package includes the original branding for the OpenOffice.org +office suite. + + + +%endif %if %ooo_build_sdk == yes %package sdk +License: GPL v2 or later; LGPL v2.1 or later Summary: OpenOffice.org SDK Group: Documentation/HTML Requires: %name = %version @@ -565,6 +620,7 @@ %package sdk-doc +License: GPL v2 or later; LGPL v2.1 or later Summary: OpenOffice.org SDK Documentation Group: Development/Libraries/Other %if %suse_version > 1000 @@ -584,6 +640,7 @@ %if %suse_version <= 1030 %package mono +License: GPL v2 or later; LGPL v2.1 or later Summary: Mono UNO Bridge for OpenOffice.org Group: Productivity/Office/Suite PreReq: mono-core @@ -606,6 +663,7 @@ %if %with_java != no %package officebean +License: GPL v2 or later; LGPL v2.1 or later Summary: OfficeBean Java Bean component for OpenOffice.org Group: Productivity/Office/Suite Provides: %name:/usr/lib/ooo-2.0/program/libofficebean.so @@ -636,6 +694,7 @@ %endif %package devel +License: Artistic License; BSD 3-Clause; GPL v2 or later; LaTeX Public License (LPPL); LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL); X11/MIT Summary: A Free Office Suite (Framework) Group: Productivity/Office/Suite # FIXME: need until the devel package duplicates all the libraries @@ -684,7 +743,7 @@ %if %prepare_build == 0 %setup -D -T -q -n ooo-build-%ooo_build_version %else -%setup -q -n ooo-build-%ooo_build_version -a501 -a510 +%setup -q -n ooo-build-%ooo_build_version -a501 -a510 -a550 %patch0 %patch1 %patch2 @@ -761,8 +820,10 @@ --with-binsuffix=%ooo_bin_suffix \ --with-installed-ooo-dirname=%ooo_home \ --with-distro="$with_distro" \ +%if %suse_version <= 1030 --with-intro-bitmaps="%{S:40} %{S:42}" \ --with-about-bitmaps="%{S:41} %{S:43}" \ +%endif --with-tag=%ooo_build_tag \ --with-lang=%ooo_langs \ --with-poor-help-localizations=%ooo_poor_help_localizations \ @@ -871,6 +932,10 @@ install -m 644 %{S:513} $RPM_BUILD_ROOT/opt/kde3/share/mimelnk/application install -m 644 %{S:514} $RPM_BUILD_ROOT/opt/kde3/share/mimelnk/application # +# various MIME stuff +mkdir -p $RPM_BUILD_ROOT/opt/kde3/share/mimelnk/application +cp -a kde-mime-desktop/* $RPM_BUILD_ROOT/opt/kde3/share/mimelnk/application +# # extra fix for SLED %if %sles_version >= 10 # hide the Writer/Web menu entry on SLED10, n#168663 @@ -1001,11 +1066,13 @@ /usr/bin/ooconfig /usr/bin/oofromtemplate /usr/bin/ootool +/usr/bin/unopkg /usr/bin/soffice # this symlink will be updated in %post and %postun %ghost /usr/bin/soffice /usr/sbin/* /usr/share/man/man1/* +/usr/share/applications/ooo-extension-manager.desktop /usr/share/applications/template.desktop %if %suse_version < 930 %dir /usr/share/mime @@ -1089,9 +1156,15 @@ %files -f %ooo_build_dir/kde_list.txt kde %defattr(-,root,root) +%if %suse_version <= 1030 %files -f %ooo_build_dir/nld_list.txt nld %defattr(-,root,root) +%else + +%files -f %ooo_build_dir/upstream_branding_list.txt branding-upstream +%defattr(-,root,root) +%endif %if %ooo_build_sdk == yes %files -f %ooo_build_dir/sdk_list.txt sdk @@ -1122,6 +1195,28 @@ %{_prefix}/bin/dmake %changelog +* Fri Mar 28 2008 pmladek@suse.cz +- updated to the milestone ooh680-m12 (2.4rc6 == 2.4-final) +- updated ooo-build to ooo-build-2.4.0.5: + * better support for various formula syntax + * left-mouse click and protected cell crasher [n#371204] + * cell background painting improvements [n#361360, i#3907] + * wrong result of interactive functions, e.g MIN [n#372255] + * better floating-point rounding error fix [n#310706, i#86775] + * more on the localized arg separator stuff [n#358558, n#373479] + * detect the symlinked mozilla wrapper correctly [n#368532, i#87258] + * interference between R1C1 and localized arg separator stuff [n#372494] + * visual feedback for copied cell range [n#367489] + * keys that quits the paste on Enter mode [n#372446] + * output range format in the datapilot regression + * drag&drop with plus/minus signs in Navigator [i#64886, n#129410] + * unopkg wrapper and association with .oxt [n#352574] + * VBA bits: + * support worksheet_deactivate events +- updated branding packaging to the openSUSE >= 11.0 style: + * created branding-upstream subpackage + * moved openSUSE and SLED10 branding to extra packages + * kept compatibility when building for older distros * Thu Mar 13 2008 pmladek@suse.cz - updated to the milestone ooh680-m11 (2.4rc5) [fate#303312] - updated ooo-build to ooo-build-2.4.0.3: ++++++ ooh680-m11-binfilter.tar.bz2 -> ooh680-m12-binfilter.tar.bz2 ++++++ arch/i386/OpenOffice_org/ooh680-m11-binfilter.tar.bz2 /mounts/work_src_done/STABLE/OpenOffice_org/ooh680-m12-binfilter.tar.bz2 differ: byte 11, line 1 ++++++ ooh680-m11-core.tar.bz2 -> ooh680-m12-core.tar.bz2 ++++++ arch/i386/OpenOffice_org/ooh680-m11-core.tar.bz2 /mounts/work_src_done/STABLE/OpenOffice_org/ooh680-m12-core.tar.bz2 differ: byte 11, line 1 ++++++ ooh680-m11-lang.tar.bz2 -> ooh680-m12-lang.tar.bz2 ++++++ arch/i386/OpenOffice_org/ooh680-m11-lang.tar.bz2 /mounts/work_src_done/STABLE/OpenOffice_org/ooh680-m12-lang.tar.bz2 differ: byte 11, line 1 ++++++ ooh680-m11-sdk_oo.tar.bz2 -> ooh680-m12-sdk_oo.tar.bz2 ++++++ ++++++ ooh680-m11-system.tar.bz2 -> ooh680-m12-system.tar.bz2 ++++++ arch/i386/OpenOffice_org/ooh680-m11-system.tar.bz2 /mounts/work_src_done/STABLE/OpenOffice_org/ooh680-m12-system.tar.bz2 differ: byte 11, line 1 ++++++ ooo-build-2.4.0.3.tar.gz -> ooo-build-2.4.0.5.tar.gz ++++++ arch/i386/OpenOffice_org/ooo-build-2.4.0.3.tar.gz /mounts/work_src_done/STABLE/OpenOffice_org/ooo-build-2.4.0.5.tar.gz differ: byte 5, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de