Hello community, here is the log from the commit of package OpenOffice_org checked in at Sat Jul 12 12:08:18 CEST 2008. -------- --- arch/i386/OpenOffice_org/OpenOffice_org.changes 2008-06-25 14:31:07.000000000 +0200 +++ /mounts/work_src_done/STABLE/OpenOffice_org/OpenOffice_org.changes 2008-07-03 10:58:36.000000000 +0200 @@ -1,0 +2,86 @@ +Wed Jul 2 21:37:49 CEST 2008 - pmladek@suse.cz + +- updated to the milestone dev300-m21 (3.0-alphax) +- updated ooo-build to version 2.99.21: + * Excel export encryption support (i#60305, i#71468, i#84766) + * WP file-formats password protection + * CJK character unit is back again + * slideshow media control (i#91250) + * allow to insert SVGs into documents + * shrink font automatically in text boxes in Impress + * Macro Nudge, 10x nudge function (i#91249, bnc#188199) + * don't lstat() that much while creating absolute URLs + * lots improvements in the SVG import filter + * lots fixes in the data pilot (i#83250, i#88473, i#88531) + * lots improvements of the layout stuff + * EMF+ import fixes (bnc#361534) + * better support for various formula syntax + * FREQUENCY function regression (i#88477) + * better highlighting of current row + * bin check for incompatible ODF version + * no source border when doing cut [Jon] + * opening a tab delimited CSV file (bnc#376473) + * tab color of selected and unselected sheets (bnc#386029) + * allow special characters in sheet names (i#6087) + * INDIRECT and Text as numbers calculation error (bnc#391330) + * center content when toggling merge cells (bnc#398243, lp#236378) + * column/row breaks and fit to x pages (bnc#404232, bnc#404563) + * rename the obsolete SFX_NOTIFY to Notify (i#89804) + * better fix for the rounding problems (i#86775) + * cutting cell and moving cursor (bnc#388770) + * page format in print preview (bnc#386052) + * warn when inserting a linked graphic (bnc#348149) + * deselected inplace OLE objects (i#89283, bnc#384506) + * easy moving of Draw/Impress text frames (bnc#384563) + * honour XDG_CONFIG_HOME environment variable (i#91247) + * "Animate attached Shape" check box (bnc#380036, i#69364) + * hidden slides in custom slideshow (bnc#355638, i#90145) + * hyperlinks with numeric slide names (bnc#355674, i#55224) + * handle multipart object records (bnc#385338) + * export to MS Word Doc crasher (bnc#391197) + * documents with form fields crasher (bnc#390953) + * better conformance to DIS26300 (ODF) (bnc#396280) + * object positioning in tables (bnc#367341, i#18732) + * Word document set to Read Only (i#90306) + * title style cannot set alignment (i#23221) + * WebDAV locking timeout (bnc#403724) + * fixed crash in RandR (bnc#398244, i#90809) + * open document with trailing space in folder name (bnc#277603) + * do not lost pictures added by drag and drop (bnc#348149) + * allow to change broken java configuration (i#83140, bnc#393719) + * bash completion for writer and master documents (bnc#257299) + * mozilla plug-in crashes on x86_64 (i#82545) + * shrinked french localization (bnc#340679, i#89475) + * loading and storing SMB hyperlinks (bnc#382718) + * hyperlinks without scheme (bnc#376389, i#91105) + * avoid unnecessary dns lookup (bnc#389257) + * Chinese forbidden characters + * VBA bits: + * lots improvements of user forms and even handling + * workbook/worksheet events and event handle class + * support multiple array indices (i#75443) + * Worksheet_SelectionChange event (bnc#388049) + * delegate security check to the basic manager + * PageSetup interface and PrintArea method + * brackets and array syntax handling + * hyperlink service and interface + * non-working mediawiki extension + * switch on VBA import by default + * myFunction Not bBool (bnc#397325) + * empty types comparison (bnc#397438) + * support Range.ShowDetail, Range.MergeArea + * osx button names not imported (bnc#359933) + * packaging of extensions that we build it +- added ant-apache-regexp to BuildRequires +- switched to mozilla-xulrunner190 for openSUSE > 11.0 +- changed ooo-home from ooo-2.0 to ooo3 +- started to require 3.x branding +- split en-US localization and help content into separate packages; moved + them to the l10n-group1 source package +- added extra extsw source with extensions +- updated for the new three layer structure (basis subdir dir) +- installed the KDE templates also for KDE4 on openSUSE > 10.1 +- added symlink for acor_fr-CA.dat until we have a more generic solution for + the autocorrection fallback (bnc#364523) + +------------------------------------------------------------------- --- arch/i386/OpenOffice_org/OpenOffice_org-icon-themes.changes 2008-06-25 14:31:22.000000000 +0200 +++ /mounts/work_src_done/STABLE/OpenOffice_org/OpenOffice_org-icon-themes.changes 2008-07-03 10:48:57.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Jul 3 10:48:20 CEST 2008 - pmladek@suse.cz + +- updated to version 2.99.21 +- updated for the new three layer structure (basis subdir dir) + +------------------------------------------------------------------- New Changes file: --- /dev/null 2006-09-20 18:56:23.000000000 +0200 +++ /mounts/work_src_done/STABLE/OpenOffice_org/OpenOffice_org-l10n-group1.changes 2008-07-03 11:03:59.000000000 +0200 @@ -0,0 +1,236 @@ +------------------------------------------------------------------- +Thu Jul 3 10:52:18 CEST 2008 - pmladek@suse.cz + +- updated to the milestone dev300-m21 (3.0-alphax) +- updated to version 2.99.21 +- added extra extsw source with extensions +- updated for the new three layer structure (basis subdir dir) +- added en-US subpackage +- renamed to the structure OpenOffice_org-l10n-<lang> to differ it + from the other OOo subpackages and make the orientation easier +- split optional help-<lang> subpackages +- added ooo-l10n-gen-spec and ooo-l10n-group1 to generate parts + of the spec file + +------------------------------------------------------------------- +Tue Jun 24 20:09:17 CEST 2008 - pmladek@suse.cz + +- updated to the milestone ooh680-m17 == 2.4.1rc2 == 2.4.1-final +- updated ooo-build to version 2.4.1.7 + +------------------------------------------------------------------- +Thu Jun 5 21:32:27 CEST 2008 - pmladek@suse.cz + +- updated ooo-build to version 2.4.0.14 + +------------------------------------------------------------------- +Thu May 22 21:00:33 CEST 2008 - pmladek@suse.cz + +- updated ooo-build to version 2.4.0.13 +- updated the with_distro option for the split configuration + +------------------------------------------------------------------- +Fri May 9 12:20:23 CEST 2008 - pmladek@suse.cz + +- updated ooo-build to ooo-build-2.4.0.10 + +------------------------------------------------------------------- +Thu Apr 24 20:08:10 CEST 2008 - pmladek@suse.cz + +- updated ooo-build to ooo-build-2.4.0.8 +- added back the extra localizations sources; were removed by mistake + (bnc#335643) +- fixed build dependency in the oox module +- better support for L3 team: + * use autoreconf instead of autoconf to work even with ooo-build generated + on newer system + * sample comments where and how to put extra patches + +------------------------------------------------------------------- +Mon Apr 14 14:54:35 CEST 2008 - pmladek@suse.cz + +- split from the OpenOffice_org-i18n package to build the localizations + on more machines and get the result faster +- moved the icon-themes subpackage to a separate source +- updated ooo-build to ooo-build-2.4.0.6 +- added libwpd-devel libwpg-devel libwps-devel hunspell-devel to BuildRequires + for openSUSE >= 11.0; to be in sync with the main package + +------------------------------------------------------------------- +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 + +------------------------------------------------------------------- +Thu Mar 13 21:15:47 CET 2008 - pmladek@suse.cz + +- updated to the milestone ooh680-m11 (2.4rc5) [fate#303312] +- updated ooo-build to ooo-build-2.4.0.3 +- updated oox and writerfilter to the snapshot 2008-02-29 + +------------------------------------------------------------------- +Thu Feb 28 20:49:34 CET 2008 - pmladek@suse.cz + +- updated to the milestone ooh680-m8 (2.4rc2) +- updated ooo-build to ooo-build-2.4.0 +- updated libwpd to version 0.8.14 +- updated extra translation sources: be-BY, bg, cs, da, et, fi, ga, km, mk, + sl, vi +- removed obsolete extra translation sources: hu, sh-YU, sr-CS +- fixed build dependencies: + * used java-devel instead of the obsolete java2-devel-packages + * added update-alternatives on SL 10.0 +- fixed dependencies: + * "de" subpackage should recommend myspell-german instead of requiring + myspell-german-dictionary; it helps the package installation solver to + prefer the newer German dictionary [bnc#343673] + * recommends the dictionaries instead of requiring + +------------------------------------------------------------------- +Thu Feb 7 16:26:44 CET 2008 - pmladek@suse.cz + +- enabled system icu in STABLE again + +------------------------------------------------------------------- +Fri Feb 1 12:08:51 CET 2008 - pmladek@suse.cz + +- updated to the milestone ooh680-m5 (2.4-betaX) +- updated ooo-build to 2.3.99.2 +- updated oox to snapshot 2008-01-29 +- updated libwps to version 0.1.2 +- updated libwpg to version 0.1.2 +- updated libwpg to version 0.1.2 +- updated the prebuilt cli_types.dll +- moved witerfilter stuff to extra tarball, snapshot 2008-01-29 +- removed obsolete xorg-x11-Xvfb from BuildRequires +- removed unused startup-notification-devel libsndfile-devel from BuildRequires +- removed unused glitz sources +- "sr-CS" was internaly renamed to "sr" and "sh-YU" to "sh" +- renamed option --with-icecream-max-jobs to --with-max-jobs + +------------------------------------------------------------------- +Tue Dec 11 17:19:26 CET 2007 - pmladek@suse.cz + +- updated ooo-build to 2.3.1.1 +- temporary disabled the new EMF+ support; still not enough stable + +------------------------------------------------------------------- +Mon Dec 3 18:58:45 CET 2007 - pmladek@suse.cz + +- updated to milestone oog680-m9 (OOo-2.3.1rc1 == final) +- updated ooo-build to 2.3.1 + +------------------------------------------------------------------- +Wed Nov 21 17:08:25 CET 2007 - pmladek@suse.cz + +- updated to milestone oog680-m8 (OOo-2.3.1.betaX) +- updated ooo-build to 2.3.0.6 +- added changes to be in sync with the main package: + * updated cairo to version 1.4.10 (used only for older products) + * added temporary patches to disable SDK and system icu + * few build fixes + +------------------------------------------------------------------- +Tue Oct 9 19:23:26 CEST 2007 - pmladek@suse.cz + +- updated ooo-build to 2.3.0.5 +- fixed provides of icon-themes to fix update from older distributions + [n#328171] + +------------------------------------------------------------------- +Fri Sep 21 13:25:52 CEST 2007 - pmladek@suse.cz + +- milestone oog680-m5 has been marked OOo-2.3 final + +------------------------------------------------------------------- +Thu Sep 13 12:07:53 CEST 2007 - pmladek@suse.cz + +- updated to milestone oog680-m5 (OOo-2.3.rc3) +- updated ooo-build to 2.3.0.1.2 +- updated extra translation files: bg, cs, da, et, mk, vi + +------------------------------------------------------------------- +Mon Sep 3 17:02:36 CEST 2007 - pmladek@suse.cz + +- updated to milestone oog680-m3 (OOo-2.3.rc1) +- updated ooo-build to 2.3.0.1 + +------------------------------------------------------------------- +Fri Aug 31 18:25:40 CEST 2007 - pmladek@suse.cz + +- updated to milestone oog680-m2 (another OOo-2.3.beta, close rc1) +- updated ooo-build to oog680-m2 +- updated extra translation files: af, bg, cs, da, et, fi, ga, ka, lt, mk, nb, + nn, sk, sl, vi +- added extra translation file: gl +- removed unused Requires and Provides +- fixed build to update localizations from the external sources + +------------------------------------------------------------------- +Fri Aug 17 17:39:06 CEST 2007 - pmladek@suse.cz + +- updated to milestone oog680-m1 (another OOo-2.3.beta, close rc1) +- updated ooo-build to oog680-m1 + +------------------------------------------------------------------- +Fri Aug 10 17:41:47 CEST 2007 - pmladek@suse.cz + +- updated to milestone src680-m225 (another OOo-2.3.beta) +- updated ooo-build to src680-m225 +- improved icon-themes package [n#296502] + * removed the obsolete cyclic dependency on the main package + * removed obsolete compat symlinks + +------------------------------------------------------------------- +Mon Aug 6 18:45:05 CEST 2007 - pmladek@suse.cz + +- used PreReq instead of Requires to install the script link-to-ooo-home + in time [n#296502] + +------------------------------------------------------------------- +Fri Aug 3 13:00:58 CEST 2007 - kendy@suse.cz + +- updated to milestone src680-m224 (another OOo-2.3.beta) +- updated ooo-build to src680-m224 ++++ 39 more lines (skipped) ++++ between /dev/null ++++ and /mounts/work_src_done/STABLE/OpenOffice_org/OpenOffice_org-l10n-group1.changes New Changes file: --- /dev/null 2006-09-20 18:56:23.000000000 +0200 +++ /mounts/work_src_done/STABLE/OpenOffice_org/OpenOffice_org-l10n-group2.changes 2008-07-03 11:04:06.000000000 +0200 @@ -0,0 +1,236 @@ +------------------------------------------------------------------- +Thu Jul 3 10:52:18 CEST 2008 - pmladek@suse.cz + +- updated to the milestone dev300-m21 (3.0-alphax) +- updated to version 2.99.21 +- added extra extsw source with extensions +- updated for the new three layer structure (basis subdir dir) +- added en-US subpackage +- renamed to the structure OpenOffice_org-l10n-<lang> to differ it + from the other OOo subpackages and make the orientation easier +- split optional help-<lang> subpackages +- added ooo-l10n-gen-spec and ooo-l10n-group2 to generate parts + of the spec file + +------------------------------------------------------------------- +Tue Jun 24 20:09:17 CEST 2008 - pmladek@suse.cz + +- updated to the milestone ooh680-m17 == 2.4.1rc2 == 2.4.1-final +- updated ooo-build to version 2.4.1.7 + +------------------------------------------------------------------- +Thu Jun 5 21:32:27 CEST 2008 - pmladek@suse.cz + +- updated ooo-build to version 2.4.0.14 + +------------------------------------------------------------------- +Thu May 22 21:00:18 CEST 2008 - pmladek@suse.cz + +- updated ooo-build to version 2.4.0.13 +- updated the with_distro option for the split configuration + +------------------------------------------------------------------- +Fri May 9 12:20:15 CEST 2008 - pmladek@suse.cz + +- updated ooo-build to ooo-build-2.4.0.10 + +------------------------------------------------------------------- +Thu Apr 24 20:07:24 CEST 2008 - pmladek@suse.cz + +- updated ooo-build to ooo-build-2.4.0.8 +- added back the extra localizations sources; were removed by mistake + (bnc#335643) +- fixed build dependency in the oox module +- better support for L3 team: + * use autoreconf instead of autoconf to work even with ooo-build generated + on newer system + * sample comments where and how to put extra patches + +------------------------------------------------------------------- +Mon Apr 14 14:54:44 CEST 2008 - pmladek@suse.cz + +- split from the OpenOffice_org-i18n package to build the localizations + on more machines and get the result faster +- moved the icon-themes subpackage to a separate source +- updated ooo-build to ooo-build-2.4.0.6 +- added libwpd-devel libwpg-devel libwps-devel hunspell-devel to BuildRequires + for openSUSE >= 11.0; to be in sync with the main package + +------------------------------------------------------------------- +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 + +------------------------------------------------------------------- +Thu Mar 13 21:15:47 CET 2008 - pmladek@suse.cz + +- updated to the milestone ooh680-m11 (2.4rc5) [fate#303312] +- updated ooo-build to ooo-build-2.4.0.3 +- updated oox and writerfilter to the snapshot 2008-02-29 + +------------------------------------------------------------------- +Thu Feb 28 20:49:34 CET 2008 - pmladek@suse.cz + +- updated to the milestone ooh680-m8 (2.4rc2) +- updated ooo-build to ooo-build-2.4.0 +- updated libwpd to version 0.8.14 +- updated extra translation sources: be-BY, bg, cs, da, et, fi, ga, km, mk, + sl, vi +- removed obsolete extra translation sources: hu, sh-YU, sr-CS +- fixed build dependencies: + * used java-devel instead of the obsolete java2-devel-packages + * added update-alternatives on SL 10.0 +- fixed dependencies: + * "de" subpackage should recommend myspell-german instead of requiring + myspell-german-dictionary; it helps the package installation solver to + prefer the newer German dictionary [bnc#343673] + * recommends the dictionaries instead of requiring + +------------------------------------------------------------------- +Thu Feb 7 16:26:44 CET 2008 - pmladek@suse.cz + +- enabled system icu in STABLE again + +------------------------------------------------------------------- +Fri Feb 1 12:08:51 CET 2008 - pmladek@suse.cz + +- updated to the milestone ooh680-m5 (2.4-betaX) +- updated ooo-build to 2.3.99.2 +- updated oox to snapshot 2008-01-29 +- updated libwps to version 0.1.2 +- updated libwpg to version 0.1.2 +- updated libwpg to version 0.1.2 +- updated the prebuilt cli_types.dll +- moved witerfilter stuff to extra tarball, snapshot 2008-01-29 +- removed obsolete xorg-x11-Xvfb from BuildRequires +- removed unused startup-notification-devel libsndfile-devel from BuildRequires +- removed unused glitz sources +- "sr-CS" was internaly renamed to "sr" and "sh-YU" to "sh" +- renamed option --with-icecream-max-jobs to --with-max-jobs + +------------------------------------------------------------------- +Tue Dec 11 17:19:26 CET 2007 - pmladek@suse.cz + +- updated ooo-build to 2.3.1.1 +- temporary disabled the new EMF+ support; still not enough stable + +------------------------------------------------------------------- +Mon Dec 3 18:58:45 CET 2007 - pmladek@suse.cz + +- updated to milestone oog680-m9 (OOo-2.3.1rc1 == final) +- updated ooo-build to 2.3.1 + +------------------------------------------------------------------- +Wed Nov 21 17:08:25 CET 2007 - pmladek@suse.cz + +- updated to milestone oog680-m8 (OOo-2.3.1.betaX) +- updated ooo-build to 2.3.0.6 +- added changes to be in sync with the main package: + * updated cairo to version 1.4.10 (used only for older products) + * added temporary patches to disable SDK and system icu + * few build fixes + +------------------------------------------------------------------- +Tue Oct 9 19:23:26 CEST 2007 - pmladek@suse.cz + +- updated ooo-build to 2.3.0.5 +- fixed provides of icon-themes to fix update from older distributions + [n#328171] + +------------------------------------------------------------------- +Fri Sep 21 13:25:52 CEST 2007 - pmladek@suse.cz + +- milestone oog680-m5 has been marked OOo-2.3 final + +------------------------------------------------------------------- +Thu Sep 13 12:07:53 CEST 2007 - pmladek@suse.cz + +- updated to milestone oog680-m5 (OOo-2.3.rc3) +- updated ooo-build to 2.3.0.1.2 +- updated extra translation files: bg, cs, da, et, mk, vi + +------------------------------------------------------------------- +Mon Sep 3 17:02:36 CEST 2007 - pmladek@suse.cz + +- updated to milestone oog680-m3 (OOo-2.3.rc1) +- updated ooo-build to 2.3.0.1 + +------------------------------------------------------------------- +Fri Aug 31 18:25:40 CEST 2007 - pmladek@suse.cz + +- updated to milestone oog680-m2 (another OOo-2.3.beta, close rc1) +- updated ooo-build to oog680-m2 +- updated extra translation files: af, bg, cs, da, et, fi, ga, ka, lt, mk, nb, + nn, sk, sl, vi +- added extra translation file: gl +- removed unused Requires and Provides +- fixed build to update localizations from the external sources + +------------------------------------------------------------------- +Fri Aug 17 17:39:06 CEST 2007 - pmladek@suse.cz + +- updated to milestone oog680-m1 (another OOo-2.3.beta, close rc1) +- updated ooo-build to oog680-m1 + +------------------------------------------------------------------- +Fri Aug 10 17:41:47 CEST 2007 - pmladek@suse.cz + +- updated to milestone src680-m225 (another OOo-2.3.beta) +- updated ooo-build to src680-m225 +- improved icon-themes package [n#296502] + * removed the obsolete cyclic dependency on the main package + * removed obsolete compat symlinks + +------------------------------------------------------------------- +Mon Aug 6 18:45:05 CEST 2007 - pmladek@suse.cz + +- used PreReq instead of Requires to install the script link-to-ooo-home + in time [n#296502] + +------------------------------------------------------------------- +Fri Aug 3 13:00:58 CEST 2007 - kendy@suse.cz + +- updated to milestone src680-m224 (another OOo-2.3.beta) +- updated ooo-build to src680-m224 ++++ 39 more lines (skipped) ++++ between /dev/null ++++ and /mounts/work_src_done/STABLE/OpenOffice_org/OpenOffice_org-l10n-group2.changes Old: ---- minmem ooh680-m17-binfilter.tar.bz2 ooh680-m17-core.tar.bz2 ooh680-m17-lang.tar.bz2 ooh680-m17-sdk_oo.tar.bz2 ooh680-m17-system.tar.bz2 ooo-build-2.4.1.7.tar.gz ooo-build-bin.diff OpenOffice_org-i18n-group1.changes OpenOffice_org-i18n-group1.spec OpenOffice_org-i18n-group2.changes OpenOffice_org-i18n-group2.spec New: ---- dev300-m21-binfilter.tar.bz2 dev300-m21-core.tar.bz2 dev300-m21-lang.tar.bz2 dev300-m21-sdk_oo.tar.bz2 dev300-m21-swext.tar.bz2 dev300-m21-system.tar.bz2 ooo-build-2.99.21-split-icons-search-usr-share.diff ooo-build-2.99.21.tar.gz ooo-l10n-gen-spec ooo-l10n-group1 ooo-l10n-group2 OpenOffice_org-l10n-group1.changes OpenOffice_org-l10n-group1.spec OpenOffice_org-l10n-group2.changes OpenOffice_org-l10n-group2.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-icon-themes.spec ++++++ --- /var/tmp/diff_new_pack.E28065/_old 2008-07-12 12:06:07.000000000 +0200 +++ /var/tmp/diff_new_pack.E28065/_new 2008-07-12 12:06:07.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-icon-themes (Version 2.4.1.7) +# spec file for package OpenOffice_org-icon-themes (Version 2.99.21) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -13,11 +13,12 @@ Name: OpenOffice_org-icon-themes BuildRequires: OpenOffice_org-icon-themes-prebuilt -%define ooo_build_version 2.4.1.7 -%define ooo_home ooo-2.0 -License: GPL v2 or later; LGPL v2.1 or later +%define ooo_build_version 2.99.21 +%define ooo_basis_dir basis3.0 +%define ooo_home ooo3 +License: LGPL v2.1 only; LGPL v3 only Group: Productivity/Office/Suite -Version: 2.4.1.7 +Version: 2.99.21 Release: 1 AutoReqProv: on Provides: OpenOffice_org:%_libdir/%ooo_home/share/config/images.zip @@ -37,12 +38,12 @@ %build %install -install -m 755 -d $RPM_BUILD_ROOT%_datadir/%ooo_home/share/config +install -m 755 -d $RPM_BUILD_ROOT%_datadir/%ooo_home/%ooo_basis_dir/share/config for file in images_crystal.zip images_hicontrast.zip \ images_industrial.zip images_tango.zip \ images.zip ; do - install -m644 %_libdir/%ooo_home/share/config/$file \ - $RPM_BUILD_ROOT%_datadir/%ooo_home/share/config + install -m644 %_libdir/%ooo_home/%ooo_basis_dir/share/config/$file \ + $RPM_BUILD_ROOT%_datadir/%ooo_home/%ooo_basis_dir/share/config done %clean @@ -53,6 +54,9 @@ %_datadir/%ooo_home %changelog +* Thu Jul 03 2008 pmladek@suse.cz +- updated to version 2.99.21 +- updated for the new three layer structure (basis subdir dir) * Tue Jun 24 2008 pmladek@suse.cz - updated to version 2.4.1.7 * Thu Jun 05 2008 pmladek@suse.cz ++++++ OpenOffice_org-l10n-group1.spec ++++++ ++++ 842 lines (skipped) OpenOffice_org-l10n-group2.spec: same change ++++++ OpenOffice_org.spec ++++++ --- /var/tmp/diff_new_pack.E28065/_old 2008-07-12 12:06:08.000000000 +0200 +++ /var/tmp/diff_new_pack.E28065/_new 2008-07-12 12:06:08.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org (Version 2.4.1.7) +# spec file for package OpenOffice_org (Version 2.99.21) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -13,6 +13,7 @@ Name: OpenOffice_org BuildRequires: ImageMagick ant bison boost-devel ccache cups-devel curl-devel db-devel flac-devel flex gnome-vfs2-devel gperf gtk2-devel icu 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 +BuildRequires: ant-apache-regexp %ifarch %ix86 BuildRequires: java-devel %else @@ -32,17 +33,19 @@ BuildRequires: update-alternatives %endif # mozilla stuff -%if %suse_version > 1010 +%if %suse_version > 1100 +BuildRequires: mozilla-xulrunner190-devel +%endif +%if %suse_version > 1010 && %suse_version <= 1100 BuildRequires: mozilla-xulrunner181-devel -%else -%if %suse_version > 1000 -# for SL 10.1 +%endif +%if %suse_version > 1000 && %suse_version <= 1010 BuildRequires: gecko-sdk mozilla-xulrunner -%else +%endif +%if %suse_version <= 1000 # for BuildService on SL 10.0 BuildRequires: mozilla-devel mozilla-nss mozilla-nss-devel %endif -%endif # 10.3 features %if %suse_version > 1020 BuildRequires: libicu-devel @@ -128,13 +131,14 @@ %endif # %define ooo_prefix %_libdir -%define ooo_home ooo-2.0 +%define ooo_home ooo3 +%define ooo_base_dir basis3.0 %define ooo_build_dir build -%define ooo_build_version 2.4.1.7 -%define ooo_build_tag ooh680-m17 -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 +%define ooo_build_version 2.99.21 +%define ooo_build_tag dev300-m21 +License: Artistic License; BSD 3-Clause; GPL v2 or later; LaTeX Public License (LPPL); LGPL v2.1 or later; LGPL v3 only; MOZILLA PUBLIC LICENSE (MPL/NPL); X11/MIT Group: Productivity/Office/Suite -Version: 2.4.1.7 +Version: 2.99.21 Release: 1 AutoReqProv: on PreReq: coreutils /usr/bin/update-mime-database @@ -148,14 +152,11 @@ %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 -Requires: myspell-american +Requires: %{name}-branding >= 2.99 +Requires: %{name}-branding < 4 %endif +Requires: OpenOffice_org-l10n-en-US +Recommends: OpenOffice_org-help-en-US # we need a JRE for oobase and the other stuff # gij is enough on SL 10.1 and higher %if %suse_version > 1000 @@ -264,6 +265,7 @@ # native OpenXML import filter sources Source21: oox.2008-02-29.tar.bz2 Source22: writerfilter.2008-02-29.tar.bz2 +Source23: %ooo_build_tag-swext.tar.bz2 # more recent or additional localizations # ftp://ftp.linux.cz/pub/localization/OpenOffice.org/devel/build/Files # http://hu.openoffice.org/source/browse/hu/src @@ -298,17 +300,13 @@ # FIXME: temporary disabled some rpmlint error; they should be fixed by the # upcomming big package split and rework Source601: %name-rpmlintrc -# FIXME: script that links noarch stuff to the ooo-home -# it will be better to fix OOo to find the noarch stuff -# on the right place -Source602: link-to-ooo-home # # patches against ooo-build # Patch0: ooo-build-2.4-enable-foo.diff # example -Patch0: ooo-build-bin.diff +Patch0: ooo-build-pack-noarch.diff Patch1: ooo-build-helpcontent-en-us-only.diff -Patch2: ooo-build-pack-noarch.diff -Patch3: ooo-build-help-in-usr-share.diff +Patch2: ooo-build-help-in-usr-share.diff +Patch3: ooo-build-2.99.21-split-icons-search-usr-share.diff # # patches against the upstream sources, must be -p0 # Patch1000: bug-123456-fix-foo.diff # example @@ -354,7 +352,7 @@ %package base -License: GPL v2 or later; LGPL v2.1 or later +License: LGPL v3 only Summary: OpenOffice.org Base Group: Productivity/Office/Suite Provides: OpenOffice_org:/usr/bin/oobase @@ -371,7 +369,7 @@ %package calc -License: GPL v2 or later; LGPL v2.1 or later +License: LGPL v3 only Summary: OpenOffice.org Calc Group: Productivity/Office/Suite Provides: OpenOffice_org:/usr/bin/oocalc @@ -387,7 +385,7 @@ %package draw -License: GPL v2 or later; LGPL v2.1 or later +License: LGPL v3 only Summary: OpenOffice.org Draw Group: Productivity/Office/Suite Provides: OpenOffice_org:/usr/bin/oodraw @@ -403,7 +401,7 @@ %package math -License: GPL v2 or later; LGPL v2.1 or later +License: LGPL v3 only Summary: OpenOffice.org Math Group: Productivity/Office/Suite Provides: OpenOffice_org:/usr/bin/oomath @@ -419,7 +417,7 @@ %package impress -License: GPL v2 or later; LGPL v2.1 or later +License: LGPL v3 only Summary: OpenOffice.org Impress Group: Productivity/Office/Suite Provides: OpenOffice_org:/usr/bin/ooimpress @@ -435,7 +433,7 @@ %package writer -License: GPL v2 or later; LGPL v2.1 or later +License: LGPL v3 only Summary: OpenOffice.org Writer and Web Group: Productivity/Office/Suite Provides: OpenOffice_org:/usr/bin/oowriter @@ -451,7 +449,7 @@ %package filters -License: GPL v2 or later; LGPL v2.1 or later +License: LGPL v3 only 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 @@ -481,7 +479,7 @@ %package mailmerge -License: GPL v2 or later; LGPL v2.1 or later +License: LGPL v3 only Summary: Mail Merge Functionality for OpenOffice.org Group: Productivity/Office/Suite Provides: OpenOffice_org:%ooo_prefix/%ooo_home/program/mailmerge.py @@ -497,7 +495,7 @@ %package pyuno -License: GPL v2 or later; LGPL v2.1 or later +License: LGPL v3 only Summary: Python UNO Bridge for OpenOffice.org Group: Productivity/Office/Suite Provides: OpenOffice_org:%ooo_prefix/%ooo_home/program/pyuno.so @@ -518,7 +516,7 @@ %package testtool -License: GPL v2 or later; LGPL v2.1 or later +License: LGPL v3 only Summary: OpenOffice.org Test Tool Group: Productivity/Office/Suite Provides: OpenOffice_org:%ooo_prefix/%ooo_home/program/testtool.bin @@ -530,7 +528,7 @@ %package gnome -License: GPL v2 or later; LGPL v2.1 or later +License: LGPL v3 only Summary: GNOME Extensions for OpenOffice.org Group: Productivity/Office/Suite Provides: ooo:/usr/lib/ooo-1.9/program/libevoab2.so @@ -548,7 +546,7 @@ %package kde -License: GPL v2 or later; LGPL v2.1 or later +License: LGPL v3 only Summary: KDE Extensions for OpenOffice.org Group: Productivity/Office/Suite Provides: OpenOffice_org17-kde @@ -585,7 +583,7 @@ %else %package branding-upstream -License: GPL v2 or later; LGPL v2.1 or later +License: LGPL v3 only Summary: Original Branding for OpenOffice.org Group: Productivity/Office/Suite Provides: %{name}-branding = %{version} @@ -616,7 +614,7 @@ %if %ooo_build_sdk == yes %package sdk -License: GPL v2 or later; LGPL v2.1 or later +License: LGPL v3 only Summary: OpenOffice.org SDK Group: Documentation/HTML Requires: %name = %version @@ -635,7 +633,7 @@ %package sdk-doc -License: GPL v2 or later; LGPL v2.1 or later +License: LGPL v3 only Summary: OpenOffice.org SDK Documentation Group: Development/Libraries/Other %if %suse_version > 1000 @@ -653,7 +651,7 @@ %if %suse_version > 930 %package mono -License: GPL v2 or later; LGPL v2.1 or later +License: LGPL v3 only Summary: Mono UNO Bridge for OpenOffice.org Group: Productivity/Office/Suite Requires: mono-core @@ -675,7 +673,7 @@ %if %with_java != no %package officebean -License: GPL v2 or later; LGPL v2.1 or later +License: LGPL v3 only Summary: OfficeBean Java Bean component for OpenOffice.org Group: Productivity/Office/Suite Provides: %name:/usr/lib/ooo-2.0/program/libofficebean.so @@ -706,7 +704,7 @@ %endif %package icon-themes-prebuilt -License: GPL v2 or later; LGPL v2.1 or later +License: LGPL v2.0 only; LGPL v3 only Summary: Prebuilt OpenOffice.org Icon Themes Group: Development/Sources @@ -723,7 +721,7 @@ %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 +License: Artistic License; BSD 3-Clause; GPL v2 or later; GPL v3 only; LaTeX Public License (LPPL); LGPL v2.1 or later; LGPL v3 only; 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 @@ -780,7 +778,7 @@ %patch1 %patch2 %patch3 -install -m 644 %{S:1} %{S:2} %{S:3} %{S:6} %{S:7} %{S:8} %{S:9} %{S:10} %{S:11} %{S:13} %{S:14} %{S:15} %{S:16} %{S:17} %{S:18} %{S:19} %{S:20} %{S:21} %{S:22} src/ +install -m 644 %{S:1} %{S:2} %{S:3} %{S:6} %{S:7} %{S:8} %{S:9} %{S:10} %{S:11} %{S:13} %{S:14} %{S:15} %{S:16} %{S:17} %{S:18} %{S:19} %{S:20} %{S:21} %{S:22} %{S:23} src/ %if %suse_version <= 1010 # FIXME: the current OOo version does not longer work with the old neon, so # we have to use the internal one @@ -913,6 +911,10 @@ make DESTDIR=$RPM_BUILD_ROOT install # fix permissions of .so files find $RPM_BUILD_ROOT%ooo_prefix/%ooo_home/program -name '*.so*' -type f -exec chmod a+x {} \; +find $RPM_BUILD_ROOT%ooo_prefix/%ooo_home/%ooo_base_dir/program -name '*.so*' -type f -exec chmod a+x {} \; +# +# create basis-link in /usr/share +ln -sf %ooo_base_dir $RPM_BUILD_ROOT%_datadir/%ooo_home/basis-link # # update desktop files # FIXME: we would like to update translations but the macro disables many @@ -925,10 +927,19 @@ %suse_update_desktop_file -n web %suse_update_desktop_file -n writer # install templates that can be used to create new files on KDE desktop -install -m 755 -d $RPM_BUILD_ROOT/opt/kde3/share/templates -tar -xjf %{S:31} -C $RPM_BUILD_ROOT/opt/kde3/share/templates -find $RPM_BUILD_ROOT/opt/kde3/share/templates -type f -exec chmod 644 {} \; -find $RPM_BUILD_ROOT/opt/kde3/share/templates -type d -exec chmod 755 {} \; +kde_dir= +%if %suse_version > 1010 +kde_dir="/usr/share/kde4/templates $kde_dir" +%endif +%if %suse_version <= 1100 +kde_dir="/opt/kde3/share/templates $kde_dir" +%endif +for dir in $kde_dir ; do + install -m 755 -d $RPM_BUILD_ROOT$dir + tar -xjf %{S:31} -C $RPM_BUILD_ROOT$dir + find $RPM_BUILD_ROOT$dir -type f -exec chmod 644 {} \; + find $RPM_BUILD_ROOT$dir -type d -exec chmod 755 {} \; +done # %if %name == OpenOffice_org # link to install-dict script @@ -970,6 +981,10 @@ mkdir -p $RPM_BUILD_ROOT/opt/kde3/share/mimelnk/application cp -a kde-mime-desktop/* $RPM_BUILD_ROOT/opt/kde3/share/mimelnk/application # +# FIXME: fast hack to solve a customer issue, n#364523 +# we need a more generic solution +ln -sf acor_fr-FR.dat $RPM_BUILD_ROOT%ooo_prefix/%ooo_home/%ooo_base_dir/share/autocorr/acor_fr-CA.dat +# # extra fix for SLED %if %sles_version >= 10 # hide the Writer/Web menu entry on SLED10, n#168663 @@ -1031,10 +1046,6 @@ sed -n -e 's/^\(.*\):[ ]*ELF.*, not stripped/\1/p'`; do strip -g "$f" || : done -# -# FIXME: script that links noarch stuff to the ooo-home -mkdir -p $RPM_BUILD_ROOT%_datadir/%ooo_home -install -m 755 %{S:602} $RPM_BUILD_ROOT%_datadir/%ooo_home %clean rm -rf $RPM_BUILD_ROOT @@ -1082,15 +1093,15 @@ %if %with_java != no %triggerin -- mysql-connector-java -%ooo_prefix/%ooo_home/program/java-set-classpath /usr/share/java/mysql-connector-java.jar || true +%ooo_prefix/%ooo_home/%ooo_base_dir/program/java-set-classpath /usr/share/java/mysql-connector-java.jar || true %triggerpostun -- mysql-connector-java -%ooo_prefix/%ooo_home/program/java-set-classpath /usr/share/java/mysql-connector-java.jar || true +%ooo_prefix/%ooo_home/%ooo_base_dir/program/java-set-classpath /usr/share/java/mysql-connector-java.jar || true %endif %ifarch %ix86 %triggerin -- python -%ooo_prefix/%ooo_home/program/pyunorc-update64 || true +%ooo_prefix/%ooo_home/%ooo_base_dir/program/pyunorc-update64 || true %endif %files -f %ooo_build_dir/common_list.txt @@ -1105,6 +1116,7 @@ # this symlink will be updated in %post and %postun %ghost /usr/bin/soffice /usr/sbin/* +%_datadir/%ooo_home/basis-link /usr/share/man/man1/* /usr/share/applications/ooo-extension-manager.desktop /usr/share/applications/template.desktop @@ -1118,8 +1130,16 @@ /usr/share/icons/* # FIXME: script that links noarch stuff to the ooo-home %dir %_datadir/%ooo_home -%_datadir/%ooo_home/link-to-ooo-home +%if %suse_version > 1010 +%dir /usr/share/kde4 +/usr/share/kde4/templates +%endif +%if %suse_version <= 1100 /opt/kde3/share/templates +%endif +# FIXME: fast hack to solve a customer issue, n#364523 +# we need a more generic solution +%ooo_prefix/%ooo_home/%ooo_base_dir/share/autocorr/acor_fr-CA.dat # # files needed when building for older products # @@ -1229,6 +1249,89 @@ %{_prefix}/bin/dmake %changelog +* Wed Jul 02 2008 pmladek@suse.cz +- updated to the milestone dev300-m21 (3.0-alphax) +- updated ooo-build to version 2.99.21: + * Excel export encryption support (i#60305, i#71468, i#84766) + * WP file-formats password protection + * CJK character unit is back again + * slideshow media control (i#91250) + * allow to insert SVGs into documents + * shrink font automatically in text boxes in Impress + * Macro Nudge, 10x nudge function (i#91249, bnc#188199) + * don't lstat() that much while creating absolute URLs + * lots improvements in the SVG import filter + * lots fixes in the data pilot (i#83250, i#88473, i#88531) + * lots improvements of the layout stuff + * EMF+ import fixes (bnc#361534) + * better support for various formula syntax + * FREQUENCY function regression (i#88477) + * better highlighting of current row + * bin check for incompatible ODF version + * no source border when doing cut [Jon] + * opening a tab delimited CSV file (bnc#376473) + * tab color of selected and unselected sheets (bnc#386029) + * allow special characters in sheet names (i#6087) + * INDIRECT and Text as numbers calculation error (bnc#391330) + * center content when toggling merge cells (bnc#398243, lp#236378) + * column/row breaks and fit to x pages (bnc#404232, bnc#404563) + * rename the obsolete SFX_NOTIFY to Notify (i#89804) + * better fix for the rounding problems (i#86775) + * cutting cell and moving cursor (bnc#388770) + * page format in print preview (bnc#386052) + * warn when inserting a linked graphic (bnc#348149) + * deselected inplace OLE objects (i#89283, bnc#384506) + * easy moving of Draw/Impress text frames (bnc#384563) + * honour XDG_CONFIG_HOME environment variable (i#91247) + * "Animate attached Shape" check box (bnc#380036, i#69364) + * hidden slides in custom slideshow (bnc#355638, i#90145) + * hyperlinks with numeric slide names (bnc#355674, i#55224) + * handle multipart object records (bnc#385338) + * export to MS Word Doc crasher (bnc#391197) + * documents with form fields crasher (bnc#390953) + * better conformance to DIS26300 (ODF) (bnc#396280) + * object positioning in tables (bnc#367341, i#18732) + * Word document set to Read Only (i#90306) + * title style cannot set alignment (i#23221) + * WebDAV locking timeout (bnc#403724) + * fixed crash in RandR (bnc#398244, i#90809) + * open document with trailing space in folder name (bnc#277603) + * do not lost pictures added by drag and drop (bnc#348149) + * allow to change broken java configuration (i#83140, bnc#393719) + * bash completion for writer and master documents (bnc#257299) + * mozilla plug-in crashes on x86_64 (i#82545) + * shrinked french localization (bnc#340679, i#89475) + * loading and storing SMB hyperlinks (bnc#382718) + * hyperlinks without scheme (bnc#376389, i#91105) + * avoid unnecessary dns lookup (bnc#389257) + * Chinese forbidden characters + * VBA bits: + * lots improvements of user forms and even handling + * workbook/worksheet events and event handle class + * support multiple array indices (i#75443) + * Worksheet_SelectionChange event (bnc#388049) + * delegate security check to the basic manager + * PageSetup interface and PrintArea method + * brackets and array syntax handling + * hyperlink service and interface + * non-working mediawiki extension + * switch on VBA import by default + * myFunction Not bBool (bnc#397325) + * empty types comparison (bnc#397438) + * support Range.ShowDetail, Range.MergeArea + * osx button names not imported (bnc#359933) + * packaging of extensions that we build it +- added ant-apache-regexp to BuildRequires +- switched to mozilla-xulrunner190 for openSUSE > 11.0 +- changed ooo-home from ooo-2.0 to ooo3 +- started to require 3.x branding +- split en-US localization and help content into separate packages; moved + them to the l10n-group1 source package +- added extra extsw source with extensions +- updated for the new three layer structure (basis subdir dir) +- installed the KDE templates also for KDE4 on openSUSE > 10.1 +- added symlink for acor_fr-CA.dat until we have a more generic solution for + the autocorrection fallback (bnc#364523) * Tue Jun 24 2008 pmladek@suse.cz - updated to the milestone ooh680-m17 == 2.4.1rc2 == 2.4.1-final - updated ooo-build to version 2.4.1.6: ++++++ ooo-build-2.99.21-split-icons-search-usr-share.diff ++++++ --- patches/dev300/apply.old 2008-07-03 10:44:21.000000000 +0200 +++ patches/dev300/apply 2008-07-03 10:45:06.000000000 +0200 @@ -917,7 +917,7 @@ pushfont-psstream.diff, i#84481, michael # search also /usr/share for icons # it is a temporary hack; we should do more clean FHS compliant installation # we need a good plan before, though ;-) -#FIXME dev300-m10: split-icons-search-usr-share.diff, n#296502, pmladek +split-icons-search-usr-share.diff, n#296502, pmladek # help is in /usr/share/ooo-2.0/help now --- patches/dev300/split-icons-search-usr-share.diff.old 2008-06-24 14:02:45.000000000 +0200 +++ patches/dev300/split-icons-search-usr-share.diff 2008-07-02 21:16:45.000000000 +0200 @@ -1,63 +1,67 @@ ---- vcl/source/gdi/impimagetree.cxx.old 2007-07-24 12:11:00.000000000 +0200 -+++ vcl/source/gdi/impimagetree.cxx 2007-08-09 18:54:33.000000000 +0200 -@@ -234,10 +234,25 @@ bool ImplImageTree::implInit() - - if( !mxFileAccess->exists( aRet = aZipURL.GetMainURL( INetURLObject::NO_DECODE ) ) ) - { -- if ( bWithStyle && maSymbolsStyle.getLength() > 0 ) -- aRet = implGetZipFileURL( false ); // Try without style -- else -- aRet = ::rtl::OUString(); -+ // try /usr/share -+ ::rtl::OUString aDataDir = ::rtl::OUString::createFromAscii ( "/usr/share/" ); -+#ifdef X86_64 -+ ::rtl::OUString aLibDir = ::rtl::OUString::createFromAscii ( "/usr/lib64/" ); -+#else -+ ::rtl::OUString aLibDir = ::rtl::OUString::createFromAscii ( "/usr/lib/" ); -+#endif -+ sal_Int32 nLibDirPos = aRet.indexOf( aLibDir ); -+ -+ if ( nLibDirPos >= 0 ) -+ { -+ if( !mxFileAccess->exists( aRet = aRet.replaceAt( nLibDirPos, aLibDir.getLength(), aDataDir ) ) ) -+ { -+ if ( bWithStyle && maSymbolsStyle.getLength() > 0 ) -+ aRet = implGetZipFileURL( false ); // Try without style -+ else -+ aRet = ::rtl::OUString(); -+ } -+ } - } - } - } ---- xmlhelp/source/cxxhelp/provider/provider.cxx.old 2007-06-05 20:28:52.000000000 +0200 -+++ xmlhelp/source/cxxhelp/provider/provider.cxx 2007-08-09 19:10:44.000000000 +0200 -@@ -368,7 +368,7 @@ void ContentProvider::init() - setupextension ); - rtl::OUString vendorshort = vendorname; - -- uno::Sequence< rtl::OUString > aImagesZipPaths( 2 ); -+ uno::Sequence< rtl::OUString > aImagesZipPaths( 3 ); - xHierAccess = getHierAccess( sProvider, "org.openoffice.Office.Common" ); - - rtl::OUString aPath( getKey( xHierAccess, "Path/Current/UserConfig" ) ); -@@ -378,6 +378,19 @@ void ContentProvider::init() - aPath = getKey( xHierAccess, "Path/Current/Config" ); - subst( aPath ); - aImagesZipPaths[ 1 ] = aPath; -+ -+ // try also /usr/share +--- vcl/source/gdi/impimagetree.cxx.old 2008-06-16 16:29:33.000000000 +0200 ++++ vcl/source/gdi/impimagetree.cxx 2008-07-02 21:04:02.000000000 +0200 +@@ -105,6 +105,19 @@ void ImplZipAccessor::Update( const ::rt + rtl::Bootstrap::expandMacros( aBrandPath ); + rtl::Bootstrap::expandMacros( aOOOPath ); + ++ // try /usr/share + ::rtl::OUString aDataDir = ::rtl::OUString::createFromAscii ( "/usr/share/" ); +#ifdef X86_64 + ::rtl::OUString aLibDir = ::rtl::OUString::createFromAscii ( "/usr/lib64/" ); +#else + ::rtl::OUString aLibDir = ::rtl::OUString::createFromAscii ( "/usr/lib/" ); +#endif -+ sal_Int32 nLibDirPos = aPath.indexOf( aLibDir ); + ++ rtl::OUString aOOOPathInShare; ++ sal_Int32 nLibDirPos = aOOOPath.indexOf( aLibDir ); + if ( nLibDirPos >= 0 ) -+ aPath = aPath.replaceAt( nLibDirPos, aLibDir.getLength(), aDataDir ); -+ aImagesZipPaths[ 2 ] = aPath; - - sal_Bool showBasic = getBooleanKey(xHierAccess,"Help/ShowBasic"); - m_pDatabases = new Databases( showBasic, ++ aOOOPathInShare = aOOOPath.replaceAt( nLibDirPos, aLibDir.getLength(), aDataDir ); ++ + // Theme Branding Zip + if( rSymbolsStyle.getLength() ) + { +@@ -120,6 +133,8 @@ void ImplZipAccessor::Update( const ::rt + aTmpURLVector.push_back( aThemeBrandURL.GetMainURL( INetURLObject::NO_DECODE ) ); + } + ++ ++ + // Branding Zip + INetURLObject aBrandURL( aBrandPath ); + ::rtl::OUString aBrandZip( aZipFileName ); +@@ -135,27 +150,35 @@ void ImplZipAccessor::Update( const ::rt + if( rSymbolsStyle.getLength() ) + { + INetURLObject aThemeURL( aOOOPath ); ++ INetURLObject aThemeInShareURL( aOOOPathInShare ); + ::rtl::OUString aThemeZip( aZipFileName ); + + ( aThemeZip += ::rtl::OUString::createFromAscii( "_" ) ) += rSymbolsStyle; + aThemeZip += ::rtl::OUString::createFromAscii( IMAGES_ZIPFILENAME_SUFFIX ); + aThemeURL.Append( aThemeZip ); ++ aThemeInShareURL.Append( aThemeZip ); + + if( mxFileAccess->exists( aThemeURL.GetMainURL( INetURLObject::NO_DECODE ) ) ) + aTmpURLVector.push_back( aThemeURL.GetMainURL( INetURLObject::NO_DECODE ) ); ++ if( mxFileAccess->exists( aThemeInShareURL.GetMainURL( INetURLObject::NO_DECODE ) ) ) ++ aTmpURLVector.push_back( aThemeInShareURL.GetMainURL( INetURLObject::NO_DECODE ) ); + } + + // Default Zip + if( rSymbolsStyle.getLength() ) + { + INetURLObject aDefaultURL( aOOOPath ); ++ INetURLObject aDefaultInShareURL( aOOOPath ); + ::rtl::OUString aDefaultZip( aZipFileName ); + + aDefaultZip += ::rtl::OUString::createFromAscii( IMAGES_ZIPFILENAME_SUFFIX ); + aDefaultURL.Append( aDefaultZip ); ++ aDefaultInShareURL.Append( aDefaultZip ); + + if( mxFileAccess->exists( aDefaultURL.GetMainURL( INetURLObject::NO_DECODE ) ) ) + aTmpURLVector.push_back( aDefaultURL.GetMainURL( INetURLObject::NO_DECODE ) ); ++ if( mxFileAccess->exists( aDefaultInShareURL.GetMainURL( INetURLObject::NO_DECODE ) ) ) ++ aTmpURLVector.push_back( aDefaultInShareURL.GetMainURL( INetURLObject::NO_DECODE ) ); + } + + if( xFactory.is() ) ++++++ ooo-build-2.4.1.7.tar.gz -> ooo-build-2.99.21.tar.gz ++++++ arch/i386/OpenOffice_org/ooo-build-2.4.1.7.tar.gz /mounts/work_src_done/STABLE/OpenOffice_org/ooo-build-2.99.21.tar.gz differ: byte 5, line 1 ++++++ ooo-build-helpcontent-en-us-only.diff ++++++ --- /var/tmp/diff_new_pack.E28065/_old 2008-07-12 12:06:12.000000000 +0200 +++ /var/tmp/diff_new_pack.E28065/_new 2008-07-12 12:06:12.000000000 +0200 @@ -1,5 +1,5 @@ ---- patches/src680/apply.old 2008-02-26 15:46:32.000000000 +0100 -+++ patches/src680/apply 2008-02-26 15:46:19.000000000 +0100 +--- patches/dev300/apply.old 2008-02-26 15:46:32.000000000 +0100 ++++ patches/dev300/apply 2008-02-26 15:46:19.000000000 +0100 @@ -1121,6 +1121,10 @@ libxmlsec-system-nss.diff, i#69368, pmla # allow separate helpcontent build #FIXME src680: separate-helpcontent.diff, jholesov @@ -12,7 +12,7 @@ speed-symbolic-functions.diff, i#85679, pmladek --- /dev/null 2007-09-21 21:12:45.000000000 +0200 -+++ patches/src680/helpcontent-en-us-only.diff 2008-02-26 16:12:22.000000000 +0100 ++++ patches/dev300/helpcontent-en-us-only.diff 2008-02-26 16:12:22.000000000 +0100 @@ -0,0 +1,10 @@ +--- helpcontent2/settings.pmk.old 2008-01-17 17:03:57.000000000 +0100 ++++ helpcontent2/settings.pmk 2008-02-26 15:51:31.000000000 +0100 ++++++ ooo-build-help-in-usr-share.diff ++++++ --- /var/tmp/diff_new_pack.E28065/_old 2008-07-12 12:06:12.000000000 +0200 +++ /var/tmp/diff_new_pack.E28065/_new 2008-07-12 12:06:12.000000000 +0200 @@ -1,5 +1,5 @@ ---- patches/src680/apply -+++ patches/src680/apply +--- patches/dev300/apply ++++ patches/dev300/apply @@ -702,6 +702,10 @@ # we need a good plan before, though ;-) split-icons-search-usr-share.diff, n#296502, pmladek @@ -11,8 +11,8 @@ [ BuildBits ] novell-win32-agfa-monotype-fonts.diff, i#63805, tml ---- patches/src680/officecfg-help-in-usr-share.diff -+++ patches/src680/officecfg-help-in-usr-share.diff +--- patches/dev300/officecfg-help-in-usr-share.diff ++++ patches/dev300/officecfg-help-in-usr-share.diff @@ -0,0 +1,31 @@ +--- officecfg/registry/schema/org/openoffice/Office/Common.xcs.old2 2007-08-24 16:15:30.000000000 +0200 ++++ officecfg/registry/schema/org/openoffice/Office/Common.xcs 2007-08-29 22:25:36.000000000 +0200 @@ -21,7 +21,7 @@ + <desc>Specifies the path to the Office help files.</desc> + </info> +- <value>$(instpath)/help</value> -++ <value>/usr/share/ooo-2.0/help</value> +++ <value>/usr/share/ooo3/basics3.0/help</value> + </prop> + <prop oor:name="Linguistic" oor:type="xs:string"> + <info> @@ -30,7 +30,7 @@ + <desc>Specifies the default directory where Office help files are located.</desc> + </info> +- <value>$(instpath)/help</value> -++ <value>/usr/share/ooo-2.0/help</value> +++ <value>/usr/share/ooo3/basics3.0/help</value> + </prop> + <prop oor:name="Linguistic" oor:type="xs:string"> + <info> @@ -41,7 +41,7 @@ + <node oor:name="Help" oor:op="fuse" oor:mandatory="true"> + <node oor:name="InternalPaths"> +- <node oor:name="$(instpath)/help" oor:op="fuse" /> -++ <node oor:name="/usr/share/ooo-2.0/help" oor:op="fuse" /> +++ <node oor:name="/usr/share/ooo3/basics3.0/help" oor:op="fuse" /> + </node> + </node> + ++++++ ooo-build-pack-noarch.diff ++++++ --- /var/tmp/diff_new_pack.E28065/_old 2008-07-12 12:06:12.000000000 +0200 +++ /var/tmp/diff_new_pack.E28065/_new 2008-07-12 12:06:12.000000000 +0200 @@ -1,6 +1,178 @@ ---- bin/package-ooo -+++ bin/package-ooo -@@ -833,6 +833,72 @@ +--- bin/ooinstall ++++ bin/ooinstall +@@ -122,6 +122,8 @@ + # which breaks the build... + $langs =~ s/,'/'/; + ++$langs = "en-US" if ($setup_vars{'HELPCONTENT_EN_US_ONLY'} eq 'YES'); ++ + $destdir=''; + if ( defined $setup_vars{OODESTDIR} && + $setup_vars{OODESTDIR} ne "" ) { +@@ -134,10 +136,15 @@ + $strip = "-dontstrip"; + } + ++$languagepack=''; ++if ($setup_vars{'LANGS_ONLY'} eq 'YES') { ++ $languagepack='-languagepack'; ++} ++ + print "Running OOo installer\n"; + system ("cd $setup_vars{OOBUILDDIR}/instsetoo_native/util ; " . + "perl -w $configure_vars{SOLARENV}/bin/make_installer.pl " . +- "-f openoffice.lst -l $langs -p OpenOffice " . ++ "-f openoffice.lst -l $langs $languagepack -p OpenOffice " . + "-buildid $BUILD $destdir $strip " . + "-simple $path") && die "Failed to install: $!"; + +@@ -158,6 +165,11 @@ + } + } + ++if ($setup_vars{'LANGS_ONLY'} eq 'YES') { ++ print "Installer finished\n"; ++ exit 0; ++} ++ + if (($setup_vars{'VENDORNAME'} eq 'Novell' || $setup_vars{'VENDORNAME'} eq 'Debian' || $setup_vars{'VENDORNAME'} eq 'Mandriva' ) && $configure_vars{BUILD_TYPE} =~ m/ODK/) { + print "Running SDK installer\n"; + system ("cd $setup_vars{OOBUILDDIR}/instsetoo_native/util ; " . +--- bin/package-ooo.old 2008-07-02 14:18:11.000000000 +0200 ++++ bin/package-ooo 2008-07-02 15:00:12.000000000 +0200 +@@ -29,6 +29,8 @@ echo "Cleaning $OOINSTDIR"; + rm -Rf $OOINSTDIR; + set -e + ++if test "$LANGS_ONLY" != "YES" ; then ++ + mkdir -p $PREFIX/bin + + sed -e "s|@OOINSTBASE@|$OOINSTBASE|g" $TOOLSDIR/bin/ootool.in \ +@@ -141,12 +143,19 @@ if test "`uname -i`" = "i386" ; then + install_script $OOBUILDDIR/pyunorc-update64 $OOINSTDIR/basis$VERSION/program/pyunorc-update64 + fi + ++fi # if test "$LANGS_ONLY" != "YES" ; then ++if test "$LANGS_ONLY" = "YES" -a \ ++ `echo $OOO_LANGS_LIST | sed "s|^.*en-US.*$|YES|"` = "YES" ; then ++ + echo "Installing extra en-US templates ..." + mkdir -p $OOINSTDIR/basis$VERSION/share/template/en-US/forms + cp $TOOLSDIR/templates/resume.ott $OOINSTDIR/basis$VERSION/share/template/en-US/forms + mkdir -p $OOINSTDIR/basis$VERSION/share/template/en-US/officorr + cp $TOOLSDIR/templates/project-proposal.ott $OOINSTDIR/basis$VERSION/share/template/en-US/officorr + ++fi ++if test "$LANGS_ONLY" != "YES" ; then ++ + echo "Installing system files ..."; + case $VENDORNAME in + RedHat) +@@ -284,12 +292,15 @@ Libs: -L\${libdir} -lprot_uno_uno + Cflags: -I\${includeddir}" > $LIBDIRBASE/pkgconfig/openoffice$BINSUFFIX.pc + fi + ++fi # if test "$LANGS_ONLY" != "YES" ; then ++ + export DISPLAY=''; # clobber; + echo "Execute ooinstall ..."; + + cd $TOOLSDIR/bin + + ./ooinstall $OOINSTDIR || exit 1; ++ + ##cp -ra $OODESTDIR $OODESTDIR.1 || exit 1 + ##rm -r $OODESTDIR + ##cp -ra $OODESTDIR.1 $OODESTDIR || exit 1 +@@ -334,6 +345,18 @@ remove_help_localization() + # poor localizations in never packages + } + ++# FIXME: remove en-US files when building the main package ++# they will be packaged later as noarch ++if test "$HELPCONTENT_EN_US_ONLY" = "YES" ; then ++ cd $OODESTDIR ++ for gid_file in gid_Module*_en_US ; do ++ for file in `grep -v "%dir" $gid_file | sed "s|%config ||"` ; do ++ rm -f ./$file ++ done ++ done ++ cd - ++fi ++ + # Check if the English help is installed and is in the main package (is first on the list) + # Note that Java-disabled builds do not create help at all. + if test -f $OOINSTDIR/help/en/sbasic.cfg -a \ +@@ -441,6 +464,8 @@ if test -d $OOINSTDIR/sdk ; then + chmod go-w $OOINSTDIR/sdk/settings/component.uno.map + fi + ++if test "$LANGS_ONLY" != "YES" ; then ++ + if test "$DISTRO" = "SUSE" || echo "$DISTRO" | grep -q "SUSE-11" ; then + # branding stuff for openSUSE >= 11.0 and SLED >= 11 + mkdir -p $DATADIR/$OOOINSTALLDIRNAME/program +@@ -453,6 +478,8 @@ if test "$DISTRO" = "SUSE" || echo "$DIS + done + fi + ++fi # if test "$LANGS_ONLY" != "YES" ; then ++ + # remove installed file even from the file list + # Params: file_list file_to_remove + remove_file() +@@ -504,10 +531,12 @@ merge_flists() + fi + } + ++if test "$LANGS_ONLY" != "YES" ; then + if ! test -f $OODESTDIR/gid_Module_Root; then + echo "Failed to generate package file lists"; + exit 1; + fi ++fi # if test "$LANGS_ONLY" != "YES" ; then + + cd $OODESTDIR + +@@ -526,6 +555,8 @@ if test "z$VENDORNAME" != "zDebian" ; th + %dir $OOINSTBASE/basis$VERSION/share/template/en-US/officorr + $OOINSTBASE/basis$VERSION/share/template/en-US/officorr/project-proposal.ott" >> gid_Module_Langpack_Basis_en_US + ++if test "$LANGS_ONLY" != "YES" ; then ++ + echo "%dir $OOINSTBASE + $OOINSTBASE/install-dict + $OOINSTBASE/basis$VERSION/program/java-set-classpath" > gid_Module_Root_Hack +@@ -623,6 +654,8 @@ if test "z$VENDORNAME" != "zDebian" ; th + if test "$VENDORNAME" = "Novell" ; then + cat $BUILDDIR/novell-gallery-addon >> $BUILDDIR/common_list.txt + fi ++ ++fi # if test "$LANGS_ONLY" != "YES" ; then + + for lang in `echo $OOO_LANGS_LIST | sed -e s/-/_/g`; do + lang_lists= +@@ -660,6 +693,8 @@ if test "z$VENDORNAME" != "zDebian" ; th + + done + ++if test "$LANGS_ONLY" != "YES" ; then ++ + if test -f gid_Module_Root_SDK ; then + cp gid_Module_Root_SDK $BUILDDIR/sdk_list.txt + fi +@@ -825,6 +860,9 @@ if test "z$VENDORNAME" != "zDebian" ; th + remove_duplicity_from_flists common_list.txt lang_bg_list.txt $OOINSTBASE/basis$VERSION/presets/config/styles.sod + # the British fixes can be removed after the issue #54113 is fixed + remove_duplicity_from_flists common_list.txt lang_en-GB_list.txt $OOINSTBASE/basis$VERSION/presets/config/standard.sog ++ ++fi # if test "$LANGS_ONLY" != "YES" ; then ++ + else + echo "Creating package directories..." + +@@ -1010,6 +1048,74 @@ for dir in $DOCDIR $OOINSTDIR/sdk/exampl fi done @@ -50,9 +222,11 @@ + +if test "$NOARCH_LANGS" = "YES" ; then + echo "Movin noarch files..." -+ for lang in $OOO_LANGS_LIST ; do -+ test "$LANGS_ONLY" = "YES" -a "${lang}" = "en-US" && continue; ++ for lang in `echo $OOO_LANGS_LIST | sed -e s/-/_/g` ; do ++ + move_files_to_usr_share lang_${lang}_list.txt no "" ++ # poor help localizations are not built ++ test -f help_${lang}_list.txt && move_files_to_usr_share help_${lang}_list.txt no "" + done +fi + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org