Hello community, here is the log from the commit of package libreoffice-bootstrap for openSUSE:Factory checked in at Thu Oct 21 01:07:04 CEST 2010. -------- New Changes file: --- /dev/null 2010-07-09 01:59:37.000000000 +0200 +++ /mounts/work_src_done/STABLE/libreoffice-bootstrap/libreoffice-bootstrap.changes 2010-10-14 20:21:45.000000000 +0200 @@ -0,0 +1,1930 @@ +------------------------------------------------------------------- +Thu Oct 14 19:12:31 CEST 2010 - pmladek@suse.cz + +- switched to the LibreOffice code base, http://www.documentfoundation.org/ +- renamed packages from OpenOffice_org* to libreoffice* +- updated to libreoffice-3.2.99.2 (3.3-beta2): + * common: + * show menus in icons fixup + * show all appropriate formats by default on save as (i#113141) + * RenderBadPicture on multihead setups and Cairo (i#94007, i#111758) + * base: + * use correct table name (i#114246) + * calc: + * better performance on Excel doc import + * components: + * bound image controls (i#112659) + * Appearance config dialog crasher (i#108246) + * Euro converter didn't work with ODS (i#100686) + * ImageURL and Graphic properties handling (i#113991) + * extensions: + * some reportbuilder fixes (i#114111, i#112652) + * extras: + * fix malformed XML file (i#111741) + * add Croatian autocorrection (i#96706) + * updated Hungarian standard.bau (i#112387) + * eensgezinswoning replaces eensgezinswoning + * add 1/2, 3/4 and 1/4 symbols to af-ZA, de, en-ZA, mn and pl + * filters: + * adjust for table::BorderLine2 + * table DOCX import crasher (rh#632236) + * misc improvements for DOCX VML import + * text position bug in DOC import (bnc#532920) + * implement import of alpha channel for RGBA .tiffs (fdo#30472) + * impress: + * improve randomisation in 'dissolve' transition + * libs-core: + * add in MonoSpace setting + * print the formula itself by default + * extension can contain compiled help (i#114008) + * no update menu entry for bundled extensions (i#113524) + * prevent online update for bundled extensions (i#113524) + * make search/replace of colour names with translations safer (i#110142) + * libs-gui: + * maths brackets misformed in presentation mode (i#113400) + * better font-name localization, i.e. en fallback (i#114703) + * default to UTF-8 for HTML unless we know differently (i#76649) + * writer: + * color problem in RTF export (fdo#30604) + * crash on export of TOC to .doc (i#112384) + * prevent document modification while printing (i#112518) + * dotted and dashed border types (fate#307731, fate#307730) +- changes from libreoffice-3.2.99.1 (3.3-beta1): + * features: + * renamed to LibreOffice + * based on ooo330-m7 + * changed default branding + * started to support the LibreOffice code base [all] + * ordinal suffixes autocorrection improvements + * updated Numbertext extension to version 0.9.3 + * support new distros Raw, LibreOfficeLinux, LibreOfficeMacOSX, + LibreOfficeWin32 + * performance bits: + * memory footprint during PPT import (bnc#637925) + * performance bug on row height adjustments (bnc#640112) + * common bits: + * don't set header in DDE tables (bnc#634517) + * Calc bits: + * cell content rendering [bnc#640128] + * Excel's cell border thickness mapping (bnc#636691) + * relative and absolute references toggling (bnc#634260) + * more on the Flat MSO XML file type detection (bnc#631993) + * Writer bits: + * SwXTextRange DOC import (i#112564) + * table formulas DOC import (bnc#631912) + * input field fixes (bnc#628098, bnc#623944) + * OLE Links with image DOC import (bnc#628098) + * nested SET/FILLIN fields DOC import (bnc#634478) + * broken floating tables formatting in DOC import (bnc#617593) + * double-clicking on field gives "read only" message (bnc#639288) + * OOXML bits: + * text paragraph autofit PPTX import + * VBA bits: + * implicit indexes handling + * logical operator precedence + * column para for Range.Cells (bnc#639297) + * build bits: + * update internal ICU to version 4.2.1 + * fetch 185d60944ea767075d27247c3162b3bc-unowinreg.dll + +------------------------------------------------------------------- +Fri Sep 17 17:22:17 CEST 2010 - pmladek@suse.cz + +- fixed permission of the installed .hxx files +- required libcppunit-devel only on openSUSE >= 11.0 + +------------------------------------------------------------------- +Wed Sep 15 20:45:27 CEST 2010 - pmladek@suse.cz + +- updated to version 3.2.98.1 (3.3-alpha1) + * features: + * RTF export rewrite + * writer navigation + * remove obsolete Industrial icon theme + * common bits: + * gray read-only styles (i#85003) + * Accelerators for OK/Cancel buttons in GTK (bnc#608572) + * Calc bits: + * cell borders not saved (bnc#612263) + * external reference rework (bnc#628876) + * Flat MSO XML file type detection (bnc#631993) + * disable custom tab colors in high contrast mode + * display correct field in data pilot (bnc#629920) + * Watch Window extension doesn't show sheet name (bnc#604638) + * Draw bits: + * associate application/x-wpg with oodraw (bnc#589624) + * Impress bits: + * More on avmedia soundhandler (i#83753, bnc#515553) + * Writer bits: + * ww8 styles import (i#21939) + * hairline table borders export + * saving new document comparison data + * Ruby in MS Word format (i#79246) + * OOXML: + * better internal hlinks XLSX export (bnc#594248) + * numbering roundtripping issues in DOCX (bnc#569266) + * untis translation from EMU in PPTX import (bnc#621739) + * group shapes geometry calculation in PPTX import (bnc#621739) + * many other import/export fixes and improvements + * VBA bits: + * changes in event handling + * more container control fixes + * more on invalid code name import for sheet (bnc#507768) + * build bits: + * update prebuilt cli dlls for OOo-3.3 + * moving ooo-build patches to ooo git sources + * use --without-junit on Win32 and openSUSE < 11.2 +- used the prepatched OOo sources from ooo-build git +- added libcppunit-devel and patch into BuildRequires +- added junit4 into BuildRequires on openSUSE > 11.1 +- removed the obsolete unowinreg.dll and ooo-sdf-bootstrap.tar.bz2 + +------------------------------------------------------------------- +Mon Sep 6 14:27:10 UTC 2010 - coolo@novell.com + +- Use mozilla-xulrunner192 for newer suse versions + +------------------------------------------------------------------- +Thu Sep 2 15:45:12 CEST 2010 - pmladek@suse.cz + +- updated ooo-build to version 3.2.1.6 (3.2.1 security update, bnc#629085, + MaintenanceTracker-35044, CVE-2010-2935, CVE-2010-2936): + * Calc bits: + * custom field names handling in Data Pilot (bnc#634974) + * remember "sort by" selection in Data Pilot (bnc#634974) + * more on the Flat MSO XML file type detection (bnc#631993) + * Impress bits: + * cairocanvas border treatment (bnc#629546, rh#557317) + +------------------------------------------------------------------- +Tue Aug 24 16:37:41 CEST 2010 - pmladek@suse.cz + +- updated ooo-build to version 3.2.1.5 (3.2.1 security update, bnc#629085, + MaintenanceTracker-35044, CVE-2010-2935, CVE-2010-2936): + * security fixes: + * two impress vulnerabilities (CVE-2010-2935, CVE-2010-2936, bnc#629085) + * common bits: + * honour ure-link in SDK configure.pl + * macro recording crasher (i#113084) [upstream, Rene] + * Calc bits: + * DataPilot sort by ID (bnc#622920) + * Flat MSO XML file type detection (bnc#527738) + * DDE linkage upon loading documents (bnc#618846, bnc#618864) + * file name as sheet name in Excel 2.1 docs import (bnc#612902) + * Draw bits: + * random extra arrows around the custom shape (i#105654) + * Impress bits: + * slideshow clipping (i#112422) + * cairocanvas border treatment (bnc#629546, rh#557317) + * Writer bits: + * input field fixes (bnc#628098, bnc#623944) + * non-breaking space erasing freeze (i#i113461) [upstream, Rene] + * broken floating tables formatting in DOC import (bnc#617593) + * Netbooks bits: + * decorate help window (bnc#621116) + * more restrictive top level document window check (bnc#607735) + * reduce height of PDF export and recovery dialogs (bnc#623352) + * Win32 bits: + * allow view "details" in File Open dialog on XP (bnc#620924) + * l10n bits: + * non-localized Tools/Options/OOo Writer/Comparison (bnc#615000) + +------------------------------------------------------------------- +Wed Jun 16 19:17:34 CEST 2010 - pmladek@suse.cz + +- updated ooo-build to version 3.2.1.4 (3.2.1 maintenance update): + * speed up: + * faster ODS export with lots of hidden rows (deb#582785) ++++ 1733 more lines (skipped) ++++ between /dev/null ++++ and /mounts/work_src_done/STABLE/libreoffice-bootstrap/libreoffice-bootstrap.changes calling whatdependson for head-i586 New: ---- cli_ure-disable-mono-loader.diff jsr173_1.0_api.jar libreoffice-bootstrap-3.2.99.2.tar.bz2 libreoffice-bootstrap-rpmlintrc libreoffice-bootstrap.changes libreoffice-bootstrap.spec libreoffice-build-3.2.99.1f-boost.a4.diff libreoffice-build-3.2.99.1f-bootstrap.diff libreoffice-build-3.2.99.2-extensions-hack.diff libreoffice-build-3.2.99.2-scp2-user-config-ooo3.diff libreoffice-build-3.2.99.2.tar.gz officecfg-help-in-usr-share.diff ooo-build-3.1.99.2-xulrunner-1.9.1.diff piece-disable-pyuno-registration.diff sal-rtl-compiler-optimization-meego.diff setup_native_packinfo-ooo320-m17.tar.bz2 solenv-carefull-patching-hack.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice-bootstrap.spec ++++++ # # spec file for package libreoffice-bootstrap (Version 3.2.99.2) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: libreoffice-bootstrap # allow to use xulrunner191 on SLED11-SP1 (bnc#540726) %define use_xulrunner191 no BuildRequires: ImageMagick ant ant-apache-regexp bison boost-devel ccache cups-devel curl-devel flac-devel flex gnome-vfs2-devel gperf gtk2-devel icu java-devel libexif mono-devel neon-devel pam-devel patch perl-Archive-Zip perl-Compress-Zlib postgresql-devel python-devel recode unixODBC-devel unzip xml-commons-apis zip ############################ # basic stuff %if 0%{?suse_version} BuildRequires: db-devel kdelibs3-devel krb5 openldap2-devel python-xml xorg-x11 %endif %if 0%{?meego_version} BuildRequires: db4-devel krb5-devel openldap-devel BuildRequires: xorg-x11-server-devel BuildRequires: xorg-x11-proto-xproto BuildRequires: xorg-x11-utils BuildRequires: libjpeg-devel libxslt-devel openssl-devel pkgconfig(gl) pkgconfig(glu) pkgconfig(xau) pkgconfig(xaw7) BuildRequires: db4-devel krb5-devel openldap-devel %endif ############################ # cppunit stuff %if 0%{?suse_version} >= 01100 BuildRequires: libcppunit-devel %endif ############################ # mysql stuff %if 0%{?suse_version} BuildRequires: libmysqlclient-devel %endif %if 0%{?suse_version} > 01210 # mysqlcppconn >= 1.0.6 is needed BuildRequires: libmysqlcppconn-devel %endif ############################ # mozilla stuff %if 0%{?suse_version} > 01130 BuildRequires: mozilla-xulrunner192-devel %endif %if 0%{?suse_version} <= 01130 %if 0%{?suse_version} > 01110 || %use_xulrunner191 == yes BuildRequires: mozilla-xulrunner191-devel %endif %endif %if 0%{?suse_version} > 01100 && 0%{?suse_version} <= 01110 && %use_xulrunner191 != yes BuildRequires: mozilla-xulrunner190-devel %endif %if 0%{?suse_version} > 01010 && 0%{?suse_version} <= 01100 BuildRequires: mozilla-xulrunner181-devel %endif %if 0%{?suse_version} > 01000 && 0%{?suse_version} <= 01010 BuildRequires: gecko-sdk mozilla-xulrunner %endif %if 0%{?meego_version} BuildRequires: xulrunner-devel %endif ############################ # expat stuff %if 0%{?suse_version} > 01100 # libexpat-devel is explicitely needed since openSUSE-11.1 BuildRequires: libexpat-devel %endif %if 0%{?meego_version} BuildRequires: expat-devel %endif ############################ # lpsolve stuff %if 0%{?suse_version} > 01100 || 0%{?meego_version} # lpsolve-devel has been available since openSUSE-11.1 BuildRequires: lpsolve-devel %endif ############################ # poppler is needed to build the PDF import extension # the needed version 0.8.0 has been avaiable only since openSUSE-11.0 %if 0%{?suse_version} >= 01100 BuildRequires: libpoppler-devel %endif %if 0%{?meego_version} BuildRequires: poppler-devel %endif ############################ # junit stuff %if %suse_version > 1110 BuildRequires: junit4 %endif ############################ # openSUSE 10.3 features %if 0%{?suse_version} > 01020 || 0%{?meego_version} BuildRequires: libicu-devel %endif ############################ # openSUSE 11.0 features %if 0%{?suse_version} > 01030 || 0%{?meego_version} BuildRequires: hunspell-devel libwpd-devel libwpg-devel libwps-devel %endif ############################ # 11.2 features %if 0%{?suse_version} > 01110 BuildRequires: libkde4-devel %endif ############################ # CODE10 features ############################ %if 0%{?suse_version} > 01000 BuildRequires: gstreamer010-plugins-base-devel sablot-devel xalan-j2 xerces-j2 xml-commons-apis %endif %if 0%{?meego_version} BuildRequires: gst-plugins-base-devel sablot-devel xalan-j2 xerces-j2 xml-commons-apis %endif # FIXME: part of the language-dependant stuff is still built here and # put into the -devel package # test_build_langs: 0 = only en-US # 1 = en-US, de, and cs # 2 = all supported languages %define test_build_langs 2 # test_build_binfilters: 0 = no # 1 = yes %define test_build_binfilters 1 # test_build_SDK: 0 = no # 1 = yes (if possible, see below the definition of ooo_build_sdk) %define test_build_sdk 1 # build_module_in_parallel 0 = no # 1 = yes (the number is defined be the number of cpus) # 2,3,4... = yes (force the number of modules to be built in parallel) %define build_module_in_parallel 1 # prepare_build: 0 = no # 1 = yes (just build, install and create packages; without %%prep section and configure) %define prepare_build 1 # %if %test_build_langs == 0 %define ooo_langs "" %else %if %test_build_langs == 1 %define ooo_langs "en-US cs de hu ja" %else %define ooo_langs "en-US af ar be-BY bg br ca cs cy da de el en-GB en-ZA es et fi fr ga gl gu he hi-IN hu hr it ja ka km ko lt mk nb nl nn nr pa-IN pl pt pt-BR ru rw sh sk sl sr ss st sv tg th tr ts uk ve vi xh zh-TW zh-CN zu" %endif %endif %define ooo_poor_help_localizations "af bg be-BY br ca cy el fi ga he hr ka lt mk nb nn nr rw sh sr sk ss st tg th tr th ts uk ve vi xh zu" # sdk stuff enable only on SL 10.2, SLED10 and higher # force no if test_build_sdk is disabled %if %test_build_sdk == 0 %define ooo_build_sdk no %else %if 0%{?suse_version} > 01010 || 0%{?sles_version} == 010 || 0%{?meego_version} %define ooo_build_sdk yes %else %define ooo_build_sdk no %endif %endif # java stuff %define with_java yes %define use_gij no # java target bytecode; should be compatible with the gcj %if 0%{?suse_version} > 01030 || 0%{?meego_version} %define java_target_version 1.5 %else %define java_target_version 1.4 %endif # we would like to support also a non-conflicting OOo2 package %define ooo_bin_suffix no # %define ooo_build_version 3.2.99.2 %define ooo_piece_version 3.2.99.2 %define ooo_build_dir build %define ooo_sourcedirname libreoffice-%ooo_piece_version %define ooo_prefix %_libdir %define ooo_home libreoffice %define ooo_basis_dir basis3.3 License: Artistic ; BSD3c ; GPLv2+ ; LPPL .. ; LGPLv2.1+ ; LGPLv3 ; MPL .. ; MIT Group: Productivity/Office/Suite Version: 3.2.99.2 Release: 1 AutoReqProv: on # we use the tool "free" to detect the available memory and reduce the parallelism is needed # too high parallelism caused troubles in the Build Service Requires: procps Provides: OpenOffice_org-bootstrap = %version Obsoletes: OpenOffice_org-bootstrap <= %version Summary: OpenOffice.org Build Bootstrap Url: http://www.openoffice.org/ #Url-help: ftp://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/ Source0: libreoffice-build-%ooo_build_version.tar.gz Source1: libreoffice-bootstrap-%ooo_piece_version.tar.bz2 # hacked soures from setup_native Source30: setup_native_packinfo-ooo320-m17.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 Source100: %name-rpmlintrc # jsr173_1.0_api.jar can't be built with Java-1.4 on SLED10 easily Source150: jsr173_1.0_api.jar # # patches against libreoffice-build # Patch0: libreoffice-build-3.3.0.1-enable-foo.diff # example Patch0: libreoffice-build-3.2.99.2-extensions-hack.diff Patch1: libreoffice-build-3.2.99.1f-boost.a4.diff Patch2: libreoffice-build-3.2.99.1f-bootstrap.diff Patch3: libreoffice-build-3.2.99.2-scp2-user-config-ooo3.diff # allow to use xulrunner191 on SLED11-SP1 (bnc#540726) Patch500: ooo-build-3.1.99.2-xulrunner-1.9.1.diff # FIXME: fix the python UNO components registration on SLED10 Patch990: piece-disable-pyuno-registration.diff # compile sal/rtl/source with -O2 on MeeGo; File/Wizards/Letter crashed when compiled with -Os, see http://bugs.meego.com/show_bug.cgi?id=2652 Patch991: sal-rtl-compiler-optimization-meego.diff # slower patching to debug and hopefully fix parallel build of ct2n extension; always happened only in the Build Service (bnc#595550) Patch992: solenv-carefull-patching-hack.diff # FIXME: make it configurable in integrate into git Patch993: officecfg-help-in-usr-share.diff # FIXME: temporary disable mono-loader build until the dependency on comphelper is removed Patch994: cli_ure-disable-mono-loader.diff # # patches against the upstream sources, must be -p0 # Patch1000: bug-123456-fix-foo.diff # example BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 ppc %description This packages provides the basic tools and framework for building OpenOffice.org using separate source packages. %prep %if %prepare_build == 0 %setup -D -T -q -n libreoffice-build-%ooo_build_version %else %setup -q -n libreoffice-build-%ooo_build_version # # apply patches against libreoffice-build # %patch0 # example # install -m 644 %{S:1} %{S:30} src/ %if 0%{?suse_version} == 01010 install -m 644 %{S:150} src/ %endif # apply patches against libreoffice-build # %patch0 # example %patch0 %patch1 %patch2 %patch3 %if %use_xulrunner191 == yes # allow to use xulrunner191 on SLED11-SP1 (bnc#540726) %patch500 %endif %if 0%{?suse_version} == 01010 # temporary disable registration of python components on SLED10 cp %{P:990} patches/hotfixes %endif %if 0%{?meego_version} # compile sal/rtl/source with -O2 on MeeGo; File/Wizards/Letter crashed when compiled with -Os, see http://bugs.meego.com/show_bug.cgi?id=2652 cp %{P:991} patches/hotfixes %endif cp %{P:992} patches/hotfixes cp %{P:993} patches/hotfixes cp %{P:994} patches/hotfixes %endif %build %if %prepare_build != 0 # # Parallel build settings ... PARALLEL_BUILD= if test -n "%{?jobs:%jobs}" -a -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then PARALLEL_BUILD="--with-gcc-speedup=icecream --with-max-jobs=%jobs" fi # parallel build of modules; it makes sense on machines with more CPUs if test "%build_module_in_parallel" = "1" ; then PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=`grep ^processor /proc/cpuinfo | wc -l`" fi if test "%build_module_in_parallel" -gt "1" ; then PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=%build_module_in_parallel" fi # # Distro settings ... %if 0%{?meego_version} with_distro="SUSE-11.1" %endif %if 0%{?suse_version} && 0%{?suse_version} <= 01110 suse_major_ver=$((%{?suse_version} / 100)) suse_minor_ver=$((%{?suse_version} / 10 - $suse_major_ver * 10)) with_distro="SUSE-$suse_major_ver.$suse_minor_ver" %endif %if 0%{?suse_version} > 01110 && 0%{?suse_version} <= 01120 with_distro="SUSE-11.2" %endif %if 0%{?suse_version} > 01120 with_distro="SUSE" %endif # # run autoreconf to make sure that everything works correctly on current system # also the autoconf stuff might have been patched autoreconf -fi %endif # make sure that JAVA_HOME is set correctly %if 0%{?suse_version} source /etc/profile.d/alljava.sh %endif %if 0%{?meego_version} export JAVA_HOME=%{java_home} %endif # use RPM_OPT_FLAGS, ... export ARCH_FLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/\-O[0-9s]//g' -e 's/\-fexceptions//g'` -fno-strict-aliasing" # FIXME: genccode from the system icu is in /usr/sbin export PATH="$PATH:/usr/sbin" %if %prepare_build != 0 ./configure $PARALLEL_BUILD \ --with-arch-flags="$ARCH_FLAGS" \ --with-split \ --with-piece=bootstrap \ --libdir=%{_libdir} \ --prefix=%{_prefix} \ --mandir=%{_mandir} \ --sysconfdir=/etc \ --with-docdir=%{_docdir}/%{name} \ --with-binsuffix=%ooo_bin_suffix \ --with-installed-ooo-dirname=%ooo_home \ --with-distro="$with_distro" \ %if 0%{?suse_version} && 0%{?suse_version} <= 01030 --with-intro-bitmaps="%{S:140} %{S:142}" \ --with-about-bitmaps="%{S:141} %{S:143}" \ %endif --with-source-version=%ooo_piece_version \ --without-git \ --with-lang=%ooo_langs \ --with-poor-help-localizations=%ooo_poor_help_localizations \ --with-mono-gac-root=%{_prefix}/lib \ %if %test_build_binfilters != 0 --enable-binfilter \ %endif %if %with_java == no --with-java=no \ --with-jdk-home="" \ %else %if %use_gij == yes --with-java=gij \ --with-jdk-home=/usr \ %else --with-java=java \ --with-jdk-home=$JAVA_HOME \ --with-java-target-version=%java_target_version \ %endif %endif %if %ooo_build_sdk == yes --enable-odk \ %endif %if 0%{?suse_version} && 0%{?suse_version} <= 01030 --with-additional-sections="PostgreSQL" \ %endif %if 0%{?meego_version} --with-system-icu \ --disable-kde4 \ --disable-kde \ %endif %if %suse_version <= 1110 --without-junit \ %endif --disable-access \ --disable-post-install-scripts \ --disable-strip \ --disable-strip-solver \ --enable-openxml \ --disable-report-builder \ --disable-pdfimport \ --disable-presenter-console \ --enable-build-noarch \ --with-ct2n \ --with-numbertext \ %if 0%{?suse_version} --with-system-mysql \ --enable-mysql-connector \ %endif %if 0%{?suse_version} > 01210 --with-system-mysql-cppconn \ %endif %if 0%{?suse_version} > 01030 || 0%{?meego_version} --enable-pdfimport \ %endif --enable-minimizer --enable-presenter-console \ --enable-wiki-publisher --enable-ogltrans --enable-report-builder \ --enable-split-app-modules \ --enable-split-opt-features %endif # FIXME: try to finish build even with the strange random build crash in officecfg make || make || make %install %ifarch x86_64 ppc %if 0%{?suse_version} && 0%{?suse_version} <= 01020 # FIXME: move this to libreoffice-build export JAVA_HOME=/usr %endif %endif # make DESTDIR=$RPM_BUILD_ROOT install %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %dir %ooo_prefix/%ooo_home %dir %ooo_prefix/%ooo_home/solver %dir %ooo_prefix/%ooo_home/solenv %dir %ooo_prefix/%ooo_home/build %ooo_prefix/%ooo_home/solver/* %ooo_prefix/%ooo_home/solenv/* %ooo_prefix/%ooo_home/build/* # noarch-related stuff %dir %_datadir/%ooo_home %dir %_datadir/%ooo_home/build %_datadir/%ooo_home/build/* %changelog ++++++ cli_ure-disable-mono-loader.diff ++++++ --- cli_ure/prj/build.lst.old 2010-10-12 18:43:33.000000000 +0200 +++ cli_ure/prj/build.lst 2010-10-12 18:43:09.000000000 +0200 @@ -10,6 +10,6 @@ ure cli_ure\unotypes nmake - ure cli_ure\source\ure nmake - all ure_source_ure ure_source_bootstrap.u ure_source_version ure_source_source ure_source_basetypes ure_unotypes ure_inc NULL ure cli_ure\source\uno_bridge nmake - w,vc7 ure_source_uno_bridge ure_source_basetypes ure_unotypes ure_source_ure ure_inc NULL ure cli_ure\source\mono_bridge nmake - u ure_source_mono_bridge ure_unotypes ure_source_ure ure_inc NULL -ure cli_ure\source\mono_loader nmake - u ure_source_mono_loader ure_unotypes ure_source_ure ure_inc NULL +ure cli_ure\source\mono_loader nmake - - ure_source_mono_loader ure_unotypes ure_source_ure ure_inc NULL ure cli_ure\source\native nmake - w,vc7 ure_source_native ure_source_version ure_source_source ure_source_ure ure_unotypes ure_source_uno_bridge ure_inc NULL #ure cli_ure\util nmake - w,vc7 ure_util ure_source_ure ure_source_native NULL --- scp2/source/ooo/ure.scp.old 2010-10-13 14:48:21.000000000 +0200 +++ scp2/source/ooo/ure.scp 2010-10-13 16:12:39.000000000 +0200 @@ -421,16 +421,6 @@ File gid_File_Dl_LogUnoUno Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); End -#if ( defined UNX && defined ENABLE_MONO ) // currently we only will build this on unix -File gid_File_Dl_MonoLoader - TXT_FILE_BODY; - Dir = SCP2_URE_DL_DIR; - Name = STRING(CONCAT4(mono_loader,DLLPOSTFIX,.uno,UNXSUFFIX)); - Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID); - RegistryID = gid_Starregistry_Services_Rdb_Ure; -End -#endif - #if (defined WNT && defined _MSC) || defined ENABLE_MONO File gid_File_Dl_Cli_Uno TXT_FILE_BODY; ++++++ libreoffice-bootstrap-rpmlintrc ++++++ # FIXME: temporary disabled some lint errors # We must fix them in the upcomming big package split and rework addFilter("files-duplicated-waste") addFilter("devel-file-in-non-devel-package") ++++++ libreoffice-build-3.2.99.1f-boost.a4.diff ++++++ --- bin/unpack +++ bin/unpack @@ -296,6 +296,10 @@ # ugly hack around odd positioning of this info echo "Unpacking setup_native .txt pieces" ($OOO_DECOMPRESS_CMD $SRCDIR/setup_native_packinfo-ooo320-m17.tar.bz2 | $GNUTAR xf - ) || exit + # hack to patch new files in the root dir + if test "z$PIECE" = "zbootstrap" ; then + touch $OOBUILDDIR/boost.m4 + fi fi fi else ++++++ libreoffice-build-3.2.99.1f-bootstrap.diff ++++++ --- bin/piece/file-list-help +++ bin/piece/file-list-help @@ -10,18 +10,6 @@ # put the rest into the common file list $OO_TOOLSDIR/piece/merge-file-lists "files-$piece.txt" $DESTDIR/gid_* -# FIXME: remove files from the top dir; they are common for all localizations -# and must be included in the main package (postprocess) -for file in main_transform.xsl idxcaption.xsl idxcontent.xsl ; do - if test `du --block-size=1 --apparent-size $DESTDIR$OO_INSTDIR/basis$VERSION/help/$file | cut -f1` -eq \ - `du --block-size=1 --apparent-size $OO_TOOLSDIR/../src/helpcontent2/$file | cut -f1` ; then - remove_file "files-$piece.txt" $OO_INSTDIR/basis$VERSION/help/$file - else - echo "Error: The file \"$file\" has changed in the sources" - echo " Please, update the prebuilt variant in $OO_TOOLSDIR/../src/helpcontent2" - exit 1; - fi -done # FIXME: hid.lst will be in testtool package (built in ?) remove_file "files-$piece.txt" $OO_INSTDIR/basis$VERSION/program/hid.lst # non-wanted mess --- bin/piece/file-list-libs-core +++ bin/piece/file-list-libs-core @@ -46,6 +46,16 @@ add_used_directories files-mailmerge.txt files-$piece.txt chmod 755 $DESTDIR$OO_INSTDIR/basis$VERSION/program/mailmerge.py +if test "$OOO_BUILD_NOARCH" = 'YES' ; then + # make compat symlinks for helpcontent common files + mkdir -p $DESTDIR$OO_INSTDIR_SHARE/basis$VERSION/help + echo "%dir $OO_INSTDIR_SHARE/basis$VERSION/help" >>files-$piece.txt + for file in main_transform.xsl idxcaption.xsl idxcontent.xsl ; do + ln -sf "$OO_INSTDIR/basis$VERSION/help/$file" $DESTDIR$OO_INSTDIR_SHARE/basis$VERSION/help/$file + echo "$OO_INSTDIR_SHARE/basis$VERSION/help/$file" >>files-$piece.txt + done +fi + # mess remove_file "files-$piece.txt" "$OO_INSTDIR/basis-link" remove_file "files-$piece.txt" "$OO_INSTDIR/basis$VERSION/ure-link" --- bin/piece/file-list-postprocess +++ bin/piece/file-list-postprocess @@ -13,25 +13,6 @@ $OO_TOOLSDIR/piece/desktop-support-app "$piece" "$ooo_build_tag" "fromtemplate" $OO_TOOLSDIR/piece/desktop-support-app "$piece" "$ooo_build_tag" "ooffice" -# install the common files for the helpcontent -# make compat symlinks for if the primary files are in /usr/share -target_instdir="$OO_INSTDIR" -test "$OOO_BUILD_NOARCH" = 'YES' && target_instdir="$OO_INSTDIR_SHARE" -mkdir -p $DESTDIR$target_instdir/basis$VERSION/help -echo "%dir $target_instdir/basis$VERSION/help" >>files-$piece.txt -if test "$OOO_BUILD_NOARCH" = 'YES' ; then - mkdir -p $DESTDIR$OO_INSTDIR/basis$VERSION/help - echo "%dir $OO_INSTDIR/basis$VERSION/help" >>files-$piece.txt -fi -for file in main_transform.xsl idxcaption.xsl idxcontent.xsl ; do - cp -a $OO_TOOLSDIR/../src/helpcontent2/$file $DESTDIR$target_instdir/basis$VERSION/help/ - echo "$target_instdir/basis$VERSION/help/$file" >>files-$piece.txt - if test "$OOO_BUILD_NOARCH" = 'YES' ; then - ln -sf "$target_instdir/basis$VERSION/help/$file" $DESTDIR$OO_INSTDIR/basis$VERSION/help/$file - echo "$OO_INSTDIR/basis$VERSION/help/$file" >>files-$piece.txt - fi -done - # extra shared MIME info mkdir -p $DESTDIR/usr/share/mime/packages cp $OO_TOOLSDIR/../desktop/openoffice.xml $DESTDIR/usr/share/mime/packages --- bin/piece/file-list-sdk +++ bin/piece/file-list-sdk @@ -30,14 +30,14 @@ # save udkversion.mk mkdir -p "$DESTDIR$OO_INSTDIR/solver/inc" -cp $DESTDIR/usr/include/ooo3/udkversion.mk "$DESTDIR$OO_INSTDIR/solver/inc" +cp $DESTDIR/usr/include/$OO_INSTDIRNAME/udkversion.mk "$DESTDIR$OO_INSTDIR/solver/inc" echo "%dir $OO_INSTDIR/solver" >>"files-$piece.txt" echo "%dir $OO_INSTDIR/solver/inc" >>"files-$piece.txt" echo "$OO_INSTDIR/solver/inc/udkversion.mk" >>"files-$piece.txt" # prune duplicated headers -remove_dir "files-$piece.txt" /usr/include/ooo3 -remove_dir "files-$piece.txt" /usr/share/idl/ooo3 +remove_dir "files-$piece.txt" /usr/include/$OO_INSTDIRNAME +remove_dir "files-$piece.txt" /usr/share/idl/$OO_INSTDIRNAME # fix compat symlinks ln -sf $OO_INSTDIR/solver/inc "$DESTDIR$OO_INSTDIR/basis$VERSION/sdk/include" ln -sf $OO_INSTDIR/solver/idl "$DESTDIR$OO_INSTDIR/basis$VERSION/sdk/idl" --- bin/piece/install-bootstrap +++ bin/piece/install-bootstrap @@ -16,21 +16,23 @@ cp $OOBUILDDIR/config.guess $DEST/bin cp $OOBUILDDIR/config.sub $DEST/bin -# ooo-build -mkdir -p $OOINSTDIR/ooo-build/bin -mkdir -p $OOINSTDIR/ooo-build/patches -mkdir -p $OOINSTDIR/ooo-build/po -mkdir -p $OOINSTDIR/ooo-build/desktop -mkdir -p $OOINSTDIR/ooo-build/man -cp -a $TOOLSDIR/bin/* $OOINSTDIR/ooo-build/bin || exit 1; -cp -a $TOOLSDIR/patches/* $OOINSTDIR/ooo-build/patches || exit 1; -cp -a $TOOLSDIR/po/ooo-build-*.sdf $OOINSTDIR/ooo-build/po || exit 1; -cp -a $TOOLSDIR/desktop/* $OOINSTDIR/ooo-build/desktop || exit 1; -cp -a $TOOLSDIR/man/* $OOINSTDIR/ooo-build/man || exit 1; +LOINSTTOOLSDIR=$OOINSTDIR/build + +# build +mkdir -p $LOINSTTOOLSDIR/bin +mkdir -p $LOINSTTOOLSDIR/patches +mkdir -p $LOINSTTOOLSDIR/po +mkdir -p $LOINSTTOOLSDIR/desktop +mkdir -p $LOINSTTOOLSDIR/man +cp -a $TOOLSDIR/bin/* $LOINSTTOOLSDIR/bin || exit 1; +cp -a $TOOLSDIR/patches/* $LOINSTTOOLSDIR/patches || exit 1; +cp -a $TOOLSDIR/po/lo-build-*.sdf $LOINSTTOOLSDIR/po || exit 1; +cp -a $TOOLSDIR/desktop/* $LOINSTTOOLSDIR/desktop || exit 1; +cp -a $TOOLSDIR/man/* $LOINSTTOOLSDIR/man || exit 1; # copy pieces of interest into src to be moved out later ... echo "copy source pieces" -mkdir -p $OOINSTDIR/ooo-build/src +mkdir -p $LOINSTTOOLSDIR/src cp -a \ $TOOLSDIR/src/*.dic \ $TOOLSDIR/src/*.bmp \ @@ -46,25 +48,34 @@ $TOOLSDIR/src/helpcontent2 \ $TOOLSDIR/src/icons \ $TOOLSDIR/src/layout \ - $OOINSTDIR/ooo-build/src || exit 1; + $LOINSTTOOLSDIR/src || exit 1; # src/sdf -mkdir -p $OOINSTDIR/ooo-build/src/sdf +mkdir -p $LOINSTTOOLSDIR/src/sdf cp -a \ $TOOLSDIR/src/sdf/*.sdf \ $TOOLSDIR/src/sdf/README \ - $OOINSTDIR/ooo-build/src/sdf || exit 1; + $LOINSTTOOLSDIR/src/sdf || exit 1; # branding stuff should go into noarch path if test "$OOO_BUILD_NOARCH" = 'YES' ; then - OO_INSTDIR_SHARE=`echo $OOINSTDIR | sed -e "s|lib6\?4\?|share|"` - mkdir -p $OO_INSTDIR_SHARE/ooo-build/src + OO_INSTDIR_SHARE=`echo $OOINSTDIR | sed -e "s|/lib6\?4\?/|/share/|"` + mkdir -p $OO_INSTDIR_SHARE/build/src mv \ - $OOINSTDIR/ooo-build/src/sofficerc-upstream \ - $OO_INSTDIR_SHARE/ooo-build/src || exit 1; + $LOINSTTOOLSDIR/src/sofficerc-upstream \ + $OO_INSTDIR_SHARE/build/src || exit 1; fi -find $OOINSTDIR/ooo-build -depth -name "CVS" -type d -exec rm -rf {} \; -find $OOINSTDIR/ooo-build -name "*.orig" -exec rm -rf {} \; -find $OOINSTDIR/ooo-build -type f -exec chmod go-w {} \; +# bin mess and stuff that won't be needed +find $LOINSTTOOLSDIR -depth -name "CVS" -type d -exec rm -rf {} \; +find $LOINSTTOOLSDIR -name "*.orig" -exec rm -rf {} \; +find $LOINSTTOOLSDIR -type f -exec chmod go-w {} \; +find $LOINSTTOOLSDIR -name "Makefile*" -exec rm -rf {} \; +# .in files does not make sense without configure +# in addition, rpm/find-provides goes mad with incomplete script headers, e.g. #!@PERL@ -pi.bak -w +rm -f \ + $LOINSTTOOLSDIR/bin/setup.in \ + $LOINSTTOOLSDIR/bin/font-munge.in \ + $LOINSTTOOLSDIR/bin/help-font-munge.in \ + $LOINSTTOOLSDIR/bin/piece/sys-setup.in echo "done bootstrap specific install" --- bin/piece/install-generic +++ bin/piece/install-generic @@ -36,9 +36,9 @@ done if test "$piece" = "sdk" ; then - PRODUCT=OpenOffice_SDK + PRODUCT=LibreOffice_SDK else - PRODUCT=OpenOffice + PRODUCT=LibreOffice fi perl -w $SOLARENV/bin/make_installer.pl \ --- bin/piece/post-inst-postprocess +++ bin/piece/post-inst-postprocess @@ -28,7 +28,7 @@ # we use the prebuilt one in the upstream branding package # FIXME: it would be possible to generate this file by the installer, e.g. in bootstrap if test "$DISTRO" = "SUSE" || echo "$DISTRO" | grep -q "SUSE-11" ; then - if diff -q $DESTDIR$OO_INSTDIR/program/sofficerc $OO_INSTDIR_SHARE/ooo-build/src/sofficerc-upstream ; then + if diff -q $DESTDIR$OO_INSTDIR/program/sofficerc $OO_INSTDIR_SHARE/build/src/sofficerc-upstream ; then rm -f $DESTDIR$OO_INSTDIR/program/sofficerc ln -sf $OO_INSTDIR_SHARE/program/sofficerc $DESTDIR$OO_INSTDIR/program/sofficerc else @@ -43,9 +43,9 @@ $OO_TOOLSDIR/piece/install-generic $piece $ooo_build_tag # urgh - unbelievably nasty: -cp -a OpenOffice/gid_Starregistry_Services_Rdb_rdb/*/services.rdb \ +cp -a LibreOffice/gid_Starregistry_Services_Rdb_rdb/*/services.rdb \ $DESTDIR$OO_INSTDIR/basis$VERSION/program/services.rdb -cp -a OpenOffice/gid_Starregistry_Services_Rdb_Ure_servicesrdb/*/services.rdb \ +cp -a LibreOffice/gid_Starregistry_Services_Rdb_Ure_servicesrdb/*/services.rdb \ $DESTDIR$OO_INSTDIR/ure/share/misc/services.rdb # udpate the file list if test -f "files-$piece.txt" ; then --- bin/piece/sys-setup.in +++ bin/piece/sys-setup.in @@ -4,10 +4,11 @@ export DISTRO='@DISTRO@' export VENDORNAME='@VENDORNAME@' export VERSION='@OOO_VERSION@' -export OO_INSTDIR=@libdir@/@OOOINSTALLDIRNAME@ +export OO_INSTDIRNAME=@OOOINSTALLDIRNAME@ +export OO_INSTDIR=@libdir@/$OO_INSTDIRNAME export OO_PREFIX=@prefix@ export OO_LIBDIR=@libdir@ -datarootdir = @datarootdir@ +datarootdir=@datarootdir@ export OO_MANDIR=@mandir@ export OO_DOCDIR=@docdir@ export OO_LANGS='@OOO_LANGS@' --- patches/dev300/piece-helpcontent2.diff +++ patches/dev300/piece-helpcontent2.diff @@ -25,3 +25,14 @@ .ENDIF .IF "$(SYSTEM_DB)" != "YES" +--- solenv/inc/extension_helplink.mk.old 2010-10-13 16:28:44.000000000 +0200 ++++ solenv/inc/extension_helplink.mk 2010-10-13 17:27:08.000000000 +0200 +@@ -30,7 +30,7 @@ my_cp:=$(CLASSPATH)$(PATH_SEPERATOR)$(SO + .IF "$(SYSTEM_LUCENE)" == "YES" + my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(LUCENE_CORE_JAR)$(PATH_SEPERATOR)$(LUCENE_ANALYZERS_JAR) + .ELSE +-my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(SOLARBINDIR)/lucene-core-2.3.jar$(PATH_SEPERATOR)$(SOLARBINDIR)/lucene-analyzers-2.3.jar ++my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(SPLITINSTALLDIR)/classes/lucene-core-2.3.jar$(PATH_SEPERATOR)$(SPLITINSTALLDIR)/classes/lucene-analyzers-2.3.jar + .ENDIF + + .IF "$(SYSTEM_DB)" != "YES" --- src/sofficerc-upstream +++ src/sofficerc-upstream @@ -2,7 +2,7 @@ HideEula=1 Logo=1 NativeProgress=true -ProgressBarColor=14,133,205 +ProgressBarColor=126,170,23 ProgressFrameColor=207,208,211 ProgressPosition=185,206 ProgressSize=320,7 ++++++ libreoffice-build-3.2.99.2-extensions-hack.diff ++++++ --- patches/dev300/apply +++ patches/dev300/apply @@ -43,7 +43,7 @@ # optional section for NLPSolver extension NLPSolver : NLPSolverBits # special fragmented build patch distro -Piece : PieceBits +Piece : PieceBits, ExtensionFixes, NovellOnlyExtensionFixes #Localize Localize : LocalizeFixes UnstableWP : UnstableLibwpd @@ -2719,6 +2719,10 @@ oox-drawingml-fix-apply-shape-reference-crash.diff, n#593611, rodo oox-smartart-import.diff, thorsten +[ PieceBits ] +piece-config-office-extensions.diff + + [ NovellOnlyWin32 ] sled10-splash.diff, i#123456, pmladek --- patches/dev300/piece-config-office-extensions.diff +++ patches/dev300/piece-config-office-extensions.diff @@ -0,0 +1,79 @@ +--- configure.in.old 2010-03-05 21:33:20.000000000 +0100 ++++ configure.in 2010-03-05 21:46:39.000000000 +0100 +@@ -4181,12 +4181,6 @@ AC_MSG_CHECKING([whether to build the My + if test -n "$enable_mysql_connector" -a "$enable_mysql_connector" != "no"; then + AC_MSG_RESULT([yes]) + ENABLE_MYSQLC=YES +- AC_MSG_CHECKING([for mysqlc module]) +- if test -d mysqlc; then +- AC_MSG_RESULT([OK]) +- else +- AC_MSG_ERROR([not existing. get it (did you get the -extensions tarball?)]) +- fi + BUILD_TYPE="$BUILD_TYPE MYSQLC" + else + AC_MSG_RESULT([no]) +@@ -4280,12 +4280,6 @@ int main(int argc, char **argv) { + + else + AC_MSG_RESULT([internal]) +- AC_MSG_CHECKING([for mysqlcppconn module]) +- if test -d mysqlcppconn; then +- AC_MSG_RESULT([OK]) +- else +- AC_MSG_ERROR([not existing. get it (did you get the -extensions tarball?)]) +- fi + BUILD_TYPE="$BUILD_TYPE MYSQLCPPCONN" + SYSTEM_MYSQL_CPPCONN=NO + fi +@@ -5985,24 +5985,12 @@ AC_SUBST(POPPLER_CFLAGS) + AC_SUBST(POPPLER_LIBS) + + if test "$ENABLE_PRESENTER_SCREEN" = "YES" -o "$ENABLE_MINIMIZER" = "YES" -o "$ENABLE_PDFIMPORT" = "YES"; then +- AC_MSG_CHECKING([for sdext module]) +- if test -d ./sdext; then +- AC_MSG_RESULT([OK]) +- else +- AC_MSG_ERROR([not existing. get it (did you get the -extensions tarball?)]) +- fi + BUILD_TYPE="$BUILD_TYPE SDEXT" + fi + + AC_MSG_CHECKING([whether to build the Wiki Publisher extension]) + if test -n "$enable_wiki_publisher" -a "$enable_wiki_publisher" != "no" && test "$WITH_JAVA" != "no"; then + AC_MSG_RESULT([yes]) +- AC_MSG_CHECKING([for swext module]) +- if test -d ./swext; then +- AC_MSG_RESULT([OK]) +- else +- AC_MSG_ERROR([not existing. get it (did you get the -extensions tarball?)]) +- fi + ENABLE_MEDIAWIKI=YES + BUILD_TYPE="$BUILD_TYPE SWEXT" + else +@@ -6034,12 +6022,6 @@ AC_MSG_CHECKING([whether to build the Re + if test -n "$enable_report_builder" -a "$enable_report_builder" != "no" && test "$WITH_JAVA" != "no"; then + AC_MSG_RESULT([yes]) + ENABLE_REPORTBUILDER=YES +- AC_MSG_CHECKING([for reportbuilder module]) +- if test -d ./reportbuilder; then +- AC_MSG_RESULT([OK]) +- else +- AC_MSG_ERROR([not existing. get it (did you get the -extensions tarball?)]) +- fi + AC_MSG_CHECKING([which jfreereport libs to use]) + if test "$with_system_jfreereport" = "yes"; then + SYSTEM_JFREEREPORT=YES +@@ -6203,12 +6185,6 @@ if test -n "$enable_report_builder" -a " + + else + AC_MSG_RESULT([internal]) +- AC_MSG_CHECKING([for jfreereport module]) +- if test -d ./jfreereport; then +- AC_MSG_RESULT([OK]) +- else +- AC_MSG_ERROR([not existing. get it (did you get the -extensions tarball?)]) +- fi + SYSTEM_JFREEREPORT=NO + BUILD_TYPE="$BUILD_TYPE JFREEREPORT" + fi ++++++ libreoffice-build-3.2.99.2-scp2-user-config-ooo3.diff ++++++ --- patches/dev300/apply +++ patches/dev300/apply @@ -660,7 +660,8 @@ # FIXME: there is not longer About/Support button in LibreOffice help-support.diff, michael # change user config dir name from ~/.openoffice.org3 to ~/.ooo3 -scp2-user-config-ooo3.diff, pmladek +# FIXME: do we want another config dir for the Novell buidls? +scp2-user-config-suse.diff, pmladek # link against the versioned libmysqlcppconn # we do not want to require the devel package --- patches/dev300/scp2-user-config-suse.diff +++ patches/dev300/scp2-user-config-suse.diff @@ -0,0 +1,34 @@ +--- + officecfg/registry/data/org/openoffice/Setup.xcu | 2 +- + scp2/source/ooo/common_brand.scp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git officecfg/registry/data/org/openoffice/Setup.xcu officecfg/registry/data/org/openoffice/Setup.xcu +index 8e18ca5..7c0b95d 100644 +--- officecfg/registry/data/org/openoffice/Setup.xcu ++++ officecfg/registry/data/org/openoffice/Setup.xcu +@@ -788,7 +788,7 @@ + <value>10</value> + </prop> + <prop oor:name="VersionIdentifiers"> +- <value oor:separator=",">OpenOffice.org 2=openoffice.org2,StarOffice 8=staroffice8,StarSuite 8=starsuite8</value> ++ <value oor:separator=",">OpenOffice.org 2=ooo-2.0,OpenOffice.org 3=ooo3,StarOffice 8=staroffice8,StarSuite 8=starsuite8</value> + </prop> + <node oor:name="MigrationSteps"> + <node oor:name="Datasources" oor:op="replace"> +diff --git scp2/source/ooo/common_brand.scp scp2/source/ooo/common_brand.scp +index 7bbf873..0b235a0 100644 +--- scp2/source/ooo/common_brand.scp ++++ scp2/source/ooo/common_brand.scp +@@ -774,7 +774,7 @@ ProfileItem gid_Brand_Profileitem_Bootstrap_Userinstall + #elif defined MACOSX + Value = "$SYSUSERCONFIG/%ONEWORDPRODUCTNAME/%USERDIRPRODUCTVERSION"; + #else +- Value = "$SYSUSERCONFIG/.%LCONEWORDPRODUCTNAME/%USERDIRPRODUCTVERSION"; ++ Value = "$SYSUSERCONFIG/.%LCONEWORDPRODUCTNAME/%USERDIRPRODUCTVERSION-suse"; + #endif + End + +-- +1.7.0.1 + ++++++ officecfg-help-in-usr-share.diff ++++++ --- officecfg/registry/schema/org/openoffice/Office/Common.xcs.old 2008-08-13 11:21:46.000000000 +0200 +++ officecfg/registry/schema/org/openoffice/Office/Common.xcs 2008-08-14 17:24:15.000000000 +0200 @@ -1489,7 +1489,7 @@ Dymamic border coloring means that when <author>ABI</author> <desc>Specifies the path to the Office help files.</desc> </info> - <value>$(instpath)/help</value> + <value>/usr/share/libreoffice/basis-link/help</value> </prop> <prop oor:name="Linguistic" oor:type="xs:string"> <info> @@ -1651,7 +1651,7 @@ Dymamic border coloring means that when <info> <desc>Specifies the default directory where Office help files are located.</desc> </info> - <value>$(instpath)/help</value> + <value>/usr/share/libreoffice/basis-link/help</value> </prop> <prop oor:name="Linguistic" oor:type="xs:string"> <info> --- officecfg/registry/data/org/openoffice/Office/Paths.xcu.old 2008-04-11 15:11:41.000000000 +0200 +++ officecfg/registry/data/org/openoffice/Office/Paths.xcu 2008-08-14 17:25:35.000000000 +0200 @@ -123,7 +123,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/libreoffice/basis-link/help" oor:op="fuse" /> </node> </node> ++++++ ooo-build-3.1.99.2-xulrunner-1.9.1.diff ++++++ --- patches/dev300/apply +++ patches/dev300/apply @@ -1087,6 +1087,8 @@ # help is in /usr/share/ooo-2.0/help now # FIXME: this should be configurable via ./configure officecfg-help-in-usr-share.diff +# will use xulrunner191 on sles10-SP1 (bnc#540726) +xulrunner-1.9.1.diff, ccheney # change user config dir name from ~/.openoffice.org3 to ~/.ooo3 scp2-user-config-ooo3.diff, pmladek # Push fonts into the ps stream always ++++++ piece-disable-pyuno-registration.diff ++++++ --- solenv/bin/modules/installer/servicesfile.pm.old 2009-03-05 15:40:56.000000000 +0100 +++ solenv/bin/modules/installer/servicesfile.pm 2009-03-06 16:11:07.000000000 +0100 @@ -448,7 +448,8 @@ sub register_all_components if ( $#unocomponents > -1 ) { $uno_error_occured = register_unocomponents($allvariableshashref, \@unocomponents, $regcompfileref, $servicesfile, $nativeservicesurlprefix); } if ( $#javacomponents > -1 ) { $java_error_occured = register_javacomponents($allvariableshashref, \@javacomponents, $regcompfileref, $servicesfile, $regcomprdb, $javaservicesurlprefix); } - if ( $#pythoncomponents > -1 ) { $python_error_occured = register_pythoncomponents(\@pythoncomponents, $regcompfileref, $servicesfile, $includepatharrayref); } +# temporary disable on SLED10; it fails there +# if ( $#pythoncomponents > -1 ) { $python_error_occured = register_pythoncomponents(\@pythoncomponents, $regcompfileref, $servicesfile, $includepatharrayref); } if ( $uno_error_occured || $java_error_occured || $python_error_occured ) { $registererrorflag = 1; } ++++++ sal-rtl-compiler-optimization-meego.diff ++++++ --- sal/rtl/source/makefile.mk.old 2010-04-28 11:35:17.000000000 +0200 +++ sal/rtl/source/makefile.mk 2010-06-02 15:11:56.000000000 +0200 @@ -53,6 +53,9 @@ CDEFS+= -DFORCE_SYSALLOC CFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS) +CFLAGS+= -O2 +CXXFLAGS+= -O2 + # --- Files -------------------------------------------------------- # safe that way: gen_makefile doesn't want it, ++++++ solenv-carefull-patching-hack.diff ++++++ --- solenv/inc/tg_ext.mk.old 2010-06-15 13:58:56.000000000 +0200 +++ solenv/inc/tg_ext.mk 2010-06-16 12:59:50.000000000 +0200 @@ -192,6 +192,7 @@ $(PACKAGE_DIR)/$(PATCH_FLAG_FILE) : $(PA @echo no patch needed... $(COMMAND_ECHO)$(TOUCH) $@ .ELSE # "$(PATCH_FILES)"=="none" || "$(PATCH_FILES)"=="" + @echo patches available... .IF "$(GUI)"=="WNT" # hack to make 4nt version 4,01 work and still get propper # errorcodes for versions < 3,00 @@ -202,12 +203,17 @@ $(PACKAGE_DIR)/$(PATCH_FLAG_FILE) : $(PA #.ENDIF # "$(my4ver:s/.//:s/,//)" >= "300" .ELSE # "$(GUI)"=="WNT" .IF "$(BSCLIENT)"=="TRUE" - $(COMMAND_ECHO)cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | $(GNUPATCH) -f $(PATCHFLAGS) -p2 && $(TOUCH) $(PATCH_FLAG_FILE) + $(COMMAND_ECHO)cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | $(GNUPATCH) -f $(PATCHFLAGS) -p2 && echo "patches applied..." + $(DELAY) 2 + $(COMMAND_ECHO)cd $(PACKAGE_DIR) && $(TOUCH) $(PATCH_FLAG_FILE) .ELSE # "$(BSCLIENT)"!="" - $(COMMAND_ECHO)cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | $(GNUPATCH) $(PATCHFLAGS) -p2 && $(TOUCH) $(PATCH_FLAG_FILE) + $(COMMAND_ECHO)cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | $(GNUPATCH) $(PATCHFLAGS) -p2 && echo "patches applied..." + $(DELAY) 2 + $(COMMAND_ECHO)cd $(PACKAGE_DIR) && $(TOUCH) $(PATCH_FLAG_FILE) .ENDIF # "$(BSCLIENT)"!="" .ENDIF # "$(GUI)"=="WNT" .ENDIF # "$(PATCH_FILES)"=="none" || "$(PATCH_FILES)"=="" + @echo patching finished... .IF "$(T_ADDITIONAL_FILES)"!="" .IF "$(GUI)"=="WNT" # Native W32 tools generate only filedates with even seconds, cygwin also with odd seconds ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org