pool/libreoffice
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 82215 from LibreOffice:Unstable

Browse Source 
3.4.2-rc3 is final; added few extra fixes; fixed build on Factory again

OBS-URL: https://build.opensuse.org/request/show/82215
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=21
This commit is contained in:
Lars Vogdt 2011-09-19 15:50:45 +00:00 committed by Git OBS Bridge
parent 54244d69ff
commit 66b79a1c1f
73 changed files with 609 additions and 759 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -23,3 +23,4 @@
*.zst filter=lfs diff=lfs merge=lfs -text
## Specific LFS patterns
185d60944ea767075d27247c3162b3bc-unowinreg.dll filter=lfs diff=lfs merge=lfs -text
Draft.jpg filter=lfs diff=lfs merge=lfs -text

3
Draft.jpg Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c1bb4308b3d1fbb5cb67b32f5427625e0c10eef2decdc121bf3aa4ba803ca7a7
size 18978

2
SUSE-10.1.conf
View File

@ -41,7 +41,7 @@
--with-system-libxslt
--with-system-mozilla=xulrunner
--with-system-neon
--with-system-odbc-headers
--with-system-odbc
--with-xulrunner
--without-junit
--without-myspell-dicts

2
SUSE-11.1.conf
View File

@ -49,7 +49,7 @@
--with-system-lpsolve
--with-system-mozilla=libxul
--with-system-neon
--with-system-odbc-headers
--with-system-odbc
--with-system-sablot
--with-system-xalan
--with-system-xerces

2
SUSE-11.2.conf
View File

@ -50,7 +50,7 @@
--with-system-lpsolve
--with-system-mozilla=libxul
--with-system-neon
--with-system-odbc-headers
--with-system-odbc
--with-system-sablot
--with-system-xalan
--with-system-xerces

2
SUSE-11.3.conf
View File

@ -50,7 +50,7 @@
--with-system-lpsolve
--with-system-mozilla=libxul
--with-system-neon
--with-system-odbc-headers
--with-system-odbc
--with-system-sablot
--with-system-xalan
--with-system-xerces

2
SUSE-11.4.conf
View File

@ -50,7 +50,7 @@
--with-system-lpsolve
--with-system-mozilla=libxul
--with-system-neon
--with-system-odbc-headers
--with-system-odbc
--with-system-sablot
--with-system-xalan
--with-system-xerces

2
SUSE.conf
View File

@ -50,7 +50,7 @@
--with-system-lpsolve
--with-system-mozilla=libxul
--with-system-neon
--with-system-odbc-headers
--with-system-odbc
--with-system-sablot
--with-system-xalan
--with-system-xerces

3
libreoffice-artwork-3.4.2.5.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:dd1a861434bddb93d08da19abccc53d245411a8f673e7f93b367e94cb6b73d51
size 13647245

3
libreoffice-artwork-3.4.2.6.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ec0a72e1072d4d23e4a31a6b8e3f319016c7378eb2e73acbe44cfc2d01e4f9b4
size 13646442

3
libreoffice-base-3.4.2.5.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e9e130df753ce2aa8702a4b4912970562aa8299b16058fa1bb8ce7121d0cc93b
size 2069733

3
libreoffice-base-3.4.2.6.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cc53a44462a9406406a82291a5720064ca26bd35275ed95c6df952aafb1612ca
size 2068644

3
libreoffice-bootstrap-3.4.2.5.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ea906dd3e8197ac90e59205c6d6bbdd31fd694f747ce6b94bf507c81a51a0422
size 2747562

3
libreoffice-bootstrap-3.4.2.6.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:06c0778624712709818b5bfd451f44ff235829d87d276d8caabf9f8394f7cf81
size 2748189

10
libreoffice-branding-upstream.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Mon Sep 12 16:48:48 UTC 2011 - pmladek@suse.com
- libreoffice-3.4.2.6 == SUSE 3.4.2-rc3 == final
-------------------------------------------------------------------
Thu Sep 8 15:28:56 UTC 2011 - pmladek@suse.com
- updated to libreoffice-3.4.2.6 (SUSE 3.4.2-rc3)
-------------------------------------------------------------------
Fri Sep 2 14:25:16 UTC 2011 - pmladek@suse.com

13
libreoffice-branding-upstream.spec
View File

@ -19,10 +19,10 @@
Name: libreoffice-branding-upstream
Version: 3.4.2.5
Version: 3.4.2.6
Release: 1
%define lo_build_version 3.4.2.5
%define lo_piece_version 3.4.2.5
%define lo_build_version 3.4.2.6
%define lo_piece_version 3.4.2.6
%define lo_sourcedirname libreoffice-build-%lo_piece_version
%define lo_home libreoffice
%define lo_basis_dir basis3.4
@ -75,6 +75,7 @@ BuildArch: noarch
#BRAND: type: text config file (ini-files-like)
#BRAND: purpose: defines the position, size and, color of the status bar
%description
This package includes the original branding for the LibreOffice
office suite.
@ -84,8 +85,10 @@ office suite.
%prep
%setup -q -n libreoffice-artwork-%version
%build
%install
install -m 755 -d $RPM_BUILD_ROOT%_datadir/%lo_home/program/shell
# sofficerc
@ -103,11 +106,15 @@ for pict in about.png \
$RPM_BUILD_ROOT%_datadir/%lo_home/program/$pict
done
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
%_datadir/%lo_home
%changelog

3
libreoffice-calc-3.4.2.5.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:eb0ba3eb12a183bcb0190d2b1be59847b11d5c5e9c09f21ac21df500f7a2bf9e
size 9524675

3
libreoffice-calc-3.4.2.6.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:466e71c3272f9f97f38e4da734b38194c4eeb6cce721e31c715aaf1702b82acc
size 9523653

3
libreoffice-components-3.4.2.5.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9b41244bf406ee64a4a223d4467d950625f1ccfcc99be7d41fdbe53be74077d8
size 5097111

3
libreoffice-components-3.4.2.6.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:11340faaebef413222291e151f1f8bd61cebfa5df104f2c634d97842ccc696e4
size 5097183

3
libreoffice-extensions-3.4.2.5.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9fcad8527b4e0a8db6d5a587cbd8945fe9a1e7d846f1bf837da2dceb2e1568bf
size 4215918

3
libreoffice-extensions-3.4.2.6.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4720cd469980c7bdd4116c18b87b17ac95d3c19c619880b6e4393cbb55773210
size 4217072

3
libreoffice-extras-3.4.2.5.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:791191994cd0e50b70fbf1b5f394b1eb6fbf2025012b7ac44d6f0e11020085f5
size 38646547

3
libreoffice-extras-3.4.2.6.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3ac13c7643c0a476c4315f70524a3380de92d79a2c1c1cb932291994147d000d
size 38647264

3
libreoffice-filters-3.4.2.5.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:14c34bde2a5839bd43b2896bd33575fa7c8de5b8392144ba6e68690181267571
size 11785242

3
libreoffice-filters-3.4.2.6.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:09e9a3b30068fc2306f00145677e5342c58f5f12c55acae95e5b06aaebd91e78
size 11782080

3
libreoffice-help-3.4.2.5.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:db94a29c3603cd3b1f1ab14eb2ed9dfb52b7f298f6fc1e35c412b1c0225b8b50
size 1845692

3
libreoffice-help-3.4.2.6.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d1ccfd1c958615cf272d83255eb73e11a4045470feae01507bc342a74168e54f
size 1846692

12
libreoffice-help-en-US.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Mon Sep 12 16:48:48 UTC 2011 - pmladek@suse.com
- libreoffice-3.4.2.6 == SUSE 3.4.2-rc3 == final
-------------------------------------------------------------------
Thu Sep 8 15:28:56 UTC 2011 - pmladek@suse.com
- updated to libreoffice-3.4.2.6 (SUSE 3.4.2-rc3)
- disabled dependency on unixODBC; not needed to build help
- correctly set the documentation directory
-------------------------------------------------------------------
Fri Sep 2 14:25:16 UTC 2011 - pmladek@suse.com

18
libreoffice-help-en-US.spec
View File

@ -24,11 +24,11 @@ Name: libreoffice-help-en-US
## Generated by:
## perl lo-help-gen-spec libreoffice-help-en-US.spec.in lo-help-en-US
###################################################################
Version: 3.4.2.5
Version: 3.4.2.6
Release: 1
%define piece help
%define lo_build_version 3.4.2.5
%define lo_piece_version 3.4.2.5
%define lo_build_version 3.4.2.6
%define lo_piece_version 3.4.2.6
%define lo_langs ""
%define lo_sourcedirname libreoffice-build-%lo_piece_version
%define lo_home libreoffice
@ -100,6 +100,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
#!ExclusiveArch: %ix86 x86_64 ppc
BuildArch: noarch
%description
American help localization for LibreOffice. The other localized
stuff is in LibreOffice-l10n-en-US.
@ -120,6 +121,7 @@ cp %{S:100} %{S:101} %{S:102} %{S:103} %{S:104} %{S:105} distro-configs
%patch1
%endif
%build
%if %prepare_build != 0
#
@ -171,7 +173,7 @@ export PATH="$PATH:/usr/sbin"
--prefix=%{_prefix} \
--mandir=%{_mandir} \
--sysconfdir=/etc \
--with-docdir=%{_docdir}/%{name} \
--docdir=%{_docdir}/%{name} \
--with-distro="$with_distro" \
--without-git \
--without-download \
@ -187,6 +189,7 @@ export PATH="$PATH:/usr/sbin"
--disable-mono \
--without-system-curl \
--disable-ldap \
--without-system-odbc \
--without-system-mozilla \
--without-system-neon \
--without-system-hunspell \
@ -207,6 +210,7 @@ export PATH="$PATH:/usr/sbin"
cd helpcontent2
build --all $PARALLEL_BUILD
%install
. ./*Env.Set.sh
test -z "%lo_langs" && langs="en-US" || langs="%lo_langs"
@ -229,6 +233,7 @@ for lang in $langs ; do
echo "%_datadir/%lo_home/$filelist" >>file-lists/$filelist
done
%clean
rm -rf $RPM_BUILD_ROOT
@ -237,14 +242,19 @@ rm -rf $RPM_BUILD_ROOT
%posttrans -n libreoffice-help-en-US
%_datadir/%lo_home/link-to-ooo-home %_datadir/%lo_home/help_en_US_list.txt || true
%preun -n libreoffice-help-en-US
test "$1" = "0" && cp %_datadir/%lo_home/help_en_US_list.txt %_datadir/%lo_home/help_en_US_list.txt.postun || true
%postun -n libreoffice-help-en-US
test "$1" = "0" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/help_en_US_list.txt.postun || true
rm -f %_datadir/%lo_home/help_en_US_list.txt.postun 2>/dev/null
%files -f file-lists/help_en_US_list.txt -n libreoffice-help-en-US
%defattr(-,root,root)
%changelog

13
libreoffice-help-en-US.spec.in
View File

@ -1,7 +1,7 @@
#
# spec file for package libreoffice-help-en-US (Version 3.2.0.99.2)
# spec file for package libreoffice-help-en-US
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2011 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
@ -19,11 +19,11 @@
Name: libreoffice-help-en-US
@DO_NOT_EDIT_COMMENT@
Version: 3.4.2.5
Version: 3.4.2.6
Release: 1
%define piece help
%define lo_build_version 3.4.2.5
%define lo_piece_version 3.4.2.5
%define lo_build_version 3.4.2.6
%define lo_piece_version 3.4.2.6
%define lo_langs ""
%define lo_sourcedirname libreoffice-build-%lo_piece_version
%define lo_home libreoffice
@ -167,7 +167,7 @@ export PATH="$PATH:/usr/sbin"
--prefix=%{_prefix} \
--mandir=%{_mandir} \
--sysconfdir=/etc \
--with-docdir=%{_docdir}/%{name} \
--docdir=%{_docdir}/%{name} \
--with-distro="$with_distro" \
--without-git \
--without-download \
@ -183,6 +183,7 @@ export PATH="$PATH:/usr/sbin"
--disable-mono \
--without-system-curl \
--disable-ldap \
--without-system-odbc \
--without-system-mozilla \
--without-system-neon \
--without-system-hunspell \

12
libreoffice-help-group1.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Mon Sep 12 16:48:48 UTC 2011 - pmladek@suse.com
- libreoffice-3.4.2.6 == SUSE 3.4.2-rc3 == final
-------------------------------------------------------------------
Thu Sep 8 15:28:56 UTC 2011 - pmladek@suse.com
- updated to libreoffice-3.4.2.6 (SUSE 3.4.2-rc3)
- disabled dependency on unixODBC; not needed to build help
- correctly set the documentation directory
-------------------------------------------------------------------
Fri Sep 2 14:25:16 UTC 2011 - pmladek@suse.com

36
libreoffice-help-group1.spec
View File

@ -24,11 +24,11 @@ Name: libreoffice-help-group1
## Generated by:
## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX
###################################################################
Version: 3.4.2.5
Version: 3.4.2.6
Release: 1
%define piece help
%define lo_build_version 3.4.2.5
%define lo_piece_version 3.4.2.5
%define lo_build_version 3.4.2.6
%define lo_piece_version 3.4.2.6
%define lo_sourcedirname libreoffice-build-%lo_piece_version
%define lo_home libreoffice
%define lo_basis_dir basis3.4
@ -99,6 +99,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
#!ExclusiveArch: %ix86 x86_64 ppc
BuildArch: noarch
%description
This package provides files related to the LibreOffice help
development.
@ -106,6 +107,7 @@ development.
%if %test_build_langs >= 1
%package -n libreoffice-help-cs
License: LGPLv3
Summary: Czech Help Localization for LibreOffice
@ -120,6 +122,7 @@ Provides: OpenOffice_org-help-cs = %version
Obsoletes: OpenOffice_org-help-cs <= %version
Provides: OpenOffice_org-cs:%_prefix/ooo-2.0/help/cs/default.css
%description -n libreoffice-help-cs
Czech help localization for LibreOffice. The other localized stuff
is in libreoffice-l10n-cs.
@ -129,6 +132,7 @@ is in libreoffice-l10n-cs.
%endif
%if %test_build_langs >= 2
%package -n libreoffice-help-da
License: LGPLv3
Summary: Danish Help Localization for LibreOffice
@ -143,6 +147,7 @@ Provides: OpenOffice_org-help-da = %version
Obsoletes: OpenOffice_org-help-da <= %version
Provides: OpenOffice_org-da:%_prefix/ooo-2.0/help/da/default.css
%description -n libreoffice-help-da
Danish help localization for LibreOffice. The other localized stuff
is in libreoffice-l10n-da.
@ -152,6 +157,7 @@ is in libreoffice-l10n-da.
%endif
%if %test_build_langs >= 1
%package -n libreoffice-help-de
License: LGPLv3
Summary: German Help Localization for LibreOffice
@ -166,6 +172,7 @@ Provides: OpenOffice_org-help-de = %version
Obsoletes: OpenOffice_org-help-de <= %version
Provides: OpenOffice_org-de:%_prefix/ooo-2.0/help/de/default.css
%description -n libreoffice-help-de
German help localization for LibreOffice. The other localized stuff
is in libreoffice-l10n-de.
@ -175,6 +182,7 @@ is in libreoffice-l10n-de.
%endif
%if %test_build_langs >= 2
%package -n libreoffice-help-en-GB
License: LGPLv3
Summary: British Help Localization for LibreOffice
@ -189,6 +197,7 @@ Provides: OpenOffice_org-help-en-GB = %version
Obsoletes: OpenOffice_org-help-en-GB <= %version
Provides: OpenOffice_org-en-GB:%_prefix/ooo-2.0/help/en-GB/default.css
%description -n libreoffice-help-en-GB
British help localization for LibreOffice. The other localized stuff
is in libreoffice-l10n-en-GB.
@ -196,6 +205,7 @@ is in libreoffice-l10n-en-GB.
%endif
%prep
%if %prepare_build == 0
%setup -D -T -q -n libreoffice-bootstrap-%version
@ -212,6 +222,7 @@ cp %{S:100} %{S:101} %{S:102} %{S:103} %{S:104} %{S:105} distro-configs
%patch2
%endif
%build
%if %prepare_build != 0
#
@ -263,7 +274,7 @@ export PATH="$PATH:/usr/sbin"
--prefix=%{_prefix} \
--mandir=%{_mandir} \
--sysconfdir=/etc \
--with-docdir=%{_docdir}/%{name} \
--docdir=%{_docdir}/%{name} \
--with-distro="$with_distro" \
--without-git \
--without-download \
@ -279,6 +290,7 @@ export PATH="$PATH:/usr/sbin"
--disable-mono \
--without-system-curl \
--disable-ldap \
--without-system-odbc \
--without-system-mozilla \
--without-system-neon \
--without-system-hunspell \
@ -299,6 +311,7 @@ export PATH="$PATH:/usr/sbin"
cd helpcontent2
build --all $PARALLEL_BUILD
%install
. ./*Env.Set.sh
test -z %lo_langs && langs="en-US" || langs=%lo_langs
@ -321,6 +334,7 @@ for lang in $langs ; do
echo "%_datadir/%lo_home/$filelist" >>file-lists/$filelist
done
%clean
rm -rf $RPM_BUILD_ROOT
@ -330,9 +344,11 @@ rm -rf $RPM_BUILD_ROOT
%posttrans -n libreoffice-help-cs
%_datadir/%lo_home/link-to-ooo-home %_datadir/%lo_home/help_cs_list.txt || true
%preun -n libreoffice-help-cs
test "$1" = "0" && cp %_datadir/%lo_home/help_cs_list.txt %_datadir/%lo_home/help_cs_list.txt.postun || true
%postun -n libreoffice-help-cs
test "$1" = "0" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/help_cs_list.txt.postun || true
rm -f %_datadir/%lo_home/help_cs_list.txt.postun 2>/dev/null
@ -344,9 +360,11 @@ rm -f %_datadir/%lo_home/help_cs_list.txt.postun 2>/dev/null
%posttrans -n libreoffice-help-da
%_datadir/%lo_home/link-to-ooo-home %_datadir/%lo_home/help_da_list.txt || true
%preun -n libreoffice-help-da
test "$1" = "0" && cp %_datadir/%lo_home/help_da_list.txt %_datadir/%lo_home/help_da_list.txt.postun || true
%postun -n libreoffice-help-da
test "$1" = "0" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/help_da_list.txt.postun || true
rm -f %_datadir/%lo_home/help_da_list.txt.postun 2>/dev/null
@ -358,9 +376,11 @@ rm -f %_datadir/%lo_home/help_da_list.txt.postun 2>/dev/null
%posttrans -n libreoffice-help-de
%_datadir/%lo_home/link-to-ooo-home %_datadir/%lo_home/help_de_list.txt || true
%preun -n libreoffice-help-de
test "$1" = "0" && cp %_datadir/%lo_home/help_de_list.txt %_datadir/%lo_home/help_de_list.txt.postun || true
%postun -n libreoffice-help-de
test "$1" = "0" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/help_de_list.txt.postun || true
rm -f %_datadir/%lo_home/help_de_list.txt.postun 2>/dev/null
@ -372,9 +392,11 @@ rm -f %_datadir/%lo_home/help_de_list.txt.postun 2>/dev/null
%posttrans -n libreoffice-help-en-GB
%_datadir/%lo_home/link-to-ooo-home %_datadir/%lo_home/help_en_GB_list.txt || true
%preun -n libreoffice-help-en-GB
test "$1" = "0" && cp %_datadir/%lo_home/help_en_GB_list.txt %_datadir/%lo_home/help_en_GB_list.txt.postun || true
%postun -n libreoffice-help-en-GB
test "$1" = "0" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/help_en_GB_list.txt.postun || true
rm -f %_datadir/%lo_home/help_en_GB_list.txt.postun 2>/dev/null
@ -382,26 +404,32 @@ rm -f %_datadir/%lo_home/help_en_GB_list.txt.postun 2>/dev/null
%if %test_build_langs >= 1
%files -f file-lists/help_cs_list.txt -n libreoffice-help-cs
%defattr(-,root,root)
%endif
%if %test_build_langs >= 2
%files -f file-lists/help_da_list.txt -n libreoffice-help-da
%defattr(-,root,root)
%endif
%if %test_build_langs >= 1
%files -f file-lists/help_de_list.txt -n libreoffice-help-de
%defattr(-,root,root)
%endif
%if %test_build_langs >= 2
%files -f file-lists/help_en_GB_list.txt -n libreoffice-help-en-GB
%defattr(-,root,root)
%endif
%changelog

12
libreoffice-help-group2.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Mon Sep 12 16:48:48 UTC 2011 - pmladek@suse.com
- libreoffice-3.4.2.6 == SUSE 3.4.2-rc3 == final
-------------------------------------------------------------------
Thu Sep 8 15:28:56 UTC 2011 - pmladek@suse.com
- updated to libreoffice-3.4.2.6 (SUSE 3.4.2-rc3)
- disabled dependency on unixODBC; not needed to build help
- correctly set the documentation directory
-------------------------------------------------------------------
Fri Sep 2 14:25:16 UTC 2011 - pmladek@suse.com

37
libreoffice-help-group2.spec
View File

@ -24,11 +24,11 @@ Name: libreoffice-help-group2
## Generated by:
## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX
###################################################################
Version: 3.4.2.5
Version: 3.4.2.6
Release: 1
%define piece help
%define lo_build_version 3.4.2.5
%define lo_piece_version 3.4.2.5
%define lo_build_version 3.4.2.6
%define lo_piece_version 3.4.2.6
%define lo_sourcedirname libreoffice-build-%lo_piece_version
%define lo_home libreoffice
%define lo_basis_dir basis3.4
@ -99,6 +99,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
#!ExclusiveArch: %ix86 x86_64 ppc
BuildArch: noarch
%description
This package provides files related to the LibreOffice help
development.
@ -106,6 +107,7 @@ development.
%if %test_build_langs >= 2
%package -n libreoffice-help-en-ZA
License: LGPLv3
Summary: South Africa English Help Localization for LibreOffice
@ -120,6 +122,7 @@ Provides: OpenOffice_org-help-en-ZA = %version
Obsoletes: OpenOffice_org-help-en-ZA <= %version
Provides: OpenOffice_org-en-ZA:%_prefix/ooo-2.0/help/en-ZA/default.css
%description -n libreoffice-help-en-ZA
South Africa English help localization for LibreOffice. The other localized stuff
is in libreoffice-l10n-en-ZA.
@ -140,6 +143,7 @@ Provides: OpenOffice_org-help-es = %version
Obsoletes: OpenOffice_org-help-es <= %version
Provides: OpenOffice_org-es:%_prefix/ooo-2.0/help/es/default.css
%description -n libreoffice-help-es
Spanish help localization for LibreOffice. The other localized stuff
is in libreoffice-l10n-es.
@ -160,6 +164,7 @@ Provides: OpenOffice_org-help-et = %version
Obsoletes: OpenOffice_org-help-et <= %version
Provides: OpenOffice_org-et:%_prefix/ooo-2.0/help/et/default.css
%description -n libreoffice-help-et
Estonian help localization for LibreOffice. The other localized stuff
is in libreoffice-l10n-et.
@ -180,6 +185,7 @@ Provides: OpenOffice_org-help-fr = %version
Obsoletes: OpenOffice_org-help-fr <= %version
Provides: OpenOffice_org-fr:%_prefix/ooo-2.0/help/fr/default.css
%description -n libreoffice-help-fr
French help localization for LibreOffice. The other localized stuff
is in libreoffice-l10n-fr.
@ -200,6 +206,7 @@ Provides: OpenOffice_org-help-gl = %version
Obsoletes: OpenOffice_org-help-gl <= %version
Provides: OpenOffice_org-gl:%_prefix/ooo-2.0/help/gl/default.css
%description -n libreoffice-help-gl
Galician help localization for LibreOffice. The other localized stuff
is in libreoffice-l10n-gl.
@ -207,6 +214,7 @@ is in libreoffice-l10n-gl.
%endif
%prep
%if %prepare_build == 0
%setup -D -T -q -n libreoffice-bootstrap-%version
@ -223,6 +231,7 @@ cp %{S:100} %{S:101} %{S:102} %{S:103} %{S:104} %{S:105} distro-configs
%patch2
%endif
%build
%if %prepare_build != 0
#
@ -274,7 +283,7 @@ export PATH="$PATH:/usr/sbin"
--prefix=%{_prefix} \
--mandir=%{_mandir} \
--sysconfdir=/etc \
--with-docdir=%{_docdir}/%{name} \
--docdir=%{_docdir}/%{name} \
--with-distro="$with_distro" \
--without-git \
--without-download \
@ -290,6 +299,7 @@ export PATH="$PATH:/usr/sbin"
--disable-mono \
--without-system-curl \
--disable-ldap \
--without-system-odbc \
--without-system-mozilla \
--without-system-neon \
--without-system-hunspell \
@ -310,6 +320,7 @@ export PATH="$PATH:/usr/sbin"
cd helpcontent2
build --all $PARALLEL_BUILD
%install
. ./*Env.Set.sh
test -z %lo_langs && langs="en-US" || langs=%lo_langs
@ -332,6 +343,7 @@ for lang in $langs ; do
echo "%_datadir/%lo_home/$filelist" >>file-lists/$filelist
done
%clean
rm -rf $RPM_BUILD_ROOT
@ -341,9 +353,11 @@ rm -rf $RPM_BUILD_ROOT
%posttrans -n libreoffice-help-en-ZA
%_datadir/%lo_home/link-to-ooo-home %_datadir/%lo_home/help_en_ZA_list.txt || true
%preun -n libreoffice-help-en-ZA
test "$1" = "0" && cp %_datadir/%lo_home/help_en_ZA_list.txt %_datadir/%lo_home/help_en_ZA_list.txt.postun || true
%postun -n libreoffice-help-en-ZA
test "$1" = "0" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/help_en_ZA_list.txt.postun || true
rm -f %_datadir/%lo_home/help_en_ZA_list.txt.postun 2>/dev/null
@ -352,9 +366,11 @@ rm -f %_datadir/%lo_home/help_en_ZA_list.txt.postun 2>/dev/null
%posttrans -n libreoffice-help-es
%_datadir/%lo_home/link-to-ooo-home %_datadir/%lo_home/help_es_list.txt || true
%preun -n libreoffice-help-es
test "$1" = "0" && cp %_datadir/%lo_home/help_es_list.txt %_datadir/%lo_home/help_es_list.txt.postun || true
%postun -n libreoffice-help-es
test "$1" = "0" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/help_es_list.txt.postun || true
rm -f %_datadir/%lo_home/help_es_list.txt.postun 2>/dev/null
@ -363,9 +379,11 @@ rm -f %_datadir/%lo_home/help_es_list.txt.postun 2>/dev/null
%posttrans -n libreoffice-help-et
%_datadir/%lo_home/link-to-ooo-home %_datadir/%lo_home/help_et_list.txt || true
%preun -n libreoffice-help-et
test "$1" = "0" && cp %_datadir/%lo_home/help_et_list.txt %_datadir/%lo_home/help_et_list.txt.postun || true
%postun -n libreoffice-help-et
test "$1" = "0" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/help_et_list.txt.postun || true
rm -f %_datadir/%lo_home/help_et_list.txt.postun 2>/dev/null
@ -374,9 +392,11 @@ rm -f %_datadir/%lo_home/help_et_list.txt.postun 2>/dev/null
%posttrans -n libreoffice-help-fr
%_datadir/%lo_home/link-to-ooo-home %_datadir/%lo_home/help_fr_list.txt || true
%preun -n libreoffice-help-fr
test "$1" = "0" && cp %_datadir/%lo_home/help_fr_list.txt %_datadir/%lo_home/help_fr_list.txt.postun || true
%postun -n libreoffice-help-fr
test "$1" = "0" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/help_fr_list.txt.postun || true
rm -f %_datadir/%lo_home/help_fr_list.txt.postun 2>/dev/null
@ -385,9 +405,11 @@ rm -f %_datadir/%lo_home/help_fr_list.txt.postun 2>/dev/null
%posttrans -n libreoffice-help-gl
%_datadir/%lo_home/link-to-ooo-home %_datadir/%lo_home/help_gl_list.txt || true
%preun -n libreoffice-help-gl
test "$1" = "0" && cp %_datadir/%lo_home/help_gl_list.txt %_datadir/%lo_home/help_gl_list.txt.postun || true
%postun -n libreoffice-help-gl
test "$1" = "0" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/help_gl_list.txt.postun || true
rm -f %_datadir/%lo_home/help_gl_list.txt.postun 2>/dev/null
@ -395,20 +417,27 @@ rm -f %_datadir/%lo_home/help_gl_list.txt.postun 2>/dev/null
%if %test_build_langs >= 2
%files -f file-lists/help_en_ZA_list.txt -n libreoffice-help-en-ZA
%defattr(-,root,root)
%files -f file-lists/help_es_list.txt -n libreoffice-help-es
%defattr(-,root,root)
%files -f file-lists/help_et_list.txt -n libreoffice-help-et
%defattr(-,root,root)
%files -f file-lists/help_fr_list.txt -n libreoffice-help-fr
%defattr(-,root,root)
%files -f file-lists/help_gl_list.txt -n libreoffice-help-gl
%defattr(-,root,root)
%endif
%changelog

12
libreoffice-help-group3.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Mon Sep 12 16:48:48 UTC 2011 - pmladek@suse.com
- libreoffice-3.4.2.6 == SUSE 3.4.2-rc3 == final
-------------------------------------------------------------------
Thu Sep 8 15:28:56 UTC 2011 - pmladek@suse.com
- updated to libreoffice-3.4.2.6 (SUSE 3.4.2-rc3)
- disabled dependency on unixODBC; not needed to build help
- correctly set the documentation directory
-------------------------------------------------------------------
Fri Sep 2 14:25:16 UTC 2011 - pmladek@suse.com

45
libreoffice-help-group3.spec
View File

@ -24,11 +24,11 @@ Name: libreoffice-help-group3
## Generated by:
## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX
###################################################################
Version: 3.4.2.5
Version: 3.4.2.6
Release: 1
%define piece help
%define lo_build_version 3.4.2.5
%define lo_piece_version 3.4.2.5
%define lo_build_version 3.4.2.6
%define lo_piece_version 3.4.2.6
%define lo_sourcedirname libreoffice-build-%lo_piece_version
%define lo_home libreoffice
%define lo_basis_dir basis3.4
@ -99,6 +99,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
#!ExclusiveArch: %ix86 x86_64 ppc
BuildArch: noarch
%description
This package provides files related to the LibreOffice help
development.
@ -106,6 +107,7 @@ development.
%if %test_build_langs >= 2
%package -n libreoffice-help-gu-IN
License: LGPLv3
Summary: Gujarati Help Localization for LibreOffice
@ -120,6 +122,7 @@ Provides: OpenOffice_org-help-gu-IN = %version
Obsoletes: OpenOffice_org-help-gu-IN <= %version
Provides: OpenOffice_org-gu-IN:%_prefix/ooo-2.0/help/gu-IN/default.css
%description -n libreoffice-help-gu-IN
Gujarati help localization for LibreOffice. The other localized stuff
is in libreoffice-l10n-gu-IN.
@ -140,6 +143,7 @@ Provides: OpenOffice_org-help-hi-IN = %version
Obsoletes: OpenOffice_org-help-hi-IN <= %version
Provides: OpenOffice_org-hi-IN:%_prefix/ooo-2.0/help/hi-IN/default.css
%description -n libreoffice-help-hi-IN
Hindi help localization for LibreOffice. The other localized stuff
is in libreoffice-l10n-hi-IN.
@ -149,6 +153,7 @@ is in libreoffice-l10n-hi-IN.
%endif
%if %test_build_langs >= 1
%package -n libreoffice-help-hu
License: LGPLv3
Summary: Hungarian Help Localization for LibreOffice
@ -163,6 +168,7 @@ Provides: OpenOffice_org-help-hu = %version
Obsoletes: OpenOffice_org-help-hu <= %version
Provides: OpenOffice_org-hu:%_prefix/ooo-2.0/help/hu/default.css
%description -n libreoffice-help-hu
Hungarian help localization for LibreOffice. The other localized stuff
is in libreoffice-l10n-hu.
@ -172,6 +178,7 @@ is in libreoffice-l10n-hu.
%endif
%if %test_build_langs >= 2
%package -n libreoffice-help-it
License: LGPLv3
Summary: Italian Help Localization for LibreOffice
@ -186,6 +193,7 @@ Provides: OpenOffice_org-help-it = %version
Obsoletes: OpenOffice_org-help-it <= %version
Provides: OpenOffice_org-it:%_prefix/ooo-2.0/help/it/default.css
%description -n libreoffice-help-it
Italian help localization for LibreOffice. The other localized stuff
is in libreoffice-l10n-it.
@ -195,6 +203,7 @@ is in libreoffice-l10n-it.
%endif
%if %test_build_langs >= 1
%package -n libreoffice-help-ja
License: LGPLv3
Summary: Japanese Help Localization for LibreOffice
@ -209,6 +218,7 @@ Provides: OpenOffice_org-help-ja = %version
Obsoletes: OpenOffice_org-help-ja <= %version
Provides: OpenOffice_org-ja:%_prefix/ooo-2.0/help/ja/default.css
%description -n libreoffice-help-ja
Japanese help localization for LibreOffice. The other localized stuff
is in libreoffice-l10n-ja.
@ -218,6 +228,7 @@ is in libreoffice-l10n-ja.
%endif
%if %test_build_langs >= 2
%package -n libreoffice-help-km
License: LGPLv3
Summary: Khmer Help Localization for LibreOffice
@ -232,6 +243,7 @@ Provides: OpenOffice_org-help-km = %version
Obsoletes: OpenOffice_org-help-km <= %version
Provides: OpenOffice_org-km:%_prefix/ooo-2.0/help/km/default.css
%description -n libreoffice-help-km
Khmer help localization for LibreOffice. The other localized stuff
is in libreoffice-l10n-km.
@ -239,6 +251,7 @@ is in libreoffice-l10n-km.
%endif
%prep
%if %prepare_build == 0
%setup -D -T -q -n libreoffice-bootstrap-%version
@ -255,6 +268,7 @@ cp %{S:100} %{S:101} %{S:102} %{S:103} %{S:104} %{S:105} distro-configs
%patch2
%endif
%build
%if %prepare_build != 0
#
@ -306,7 +320,7 @@ export PATH="$PATH:/usr/sbin"
--prefix=%{_prefix} \
--mandir=%{_mandir} \
--sysconfdir=/etc \
--with-docdir=%{_docdir}/%{name} \
--docdir=%{_docdir}/%{name} \
--with-distro="$with_distro" \
--without-git \
--without-download \
@ -322,6 +336,7 @@ export PATH="$PATH:/usr/sbin"
--disable-mono \
--without-system-curl \
--disable-ldap \
--without-system-odbc \
--without-system-mozilla \
--without-system-neon \
--without-system-hunspell \
@ -342,6 +357,7 @@ export PATH="$PATH:/usr/sbin"
cd helpcontent2
build --all $PARALLEL_BUILD
%install
. ./*Env.Set.sh
test -z %lo_langs && langs="en-US" || langs=%lo_langs
@ -364,6 +380,7 @@ for lang in $langs ; do
echo "%_datadir/%lo_home/$filelist" >>file-lists/$filelist
done
%clean
rm -rf $RPM_BUILD_ROOT
@ -373,9 +390,11 @@ rm -rf $RPM_BUILD_ROOT
%posttrans -n libreoffice-help-gu-IN
%_datadir/%lo_home/link-to-ooo-home %_datadir/%lo_home/help_gu_list.txt || true
%preun -n libreoffice-help-gu-IN
test "$1" = "0" && cp %_datadir/%lo_home/help_gu_list.txt %_datadir/%lo_home/help_gu_list.txt.postun || true
%postun -n libreoffice-help-gu-IN
test "$1" = "0" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/help_gu_list.txt.postun || true
rm -f %_datadir/%lo_home/help_gu_list.txt.postun 2>/dev/null
@ -384,9 +403,11 @@ rm -f %_datadir/%lo_home/help_gu_list.txt.postun 2>/dev/null
%posttrans -n libreoffice-help-hi-IN
%_datadir/%lo_home/link-to-ooo-home %_datadir/%lo_home/help_hi_list.txt || true
%preun -n libreoffice-help-hi-IN
test "$1" = "0" && cp %_datadir/%lo_home/help_hi_list.txt %_datadir/%lo_home/help_hi_list.txt.postun || true
%postun -n libreoffice-help-hi-IN
test "$1" = "0" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/help_hi_list.txt.postun || true
rm -f %_datadir/%lo_home/help_hi_list.txt.postun 2>/dev/null
@ -398,9 +419,11 @@ rm -f %_datadir/%lo_home/help_hi_list.txt.postun 2>/dev/null
%posttrans -n libreoffice-help-hu
%_datadir/%lo_home/link-to-ooo-home %_datadir/%lo_home/help_hu_list.txt || true
%preun -n libreoffice-help-hu
test "$1" = "0" && cp %_datadir/%lo_home/help_hu_list.txt %_datadir/%lo_home/help_hu_list.txt.postun || true
%postun -n libreoffice-help-hu
test "$1" = "0" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/help_hu_list.txt.postun || true
rm -f %_datadir/%lo_home/help_hu_list.txt.postun 2>/dev/null
@ -412,9 +435,11 @@ rm -f %_datadir/%lo_home/help_hu_list.txt.postun 2>/dev/null
%posttrans -n libreoffice-help-it
%_datadir/%lo_home/link-to-ooo-home %_datadir/%lo_home/help_it_list.txt || true
%preun -n libreoffice-help-it
test "$1" = "0" && cp %_datadir/%lo_home/help_it_list.txt %_datadir/%lo_home/help_it_list.txt.postun || true
%postun -n libreoffice-help-it
test "$1" = "0" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/help_it_list.txt.postun || true
rm -f %_datadir/%lo_home/help_it_list.txt.postun 2>/dev/null
@ -426,9 +451,11 @@ rm -f %_datadir/%lo_home/help_it_list.txt.postun 2>/dev/null
%posttrans -n libreoffice-help-ja
%_datadir/%lo_home/link-to-ooo-home %_datadir/%lo_home/help_ja_list.txt || true
%preun -n libreoffice-help-ja
test "$1" = "0" && cp %_datadir/%lo_home/help_ja_list.txt %_datadir/%lo_home/help_ja_list.txt.postun || true
%postun -n libreoffice-help-ja
test "$1" = "0" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/help_ja_list.txt.postun || true
rm -f %_datadir/%lo_home/help_ja_list.txt.postun 2>/dev/null
@ -440,9 +467,11 @@ rm -f %_datadir/%lo_home/help_ja_list.txt.postun 2>/dev/null
%posttrans -n libreoffice-help-km
%_datadir/%lo_home/link-to-ooo-home %_datadir/%lo_home/help_km_list.txt || true
%preun -n libreoffice-help-km
test "$1" = "0" && cp %_datadir/%lo_home/help_km_list.txt %_datadir/%lo_home/help_km_list.txt.postun || true
%postun -n libreoffice-help-km
test "$1" = "0" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/help_km_list.txt.postun || true
rm -f %_datadir/%lo_home/help_km_list.txt.postun 2>/dev/null
@ -450,35 +479,43 @@ rm -f %_datadir/%lo_home/help_km_list.txt.postun 2>/dev/null
%if %test_build_langs >= 2
%files -f file-lists/help_gu_list.txt -n libreoffice-help-gu-IN
%defattr(-,root,root)
%files -f file-lists/help_hi_list.txt -n libreoffice-help-hi-IN
%defattr(-,root,root)
%endif
%if %test_build_langs >= 1
%files -f file-lists/help_hu_list.txt -n libreoffice-help-hu
%defattr(-,root,root)
%endif
%if %test_build_langs >= 2
%files -f file-lists/help_it_list.txt -n libreoffice-help-it
%defattr(-,root,root)
%endif
%if %test_build_langs >= 1
%files -f file-lists/help_ja_list.txt -n libreoffice-help-ja
%defattr(-,root,root)
%endif
%if %test_build_langs >= 2
%files -f file-lists/help_km_list.txt -n libreoffice-help-km
%defattr(-,root,root)
%endif
%changelog

12
libreoffice-help-group4.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Mon Sep 12 16:48:48 UTC 2011 - pmladek@suse.com
- libreoffice-3.4.2.6 == SUSE 3.4.2-rc3 == final
-------------------------------------------------------------------
Thu Sep 8 15:28:56 UTC 2011 - pmladek@suse.com
- updated to libreoffice-3.4.2.6 (SUSE 3.4.2-rc3)
- disabled dependency on unixODBC; not needed to build help
- correctly set the documentation directory
-------------------------------------------------------------------
Fri Sep 2 14:25:16 UTC 2011 - pmladek@suse.com

33
libreoffice-help-group4.spec
View File

@ -24,11 +24,11 @@ Name: libreoffice-help-group4
## Generated by:
## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX
###################################################################
Version: 3.4.2.5
Version: 3.4.2.6
Release: 1
%define piece help
%define lo_build_version 3.4.2.5
%define lo_piece_version 3.4.2.5
%define lo_build_version 3.4.2.6
%define lo_piece_version 3.4.2.6
%define lo_sourcedirname libreoffice-build-%lo_piece_version
%define lo_home libreoffice
%define lo_basis_dir basis3.4
@ -99,6 +99,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
#!ExclusiveArch: %ix86 x86_64 ppc
BuildArch: noarch
%description
This package provides files related to the LibreOffice help
development.
@ -106,6 +107,7 @@ development.
%if %test_build_langs >= 2
%package -n libreoffice-help-ko
License: LGPLv3
Summary: Korean Help Localization for LibreOffice
@ -120,6 +122,7 @@ Provides: OpenOffice_org-help-ko = %version
Obsoletes: OpenOffice_org-help-ko <= %version
Provides: OpenOffice_org-ko:%_prefix/ooo-2.0/help/ko/default.css
%description -n libreoffice-help-ko
Korean help localization for LibreOffice. The other localized stuff
is in libreoffice-l10n-ko.
@ -140,6 +143,7 @@ Provides: OpenOffice_org-help-nl = %version
Obsoletes: OpenOffice_org-help-nl <= %version
Provides: OpenOffice_org-nl:%_prefix/ooo-2.0/help/nl/default.css
%description -n libreoffice-help-nl
Dutch help localization for LibreOffice. The other localized stuff
is in libreoffice-l10n-nl.
@ -160,6 +164,7 @@ Provides: OpenOffice_org-help-pl = %version
Obsoletes: OpenOffice_org-help-pl <= %version
Provides: OpenOffice_org-pl:%_prefix/ooo-2.0/help/pl/default.css
%description -n libreoffice-help-pl
Polish help localization for LibreOffice. The other localized stuff
is in libreoffice-l10n-pl.
@ -180,6 +185,7 @@ Provides: OpenOffice_org-help-pt = %version
Obsoletes: OpenOffice_org-help-pt <= %version
Provides: OpenOffice_org-pt:%_prefix/ooo-2.0/help/pt/default.css
%description -n libreoffice-help-pt
Portuguese help localization for LibreOffice. The other localized stuff
is in libreoffice-l10n-pt.
@ -187,6 +193,7 @@ is in libreoffice-l10n-pt.
%endif
%prep
%if %prepare_build == 0
%setup -D -T -q -n libreoffice-bootstrap-%version
@ -203,6 +210,7 @@ cp %{S:100} %{S:101} %{S:102} %{S:103} %{S:104} %{S:105} distro-configs
%patch2
%endif
%build
%if %prepare_build != 0
#
@ -254,7 +262,7 @@ export PATH="$PATH:/usr/sbin"
--prefix=%{_prefix} \
--mandir=%{_mandir} \
--sysconfdir=/etc \
--with-docdir=%{_docdir}/%{name} \
--docdir=%{_docdir}/%{name} \
--with-distro="$with_distro" \
--without-git \
--without-download \
@ -270,6 +278,7 @@ export PATH="$PATH:/usr/sbin"
--disable-mono \
--without-system-curl \
--disable-ldap \
--without-system-odbc \
--without-system-mozilla \
--without-system-neon \
--without-system-hunspell \
@ -290,6 +299,7 @@ export PATH="$PATH:/usr/sbin"
cd helpcontent2
build --all $PARALLEL_BUILD
%install
. ./*Env.Set.sh
test -z %lo_langs && langs="en-US" || langs=%lo_langs
@ -312,6 +322,7 @@ for lang in $langs ; do
echo "%_datadir/%lo_home/$filelist" >>file-lists/$filelist
done
%clean
rm -rf $RPM_BUILD_ROOT
@ -321,9 +332,11 @@ rm -rf $RPM_BUILD_ROOT
%posttrans -n libreoffice-help-ko
%_datadir/%lo_home/link-to-ooo-home %_datadir/%lo_home/help_ko_list.txt || true
%preun -n libreoffice-help-ko
test "$1" = "0" && cp %_datadir/%lo_home/help_ko_list.txt %_datadir/%lo_home/help_ko_list.txt.postun || true
%postun -n libreoffice-help-ko
test "$1" = "0" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/help_ko_list.txt.postun || true
rm -f %_datadir/%lo_home/help_ko_list.txt.postun 2>/dev/null
@ -332,9 +345,11 @@ rm -f %_datadir/%lo_home/help_ko_list.txt.postun 2>/dev/null
%posttrans -n libreoffice-help-nl
%_datadir/%lo_home/link-to-ooo-home %_datadir/%lo_home/help_nl_list.txt || true
%preun -n libreoffice-help-nl
test "$1" = "0" && cp %_datadir/%lo_home/help_nl_list.txt %_datadir/%lo_home/help_nl_list.txt.postun || true
%postun -n libreoffice-help-nl
test "$1" = "0" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/help_nl_list.txt.postun || true
rm -f %_datadir/%lo_home/help_nl_list.txt.postun 2>/dev/null
@ -343,9 +358,11 @@ rm -f %_datadir/%lo_home/help_nl_list.txt.postun 2>/dev/null
%posttrans -n libreoffice-help-pl
%_datadir/%lo_home/link-to-ooo-home %_datadir/%lo_home/help_pl_list.txt || true
%preun -n libreoffice-help-pl
test "$1" = "0" && cp %_datadir/%lo_home/help_pl_list.txt %_datadir/%lo_home/help_pl_list.txt.postun || true
%postun -n libreoffice-help-pl
test "$1" = "0" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/help_pl_list.txt.postun || true
rm -f %_datadir/%lo_home/help_pl_list.txt.postun 2>/dev/null
@ -354,9 +371,11 @@ rm -f %_datadir/%lo_home/help_pl_list.txt.postun 2>/dev/null
%posttrans -n libreoffice-help-pt
%_datadir/%lo_home/link-to-ooo-home %_datadir/%lo_home/help_pt_list.txt || true
%preun -n libreoffice-help-pt
test "$1" = "0" && cp %_datadir/%lo_home/help_pt_list.txt %_datadir/%lo_home/help_pt_list.txt.postun || true
%postun -n libreoffice-help-pt
test "$1" = "0" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/help_pt_list.txt.postun || true
rm -f %_datadir/%lo_home/help_pt_list.txt.postun 2>/dev/null
@ -364,17 +383,23 @@ rm -f %_datadir/%lo_home/help_pt_list.txt.postun 2>/dev/null
%if %test_build_langs >= 2
%files -f file-lists/help_ko_list.txt -n libreoffice-help-ko
%defattr(-,root,root)
%files -f file-lists/help_nl_list.txt -n libreoffice-help-nl
%defattr(-,root,root)
%files -f file-lists/help_pl_list.txt -n libreoffice-help-pl
%defattr(-,root,root)
%files -f file-lists/help_pt_list.txt -n libreoffice-help-pt
%defattr(-,root,root)
%endif
%changelog

12
libreoffice-help-group5.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Mon Sep 12 16:48:48 UTC 2011 - pmladek@suse.com
- libreoffice-3.4.2.6 == SUSE 3.4.2-rc3 == final
-------------------------------------------------------------------
Thu Sep 8 15:28:56 UTC 2011 - pmladek@suse.com
- updated to libreoffice-3.4.2.6 (SUSE 3.4.2-rc3)
- disabled dependency on unixODBC; not needed to build help
- correctly set the documentation directory
-------------------------------------------------------------------
Fri Sep 2 14:25:16 UTC 2011 - pmladek@suse.com

41
libreoffice-help-group5.spec
View File

@ -24,11 +24,11 @@ Name: libreoffice-help-group5
## Generated by:
## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX
###################################################################
Version: 3.4.2.5
Version: 3.4.2.6
Release: 1
%define piece help
%define lo_build_version 3.4.2.5
%define lo_piece_version 3.4.2.5
%define lo_build_version 3.4.2.6
%define lo_piece_version 3.4.2.6
%define lo_sourcedirname libreoffice-build-%lo_piece_version
%define lo_home libreoffice
%define lo_basis_dir basis3.4
@ -99,6 +99,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
#!ExclusiveArch: %ix86 x86_64 ppc
BuildArch: noarch
%description
This package provides files related to the LibreOffice help
development.
@ -106,6 +107,7 @@ development.
%if %test_build_langs >= 2
%package -n libreoffice-help-pt-BR
License: LGPLv3
Summary: Brazilian Portuguese Help Localization for LibreOffice
@ -120,6 +122,7 @@ Provides: OpenOffice_org-help-pt-BR = %version
Obsoletes: OpenOffice_org-help-pt-BR <= %version
Provides: OpenOffice_org-pt-BR:%_prefix/ooo-2.0/help/pt-BR/default.css
%description -n libreoffice-help-pt-BR
Brazilian Portuguese help localization for LibreOffice. The other localized stuff
is in libreoffice-l10n-pt-BR.
@ -140,6 +143,7 @@ Provides: OpenOffice_org-help-ru = %version
Obsoletes: OpenOffice_org-help-ru <= %version
Provides: OpenOffice_org-ru:%_prefix/ooo-2.0/help/ru/default.css
%description -n libreoffice-help-ru
Russian help localization for LibreOffice. The other localized stuff
is in libreoffice-l10n-ru.
@ -160,6 +164,7 @@ Provides: OpenOffice_org-help-sl = %version
Obsoletes: OpenOffice_org-help-sl <= %version
Provides: OpenOffice_org-sl:%_prefix/ooo-2.0/help/sl/default.css
%description -n libreoffice-help-sl
Slovene help localization for LibreOffice. The other localized stuff
is in libreoffice-l10n-sl.
@ -180,6 +185,7 @@ Provides: OpenOffice_org-help-sv = %version
Obsoletes: OpenOffice_org-help-sv <= %version
Provides: OpenOffice_org-sv:%_prefix/ooo-2.0/help/sv/default.css
%description -n libreoffice-help-sv
Swedish help localization for LibreOffice. The other localized stuff
is in libreoffice-l10n-sv.
@ -200,6 +206,7 @@ Provides: OpenOffice_org-help-zh-CN = %version
Obsoletes: OpenOffice_org-help-zh-CN <= %version
Provides: OpenOffice_org-zh-CN:%_prefix/ooo-2.0/help/zh-CN/default.css
%description -n libreoffice-help-zh-CN
Chinese Simplified help localization for LibreOffice. The other localized stuff
is in libreoffice-l10n-zh-CN.
@ -220,6 +227,7 @@ Provides: OpenOffice_org-help-zh-TW = %version
Obsoletes: OpenOffice_org-help-zh-TW <= %version
Provides: OpenOffice_org-zh-TW:%_prefix/ooo-2.0/help/zh-TW/default.css
%description -n libreoffice-help-zh-TW
Chinese Traditional help localization for LibreOffice. The other localized stuff
is in libreoffice-l10n-zh-TW.
@ -227,6 +235,7 @@ is in libreoffice-l10n-zh-TW.
%endif
%prep
%if %prepare_build == 0
%setup -D -T -q -n libreoffice-bootstrap-%version
@ -243,6 +252,7 @@ cp %{S:100} %{S:101} %{S:102} %{S:103} %{S:104} %{S:105} distro-configs
%patch2
%endif
%build
%if %prepare_build != 0
#
@ -294,7 +304,7 @@ export PATH="$PATH:/usr/sbin"
--prefix=%{_prefix} \
--mandir=%{_mandir} \
--sysconfdir=/etc \
--with-docdir=%{_docdir}/%{name} \
--docdir=%{_docdir}/%{name} \
--with-distro="$with_distro" \
--without-git \
--without-download \
@ -310,6 +320,7 @@ export PATH="$PATH:/usr/sbin"
--disable-mono \
--without-system-curl \
--disable-ldap \
--without-system-odbc \
--without-system-mozilla \
--without-system-neon \
--without-system-hunspell \
@ -330,6 +341,7 @@ export PATH="$PATH:/usr/sbin"
cd helpcontent2
build --all $PARALLEL_BUILD
%install
. ./*Env.Set.sh
test -z %lo_langs && langs="en-US" || langs=%lo_langs
@ -352,6 +364,7 @@ for lang in $langs ; do
echo "%_datadir/%lo_home/$filelist" >>file-lists/$filelist
done
%clean
rm -rf $RPM_BUILD_ROOT
@ -361,9 +374,11 @@ rm -rf $RPM_BUILD_ROOT
%posttrans -n libreoffice-help-pt-BR
%_datadir/%lo_home/link-to-ooo-home %_datadir/%lo_home/help_pt_BR_list.txt || true
%preun -n libreoffice-help-pt-BR
test "$1" = "0" && cp %_datadir/%lo_home/help_pt_BR_list.txt %_datadir/%lo_home/help_pt_BR_list.txt.postun || true
%postun -n libreoffice-help-pt-BR
test "$1" = "0" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/help_pt_BR_list.txt.postun || true
rm -f %_datadir/%lo_home/help_pt_BR_list.txt.postun 2>/dev/null
@ -372,9 +387,11 @@ rm -f %_datadir/%lo_home/help_pt_BR_list.txt.postun 2>/dev/null
%posttrans -n libreoffice-help-ru
%_datadir/%lo_home/link-to-ooo-home %_datadir/%lo_home/help_ru_list.txt || true
%preun -n libreoffice-help-ru
test "$1" = "0" && cp %_datadir/%lo_home/help_ru_list.txt %_datadir/%lo_home/help_ru_list.txt.postun || true
%postun -n libreoffice-help-ru
test "$1" = "0" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/help_ru_list.txt.postun || true
rm -f %_datadir/%lo_home/help_ru_list.txt.postun 2>/dev/null
@ -383,9 +400,11 @@ rm -f %_datadir/%lo_home/help_ru_list.txt.postun 2>/dev/null
%posttrans -n libreoffice-help-sl
%_datadir/%lo_home/link-to-ooo-home %_datadir/%lo_home/help_sl_list.txt || true
%preun -n libreoffice-help-sl
test "$1" = "0" && cp %_datadir/%lo_home/help_sl_list.txt %_datadir/%lo_home/help_sl_list.txt.postun || true
%postun -n libreoffice-help-sl
test "$1" = "0" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/help_sl_list.txt.postun || true
rm -f %_datadir/%lo_home/help_sl_list.txt.postun 2>/dev/null
@ -394,9 +413,11 @@ rm -f %_datadir/%lo_home/help_sl_list.txt.postun 2>/dev/null
%posttrans -n libreoffice-help-sv
%_datadir/%lo_home/link-to-ooo-home %_datadir/%lo_home/help_sv_list.txt || true
%preun -n libreoffice-help-sv
test "$1" = "0" && cp %_datadir/%lo_home/help_sv_list.txt %_datadir/%lo_home/help_sv_list.txt.postun || true
%postun -n libreoffice-help-sv
test "$1" = "0" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/help_sv_list.txt.postun || true
rm -f %_datadir/%lo_home/help_sv_list.txt.postun 2>/dev/null
@ -405,9 +426,11 @@ rm -f %_datadir/%lo_home/help_sv_list.txt.postun 2>/dev/null
%posttrans -n libreoffice-help-zh-CN
%_datadir/%lo_home/link-to-ooo-home %_datadir/%lo_home/help_zh_CN_list.txt || true
%preun -n libreoffice-help-zh-CN
test "$1" = "0" && cp %_datadir/%lo_home/help_zh_CN_list.txt %_datadir/%lo_home/help_zh_CN_list.txt.postun || true
%postun -n libreoffice-help-zh-CN
test "$1" = "0" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/help_zh_CN_list.txt.postun || true
rm -f %_datadir/%lo_home/help_zh_CN_list.txt.postun 2>/dev/null
@ -416,9 +439,11 @@ rm -f %_datadir/%lo_home/help_zh_CN_list.txt.postun 2>/dev/null
%posttrans -n libreoffice-help-zh-TW
%_datadir/%lo_home/link-to-ooo-home %_datadir/%lo_home/help_zh_TW_list.txt || true
%preun -n libreoffice-help-zh-TW
test "$1" = "0" && cp %_datadir/%lo_home/help_zh_TW_list.txt %_datadir/%lo_home/help_zh_TW_list.txt.postun || true
%postun -n libreoffice-help-zh-TW
test "$1" = "0" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/help_zh_TW_list.txt.postun || true
rm -f %_datadir/%lo_home/help_zh_TW_list.txt.postun 2>/dev/null
@ -426,23 +451,31 @@ rm -f %_datadir/%lo_home/help_zh_TW_list.txt.postun 2>/dev/null
%if %test_build_langs >= 2
%files -f file-lists/help_pt_BR_list.txt -n libreoffice-help-pt-BR
%defattr(-,root,root)
%files -f file-lists/help_ru_list.txt -n libreoffice-help-ru
%defattr(-,root,root)
%files -f file-lists/help_sl_list.txt -n libreoffice-help-sl
%defattr(-,root,root)
%files -f file-lists/help_sv_list.txt -n libreoffice-help-sv
%defattr(-,root,root)
%files -f file-lists/help_zh_CN_list.txt -n libreoffice-help-zh-CN
%defattr(-,root,root)
%files -f file-lists/help_zh_TW_list.txt -n libreoffice-help-zh-TW
%defattr(-,root,root)
%endif
%changelog

15
libreoffice-help-groupX.spec.in
View File

@ -1,7 +1,7 @@
#
# spec file for package libreoffice-help-group1 (Version 3.2.0.99.2)
# spec file for package libreoffice-help-group1
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2011 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
@ -19,11 +19,11 @@
Name: libreoffice-help-group@GROUP_NUMBER@
@DO_NOT_EDIT_COMMENT@
Version: 3.4.2.5
Version: 3.4.2.6
Release: 1
%define piece help
%define lo_build_version 3.4.2.5
%define lo_piece_version 3.4.2.5
%define lo_build_version 3.4.2.6
%define lo_piece_version 3.4.2.6
%define lo_sourcedirname libreoffice-build-%lo_piece_version
%define lo_home libreoffice
%define lo_basis_dir basis3.4
@ -89,7 +89,7 @@ Patch0: libreoffice-configure-typo-fontconfig.diff
# I think that it worked only by chance when there was checks for more system librarires
Patch1: libreoffice-cc-detection.diff
# it created 3.8GB build log; Build Service refused to build such package
Patch2: translations-no-warnigns-from-po2oo.diff
Patch2: translations-no-warnigns-from-po2oo.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#!ExclusiveArch: %ix86 x86_64 ppc
BuildArch: noarch
@ -167,7 +167,7 @@ export PATH="$PATH:/usr/sbin"
--prefix=%{_prefix} \
--mandir=%{_mandir} \
--sysconfdir=/etc \
--with-docdir=%{_docdir}/%{name} \
--docdir=%{_docdir}/%{name} \
--with-distro="$with_distro" \
--without-git \
--without-download \
@ -183,6 +183,7 @@ export PATH="$PATH:/usr/sbin"
--disable-mono \
--without-system-curl \
--disable-ldap \
--without-system-odbc \
--without-system-mozilla \
--without-system-neon \
--without-system-hunspell \

3
libreoffice-impress-3.4.2.5.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7da79c00a908f36aabee8c9e95b7a04e512e1d171b8cd002d677c2c7c3a30b03
size 2652719

3
libreoffice-impress-3.4.2.6.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:706cdb10a518b97272f85781cf18b74783b9fc83571968915ad1488f955db9f7
size 2652467

3
libreoffice-libs-core-3.4.2.5.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3586f54515bfeacb2fa606555111a0562050a72389140e3747f49e6832a51b9f
size 15598536

3
libreoffice-libs-core-3.4.2.6.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ba33e0205a941dadeea71121e3ab92c2bf1ad7a9d0def001f39157e729d4a293
size 15596771

3
libreoffice-libs-extern-3.4.2.5.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:07efc005e6d197a928005a0f8f5b7f9a12b8b3f7b4bc44288e9dcc09d1eb2386
size 638375

3
libreoffice-libs-extern-3.4.2.6.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:23d11ed79107bf1fab6fb0dedd806f45a0827c751d5aff177254d2974f2ff857
size 638621

3
libreoffice-libs-extern-sys-3.4.2.5.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a132234eaee4f86962fe3d32111b3e3c2b0e9a381d5415f93ab0ec991ec9b5f5
size 44700981

3
libreoffice-libs-extern-sys-3.4.2.6.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a159fb7fba129b390ee70b1664b5aca3760c968db732d84d1ee1ff5e1baa1af4
size 44700033

3
libreoffice-libs-gui-3.4.2.5.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:94da7a9a3a68c3085d91974c73e2a01d1881c4ba8d98c1868c8dbf23191f1b49
size 10867590

3
libreoffice-libs-gui-3.4.2.6.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e4a58a9d7195ce26c06322001a2a9bae725c97b3b62e4d3ae4664f9b54fa7c48
size 10868843

3
libreoffice-postprocess-3.4.2.5.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9da6ae74971e0e82972b75f8b1cc0d5a777e4e632775b51047a4c3dbe61222f5
size 50973

3
libreoffice-postprocess-3.4.2.6.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:13ead93e74252fbeb8f1f898009d97883a1a02722660a9304be40d6cffeaef13
size 51041

3
libreoffice-sdk-3.4.2.5.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ce954d4c40ac615a1aa148c5f445f622ee5cd8146aa72def39aadfdc51afd0f1
size 1722403

3
libreoffice-sdk-3.4.2.6.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:28ef6243c09ccb648eb5bc1a99687e60d9a472f0034877d8b70cf210ae9d7e81
size 1722178

3
libreoffice-testing-3.4.2.5.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:56edacc521bf2280e27e35a9b48c3195e9cc79e0ec589bd09a245238959448c2
size 50847914

3
libreoffice-testing-3.4.2.6.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c8b7928e4e22095bb2ff7ee04c2b1caf67660eaa5b6074b7597c57662735c37b
size 50850477

3
libreoffice-translations-3.4.2.5.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3a504077c4b26177f9a5241880694960f18738acfe93dfb3f5aadb3839cb629d
size 137018873

3
libreoffice-translations-3.4.2.6.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e43e2f9dbc07542e2b3b65b34fa1d1e997d21275e590c7e4f6d4a6f68bf2a71b
size 137016241

3
libreoffice-ure-3.4.2.5.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0d2b1eaf7d2f3635443e68f7f5e1d4dc6c64a3e4b1ace9353bc7b6f31da48b0f
size 6233158

3
libreoffice-ure-3.4.2.6.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:55156134376dbad5154b2167946ecfb5cde134014770ce663994a941f3c06f6e
size 6232844

3
libreoffice-writer-3.4.2.5.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:78006bd82aa318ae6a8be3a4e6ec85e20d84c2a7c999d9f689c123a64c879d13
size 7301402

3
libreoffice-writer-3.4.2.6.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:86ce965bebe975756ffcc352950e5b09126eb527106a690a7e104e5468b5bba0
size 7301402

47
libreoffice.changes
View File

@ -1,3 +1,50 @@
-------------------------------------------------------------------
Mon Sep 12 16:48:48 UTC 2011 - pmladek@suse.com
- libreoffice-3.4.2.6 == SUSE 3.4.2-rc3 == final
-------------------------------------------------------------------
Mon Sep 12 14:27:30 UTC 2011 - pmladek@suse.com
- scripting-provider-build-dep.diff: make sure that the extra jar files
are bundled with the script provider extensions
- redland-rpath-hack.diff: crazy hack to avoid /usr/lib64 in RPATH
and pass brp-rpath check; used only on Factory-x86_64 (bnc#717262)
- added dbus-1-glib-devel and orbit2-devel into BuildRequires;
was not longer required by gconf2-devel after a Factory clean up
-------------------------------------------------------------------
Thu Sep 8 15:28:56 UTC 2011 - pmladek@suse.com
- updated to libreoffice-3.4.2.6 (SUSE 3.4.2-rc3):
* bootstrap
* add executable rights to libraries
* put VBA stuff into correct subpackages
* correctly set install path in java-set-classpath
* more reasonable access rights for installed files
* move mono_loader.*.uno.so into the mono subpackage
* really put SDK documentation into the doc subpackage
* calc
* crash when modifying a named range
* crash with RangeName erase (bnc#683578)
* impress
* revert "allow impress import of embedded color tables" (bnc#715931)
* libs-core
* better detect OASIS MIME types
* add Flat XML MIME types (bnc#711977)
* correctly update bundled extensions (fdo#37195)
* libs-extern
* broken PDF A/1-a export in 64-bit builds (fdo#39355)
- enabled system ODBC again
- correctly set the documentation directory
- added back the extra Draft.jpg into the "Background" gallery
- beanshell, java, and python scripting needed to be explicitly enabled
and installed as extension; in the past, they were built and installed
out of box
- used old desktop file names; there were defined another priorities
for them in the system; for example, it fixed opening .ods files by LO
instead of Evince
-------------------------------------------------------------------
Mon Sep 5 10:25:06 UTC 2011 - pmladek@suse.com

185
libreoffice.spec
View File

@ -19,7 +19,7 @@
Name: libreoffice
BuildRequires: ImageMagick ant ant-apache-regexp ant-nodeps bison boost-devel ccache cups-devel curl-devel flac-devel flex gcc-c++ gnome-vfs2-devel gperf gtk2-devel icu java-devel libexif libxml2-devel 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
BuildRequires: ImageMagick ant ant-apache-regexp ant-nodeps bison boost-devel ccache cups-devel curl-devel dbus-1-glib-devel flac-devel flex gcc-c++ gnome-vfs2-devel gperf gtk2-devel icu java-devel libexif libxml2-devel mono-devel neon-devel orbit2-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}
@ -170,7 +170,7 @@ BuildRequires: gst-plugins-base-devel sablot-devel xalan-j2 xerces-j2 xml-commo
%endif
License: Artistic ; BSD3c ; GPLv2+ ; LPPL .. ; LGPLv2.1+ ; LGPLv3 ; MPL .. ; MIT
Group: Productivity/Office/Suite
Version: 3.4.2.5
Version: 3.4.2.6
Release: 1
AutoReqProv: on
Requires: libreoffice-icon-themes = %version
@ -440,6 +440,8 @@ Source105: SUSE-11.4.conf
Source200: %name-rpmlintrc
# Prebuilt sofficerc for the noarch upstream branding package
Source201: sofficerc-upstream
# This background is used by another Novell product, added 2006-02-08
Source202: Draft.jpg
# helper scripts
# create compat symlinks from /usr/share to /usr/lib(64); used by noarch packages
Source300: link-to-ooo-home
@ -550,13 +552,8 @@ Patch10: system-python-ure-bootstrap.diff
# do not use the broken help; unopkg complained about it when registering extensions
# FIXME: the right fix is to compile the help and produce the .db_, .ht_, and other files
Patch11: nlpsolver-no-broken-help.diff
# register Flat XML in the MIME database (bnc#711977)
Patch12: sysui-add-flat-openxml-to-mime-list.diff
# revert problematic import of embedded color tables in Impress; broke .odf export; need more love (bnc#715931)
Patch13: revert-allow-impress-import-of-embedded-color-tables-impress.diff
Patch14: revert-allow-impress-import-of-embedded-color-tables-libs-core.diff
Patch15: revert-allow-impress-import-of-embedded-color-tables-libs-gui-1.diff
Patch16: revert-allow-impress-import-of-embedded-color-tables-libs-gui-2.diff
# make sure that the extra jar files are bundled with the script provider extensions
Patch12: scripting-provider-build-dep.diff
#
# PostgreSQL SDBC driver
Patch801: 801-sdbc-postgresql.diff
@ -583,10 +580,13 @@ Patch834: 834-mozilla-no-xul-scp2.diff
Patch900: officecfg-defaul-export-ms-file-formats.diff
# fix build with gcc-4.6 on openSUSE-12.0; hack my Caolan McNamara, see http://permalink.gmane.org/gmane.comp.documentfoundation.libreoffice.devel/10987
Patch910: vbahelper-sc-gcc-4.6-link-fix.diff
# crazy hack to avoid /usr/lib64 in RPATH and pass brp-rpath check (bnc#717262)
Patch920: redland-rpath-hack.diff
#
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 x86_64 ppc
%description
LibreOffice is a comprehensive office package featuring a word
processor, a spreadsheet, a presentation program, and much more. This
@ -642,6 +642,7 @@ Obsoletes: OpenOffice_org-base-devel < %version
Provides: libreoffice-base-devel = %version
Obsoletes: libreoffice-base-devel < %version
%description base
This module allows you to manage databases, create queries and reports
to track and manage your information by using LibreOffice office
@ -666,6 +667,7 @@ Obsoletes: OpenOffice_org-calc-devel < %version
Provides: libreoffice-calc-devel = %version
Obsoletes: libreoffice-calc-devel < %version
%description calc
This module allows you to perform calculation, analyze information and
manage lists in spreadsheets by using LibreOffice office suite.
@ -684,6 +686,7 @@ Supplements: %name
Provides: OpenOffice_org-draw = %version
Obsoletes: OpenOffice_org-draw < %version
%description draw
This module allows you to create and edit drawings, flow charts, and
logos by using LibreOffice office suite.
@ -702,6 +705,7 @@ Supplements: %name
Provides: OpenOffice_org-math = %version
Obsoletes: OpenOffice_org-math < %version
%description math
This module allows you to create and edit scientific formulas and
equations by using LibreOffice office suite.
@ -725,6 +729,7 @@ Obsoletes: OpenOffice_org-impress-devel < %version
Provides: libreoffice-impress-devel = %version
Obsoletes: libreoffice-impress-devel < %version
%description impress
This module allows you to create and edit presentations for slideshows,
meeting and Web pages by using LibreOffice office suite.
@ -748,6 +753,7 @@ Obsoletes: OpenOffice_org-writer-devel < %version
Provides: libreoffice-writer-devel = %version
Obsoletes: libreoffice-writer-devel < %version
%description writer
This module allows you to create and edit text and graphics in letters,
reports, documents and Web pages by using LibreOffice office suite.
@ -763,6 +769,7 @@ Requires: postgresql
Provides: OpenOffice_org-base-drivers-postgresql = %version
Obsoletes: OpenOffice_org-base-drivers-postgresql < %version
%description base-drivers-postgresql
This package allows to access PostgreSQL databases from LibreOffice
Base.
@ -784,6 +791,7 @@ Supplements: %name
Provides: OpenOffice_org-filters-optional = %version
Obsoletes: OpenOffice_org-filters-optional < %version
%description filters-optional
This package includes some additional import and export filters for
LibreOffice:
@ -812,6 +820,7 @@ Supplements: %name
Provides: OpenOffice_org-mailmerge = %version
Obsoletes: OpenOffice_org-mailmerge < %version
%description mailmerge
This module allows you to create form letters or send E-mail messages
to many recipients using LibreOffice office suite.
@ -820,6 +829,7 @@ to many recipients using LibreOffice office suite.
%if 0%{?suse_version} <= 01130
%package mono
License: LGPLv3
Summary: Mono UNO Bridge for LibreOffice
@ -830,6 +840,7 @@ Requires: %name = %version
Provides: OpenOffice_org-mono = %version
Obsoletes: OpenOffice_org-mono < %version
%description mono
The Mono/UNO binding allows a Mono application to access the complete
set of APIs exposed by LibreOffice via UNO. A trivial example
@ -842,6 +853,7 @@ not supported.
%endif
%package pyuno
License: LGPLv3
Summary: Python UNO Bridge for LibreOffice
@ -854,6 +866,7 @@ Supplements: %name
Provides: OpenOffice_org-pyuno = %version
Obsoletes: OpenOffice_org-pyuno < %version
%description pyuno
The Python-UNO bridge allows to use the standard LibreOffice API
from the well known Python scripting language. It can be used to
@ -877,6 +890,7 @@ Requires: %name = %version
Provides: OpenOffice_org-testtool = %version
Obsoletes: OpenOffice_org-testtool < %version
%description testtool
A Tool needed for automatic testing of LibreOffice office suite.
@ -895,6 +909,7 @@ Obsoletes: OpenOffice_org2-gnome
Provides: OpenOffice_org-gnome = %version
Obsoletes: OpenOffice_org-gnome < %version
%description gnome
This package contains some GNOME extensions for LibreOffice.
@ -912,6 +927,7 @@ Obsoletes: OpenOffice_org2-kde
Provides: OpenOffice_org-kde = %version
Obsoletes: OpenOffice_org-kde < %version
%description kde
This package contains some KDE extensions for LibreOffice.
@ -925,11 +941,13 @@ Requires: %name = %version
Provides: OpenOffice_org-kde4 = %version
Obsoletes: OpenOffice_org-kde4 < %version
%description kde4
This package contains some KDE4 extensions for LibreOffice.
%if %lo_build_sdk == yes
%package sdk
License: LGPLv3
Summary: LibreOffice SDK
@ -945,6 +963,7 @@ Obsoletes: OpenOffice_org-ure-devel < %version
Provides: libreoffice-ure-devel = %version
Obsoletes: libreoffice-ure-devel < %version
%description sdk
This package contains the files needed to build plugins/add-ons for
LibreOffice. It includes header files, IDL files, needed build
@ -968,12 +987,14 @@ Obsoletes: OpenOffice_org-ure-devel-doc < %version
Provides: libreoffice-ure-devel-doc = %version
Obsoletes: libreoffice-ure-devel-doc < %version
%description sdk-doc
This package includes documentation and examples for the LibreOffice
Software Development Kit (SDK).
%endif
%package officebean
License: LGPLv3
Summary: OfficeBean Java Bean component for LibreOffice
@ -986,6 +1007,7 @@ Obsoletes: OpenOffice_org2-officebean < %version
Provides: OpenOffice_org-officebean = %version
Obsoletes: OpenOffice_org-officebean < %version
%description officebean
With the OfficeBean, a developer can easily write Java applications,
harnessing the power of LibreOffice. It encapsulates a connection to
@ -1020,6 +1042,7 @@ Recommends: libmysqlclient15
Provides: OpenOffice_org-base-extensions = %version
Obsoletes: OpenOffice_org-base-extensions < %version
%description base-extensions
This package provides extensions for LibreOffice Base:
@ -1032,6 +1055,7 @@ This package provides extensions for LibreOffice Base:
# put the mysql driver into separate package on newer distros
%if 0%{?suse_version} >= 01120
%package base-drivers-mysql
License: GPLv2 ; LGPLv3
Summary: MySQL Database Driver for LibreOffice
@ -1043,11 +1067,13 @@ Supplements: packageand(libreoffice-base:mysql-client)
Provides: OpenOffice_org-base-drivers-mysql = %version
Obsoletes: OpenOffice_org-base-drivers-mysql < %version
%description base-drivers-mysql
This package allows to access MySQL databases from LibreOffice
Base.
%endif
%package calc-extensions
License: LGPLv2.1+,LGPLv3
Summary: LibreOffice Calc Extensions
@ -1085,6 +1111,7 @@ Requires: jre >= 1.5
Provides: OpenOffice_org-calc-extensions = %version
Obsoletes: OpenOffice_org-calc-extensions < %version
%description calc-extensions
This package provides extensions for LibreOffice Calc:
@ -1104,6 +1131,7 @@ Requires: libreoffice-draw = %version
Provides: OpenOffice_org-draw-extensions = %version
Obsoletes: OpenOffice_org-draw-extensions < %version
%description draw-extensions
This package provides extensions for LibreOffice Draw:
@ -1121,6 +1149,7 @@ Requires: libreoffice-impress = %version
Provides: OpenOffice_org-impress-extensions = %version
Obsoletes: OpenOffice_org-impress-extensions < %version
%description impress-extensions
This package provides extensions for LibreOffice Impress:
@ -1165,6 +1194,7 @@ Requires: jre >= 1.5
Provides: OpenOffice_org-writer-extensions = %version
Obsoletes: OpenOffice_org-writer-extensions < %version
%description writer-extensions
This package provides extensions for LibreOffice Writer:
@ -1182,6 +1212,7 @@ AutoReqProv: off
Provides: OpenOffice_org-icon-themes-prebuilt = %version
Obsoletes: OpenOffice_org-icon-themes-prebuilt < %version
%description icon-themes-prebuilt
This package includes the prebuilt LibreOffice Icon Themes. It is
not intended for real use. It needs to be repacked to the real
@ -1257,6 +1288,7 @@ Obsoletes: OpenOffice_org-writer-l10n-prebuilt < %version
Provides: libreoffice-writer-l10n-prebuilt = %version
Obsoletes: libreoffice-writer-l10n-prebuilt < %version
%description l10n-prebuilt
This package includes the prebuilt localization of LibreOffice.
It is not intended for a real use. It needs to be repacked to the real
@ -1294,10 +1326,6 @@ cp $RPM_SOURCE_DIR/README* .
%patch10
%patch11
%patch12
%patch13
%patch14
%patch15
%patch16
# PostgreSQL SDBC driver
%patch801
%patch802
@ -1325,7 +1353,13 @@ cp $RPM_SOURCE_DIR/README* .
%patch910
%endif
#
%if %suse_version > 1140
# crazy hack to avoid /usr/lib64 in RPATH and pass brp-rpath check (bnc#717262)
%patch920
%endif
#
%endif
%build
%if %prepare_build != 0
@ -1384,7 +1418,7 @@ export PATH="$PATH:/usr/sbin"
--prefix=%{_prefix} \
--mandir=%{_mandir} \
--sysconfdir=/etc \
--with-docdir=%{_docdir}/%{name} \
--docdir=%{_docdir}/%{name} \
--with-distro="$with_distro" \
--without-git \
--without-download \
@ -1441,6 +1475,9 @@ export PATH="$PATH:/usr/sbin"
%if 0%{?suse_version} > 01030 || 0%{?meego_version}
--enable-pdfimport \
%endif
--enable-ext-scripting-beanshell \
--enable-ext-scripting-javascript \
--enable-ext-scripting-python \
--enable-minimizer --enable-presenter-console \
--enable-wiki-publisher --enable-ogltrans --enable-report-builder \
--enable-split-app-modules \
@ -1457,6 +1494,7 @@ sed -i -e "s|@INSTALLDIR@|%lo_prefix/%lo_home|" pyuno/source/module/uno.py
# 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
@ -1469,13 +1507,19 @@ make DESTDIR=$RPM_BUILD_ROOT distro-pack-install
################
# update desktop files
%if 0%{?suse_version}
cd $RPM_BUILD_ROOT/usr/share/applications
builddir=`pwd`
cd $RPM_BUILD_ROOT%_datadir/applications
for desktop in * ; do
# create relative link
# relative link is needed by %%suse_update_desktop_file
relative_target=`readlink $desktop | sed "s|%lo_prefix|../../%_lib|"`
ln -sf $relative_target $desktop
# FIXME: remove the libreoffice- prefix because the old desktop files are preferred in /etc/gnome_defaults.conf
desktop_new=`echo $desktop | sed -e "s/%lo_home-//"`
rm $desktop
sed -i -e "s|%_datadir/applications/$desktop|%_datadir/applications/$desktop_new|" $builddir/file-lists/*.txt
# finally, create the right link
ln -sf $relative_target $desktop_new
# suse_update
app=`echo $desktop | sed "s/.desktop//"`
app=`echo $desktop_new | sed "s/.desktop//"`
%suse_update_desktop_file $app
done
cd -
@ -1560,6 +1604,15 @@ for file in sofficerc \
touch $RPM_BUILD_ROOT/%_datadir/%lo_home/program/$file
done
################
# extra background picture into the gallery
export galdir="%lo_prefix/%lo_home/%lo_basis_dir/share/gallery"
install -m 644 "$RPM_SOURCE_DIR/Draft.jpg" "$RPM_BUILD_ROOT$galdir/www-back/"
echo "$galdir/www-back/Draft.jpg" >>file-lists/common_list.txt
# make sure that the existing galleries can be modified
chmod 644 $RPM_BUILD_ROOT$galdir/sg*.???
# LC_ALL=en_US.UTF-8 is necessary to make sure that the name "Backgrounds" is compared with the right localization
LC_ALL=en_US.UTF-8 $RPM_BUILD_ROOT%lo_prefix/%lo_home/program/gengal -headless --name "Backgrounds" --path "$RPM_BUILD_ROOT$galdir" --destdir "$RPM_BUILD_ROOT" "$RPM_BUILD_ROOT$galdir/www-back/Draft.jpg" || exit 1;
################
# 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%lo_prefix/%lo_home/%lo_basis_dir/share/autocorr/acor_fr-CA.dat
@ -1646,9 +1699,11 @@ for file in *.oxt ; do
done
cd - >/dev/null
%clean
rm -rf $RPM_BUILD_ROOT
%pre
# crazy hack for the ugly extensions
if test $1 -gt 1 ; then
@ -1663,6 +1718,7 @@ if test $1 -gt 1 ; then
fi
fi
%post
/sbin/ldconfig
/usr/bin/update-mime-database /usr/share/mime >/dev/null || true
@ -1674,11 +1730,14 @@ fi
SuSEconfig --module gtk2 || true
%endif
%preun
test "$1" = "0" && rm -rf ./%lo_prefix/%lo_home/share/uno_packages/cache || true
%postun
/sbin/ldconfig
%_prefix/sbin/unopkg-sync-bundled || true
/usr/bin/update-mime-database /usr/share/mime >/dev/null || true
# update GNOME icon caches
%if 0%{?suse_version} > 01130
@ -1697,9 +1756,10 @@ if test $1 = 0 ; then
fi
%endif
%ifarch %ix86
%posttrans
%_prefix/sbin/unopkg-sync-bundled || true
%ifarch %ix86
# the compat link was %%ghost in old OOo-ure packages, so it might be removed also during OOo-ure update (bnc#458952)
if test -f %lo_prefix/%lo_home/ure/bin/javaldx ; then
%lo_prefix/%lo_home/ure/bin/create-libstlport-compat-links || true;
@ -1708,12 +1768,15 @@ fi
%ifarch %ix86
%triggerin -- mysql-connector-java
%lo_prefix/%lo_home/basis-link/program/java-set-classpath /usr/share/java/mysql-connector-java.jar || true
%triggerpostun -- mysql-connector-java
%lo_prefix/%lo_home/basis-link/program/java-set-classpath /usr/share/java/mysql-connector-java.jar || true
%triggerin -- libstlport_gcc4
# create compat link needed to run upstream extensions (bnc#458952)
%lo_prefix/%lo_home/ure/bin/create-libstlport-compat-links || true;
@ -1721,6 +1784,7 @@ fi
%ifarch %ix86
%triggerpostun -- libstlport_gcc4-devel
# create compat link needed to run upstream extensions (bnc#458952)
%lo_prefix/%lo_home/ure/bin/create-libstlport-compat-links || true;
@ -1728,6 +1792,7 @@ fi
%ifarch %ix86
%triggerpostun -- libstlport_gcc4
# remove compat link needed to run upstream extensions (bnc#458952)
if test $2 = 0 ; then
@ -1766,6 +1831,7 @@ if test $1 = 2 ; then
fi
fi
%post base-drivers-postgresql
if test -f %lo_prefix/ooo3/share/extension/install/postgresql-sdbc-*.zip ; then
echo
@ -1777,14 +1843,17 @@ if test -f %lo_prefix/ooo3/share/extension/install/postgresql-sdbc-*.zip ; then
echo
fi
%posttrans base-drivers-postgresql
%_prefix/sbin/unopkg-sync-bundled || true
%postun base-drivers-postgresql
%_prefix/sbin/unopkg-sync-bundled || true
# base
%pre base-extensions
if test $1 -gt 1 ; then
# unregister all extensions that were registered by LibO <= 3.2.99.3
@ -1799,6 +1868,7 @@ if test $1 -gt 1 ; then
unopkg list --shared > /dev/null 2>&1 || true
fi
%post base-extensions
if test -f %ooo_prefix/ooo3/share/extension/install/report-builder.oxt ; then
echo
@ -1819,9 +1889,11 @@ if test -f %ooo_prefix/ooo3/share/extension/install/mysql-connector-ooo.oxt ; th
echo
fi
%posttrans base-extensions
%_prefix/sbin/unopkg-sync-bundled || true
%postun base-extensions
%_prefix/sbin/unopkg-sync-bundled || true
@ -1829,6 +1901,7 @@ fi
%if 0%{?suse_version} >= 01120
%pre base-drivers-mysql
if test $1 -gt 1 ; then
# unregister all extensions that were registered by LibO <= 3.2.99.3
@ -1839,6 +1912,7 @@ if test $1 -gt 1 ; then
unopkg list --shared > /dev/null 2>&1 || true
fi
%post base-drivers-mysql
if test -f %ooo_prefix/ooo3/share/extension/install/mysql-connector-ooo.oxt ; then
echo
@ -1850,9 +1924,11 @@ if test -f %ooo_prefix/ooo3/share/extension/install/mysql-connector-ooo.oxt ; th
echo
fi
%posttrans base-drivers-mysql
%_prefix/sbin/unopkg-sync-bundled || true
%postun base-drivers-mysql
%_prefix/sbin/unopkg-sync-bundled || true
@ -1860,6 +1936,7 @@ fi
# calc
%pre calc-extensions
if test $1 -gt 1 ; then
# unregister all extensions that were registered by LibO <= 3.2.99.3
@ -1883,6 +1960,7 @@ if test $1 -gt 1 ; then
unopkg list --shared > /dev/null 2>&1 || true
fi
%post calc-extensions
if test -f %ooo_prefix/ooo3/share/extension/install/ConvertTextToNumber-*.oxt ; then
echo
@ -1912,14 +1990,17 @@ if test -f %ooo_prefix/ooo3/share/extension/install/numbertext-*.oxt ; then
echo
fi
%posttrans calc-extensions
%_prefix/sbin/unopkg-sync-bundled || true
%postun calc-extensions
%_prefix/sbin/unopkg-sync-bundled || true
# draw
%pre draw-extensions
if test $1 -gt 1 ; then
# unregister all extensions that were registered by LibO <= 3.2.99.3
@ -1930,6 +2011,7 @@ if test $1 -gt 1 ; then
unopkg list --shared > /dev/null 2>&1 || true
fi
%post draw-extensions
if test -f %ooo_prefix/ooo3/share/extension/install/pdfimport.oxt ; then
echo
@ -1941,14 +2023,17 @@ if test -f %ooo_prefix/ooo3/share/extension/install/pdfimport.oxt ; then
echo
fi
%posttrans draw-extensions
%_prefix/sbin/unopkg-sync-bundled || true
%postun draw-extensions
%_prefix/sbin/unopkg-sync-bundled || true
# impress
%pre impress-extensions
if test $1 -gt 1 ; then
# unregister all extensions that were registered by LibO <= 3.2.99.3
@ -1962,6 +2047,7 @@ if test $1 -gt 1 ; then
unopkg list --shared > /dev/null 2>&1 || true
fi
%post impress-extensions
if test -f %ooo_prefix/ooo3/share/extension/install/presentation-minimizer.oxt ; then
echo
@ -1982,14 +2068,17 @@ if test -f %ooo_prefix/ooo3/share/extension/install/presenter-screen.oxt ; then
echo
fi
%posttrans impress-extensions
%_prefix/sbin/unopkg-sync-bundled || true
%postun impress-extensions
%_prefix/sbin/unopkg-sync-bundled || true
# writer
%pre writer-extensions
if test $1 -gt 1 ; then
# unregister all extensions that were registered by LibO <= 3.2.99.3
@ -2007,6 +2096,7 @@ if test $1 -gt 1 ; then
unopkg list --shared > /dev/null 2>&1 || true
fi
%post writer-extensions
if test -f %ooo_prefix/ooo3/share/extension/install/gdocs*.oxt ; then
echo
@ -2027,44 +2117,81 @@ if test -f %ooo_prefix/ooo3/share/extension/install/wiki-publisher.oxt ; then
echo
fi
%posttrans writer-extensions
%_prefix/sbin/unopkg-sync-bundled || true
%postun writer-extensions
%_prefix/sbin/unopkg-sync-bundled || true
# pyuno
%posttrans pyuno
%_prefix/sbin/unopkg-sync-bundled || true
%postun pyuno
%_prefix/sbin/unopkg-sync-bundled || true
# officebean
%posttrans officebean
%_prefix/sbin/unopkg-sync-bundled || true
%postun officebean
%_prefix/sbin/unopkg-sync-bundled || true
#######################
# file lists
%files -f file-lists/common_list.txt
%defattr(-,root,root)
# common extensions
%lo_prefix/%lo_home/share/extensions/script-provider-for-javascript
# ignore helper files for brp-symlink check
%exclude %_datadir/%lo_home/program/sofficerc
%exclude %_datadir/%lo_home/program/*.png
%exclude %_datadir/%lo_home/program/shell/*.png
%files -f file-lists/base_list.txt base
%defattr(-,root,root)
%files -f file-lists/calc_list.txt calc
%defattr(-,root,root)
%files -f file-lists/draw_list.txt draw
%defattr(-,root,root)
%files -f file-lists/math_list.txt math
%defattr(-,root,root)
%files -f file-lists/impress_list.txt impress
%defattr(-,root,root)
%files -f file-lists/writer_list.txt writer
%defattr(-,root,root)
%files base-drivers-postgresql
%defattr(-,root,root)
%lo_prefix/%lo_home/share/extensions/postgresql-sdbc-*
%files -f file-lists/filters_list.txt filters-optional
%defattr(-,root,root)
%files -f file-lists/mailmerge_list.txt mailmerge
%defattr(-,root,root)
@ -2074,33 +2201,44 @@ fi
%defattr(-,root,root)
%endif
%files -f file-lists/pyuno_list.txt pyuno
%defattr(-,root,root)
%lo_prefix/%lo_home/share/extensions/script-provider-for-python
%files -f file-lists/testtool_list.txt testtool
%defattr(-,root,root)
%files -f file-lists/gnome_list.txt gnome
%defattr(-,root,root)
%files -f file-lists/kde_list.txt kde
%defattr(-,root,root)
%files -f file-lists/kde4_list.txt kde4
%defattr(-,root,root)
%files -f file-lists/officebean_list.txt officebean
%defattr(-,root,root)
%lo_prefix/%lo_home/share/extensions/script-provider-for-beanshell
%if %lo_build_sdk == yes
%files -f file-lists/sdk_list.txt sdk
%defattr(-,root,root)
%files -f file-lists/sdk_doc_list.txt sdk-doc
%defattr(-,root,root)
%endif
%files base-extensions
%defattr(-,root,root)
%lo_prefix/%lo_home/share/extensions/report-builder
@ -2110,11 +2248,13 @@ fi
%if 0%{?suse_version} >= 01120
%files base-drivers-mysql
%defattr(-,root,root)
%lo_prefix/%lo_home/share/extensions/mysql-connector-ooo
%endif
%files calc-extensions
%defattr(-,root,root)
%doc README-scsolver.txt
@ -2122,24 +2262,31 @@ fi
%lo_prefix/%lo_home/share/extensions/NLPSolver
%lo_prefix/%lo_home/share/extensions/numbertext-%{numbertext_version}
%files draw-extensions
%defattr(-,root,root)
%lo_prefix/%lo_home/share/extensions/pdfimport
%files impress-extensions
%defattr(-,root,root)
%lo_prefix/%lo_home/share/extensions/presentation-minimizer
%lo_prefix/%lo_home/share/extensions/presenter-screen
%files writer-extensions
%defattr(-,root,root)
%lo_prefix/%lo_home/share/extensions/gdocs_%{gdocs_version}_modified
%lo_prefix/%lo_home/share/extensions/wiki-publisher
%files -f file-lists/icon_themes_prebuilt.txt icon-themes-prebuilt
%defattr(-,root,root)
%files -f file-lists/l10n-prebuilt.txt l10n-prebuilt
%defattr(-,root,root)
%changelog

11
redland-rpath-hack.diff Normal file
View File

@ -0,0 +1,11 @@
--- redland/raptor/makefile.mk.old 2011-05-20 18:06:05.000000000 +0200
+++ redland/raptor/makefile.mk 2011-09-12 16:23:05.000000000 +0200
@@ -132,7 +132,7 @@ CONFIGURE_DIR=
CONFIGURE_ACTION=.$/configure
# do not enable grddl parser (#i93768#)
CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml
-BUILD_ACTION=$(GNUMAKE)
+BUILD_ACTION=sed -i -e "s|\(sys_lib_dlsearch_path_spec=\"\)|\1/usr/lib64 |" libtool && $(GNUMAKE)
BUILD_FLAGS+= -j$(EXTMAXPROCESS)
BUILD_DIR=$(CONFIGURE_DIR)
.ENDIF

121
revert-allow-impress-import-of-embedded-color-tables-impress.diff
View File

@ -1,121 +0,0 @@
commit fc887c956cea89a48485104055f5feb313b6a50a
Author: Petr Mladek <pmladek@suse.cz>
Date: Mon Sep 5 12:11:38 2011 +0200
Revert "allow impress import of embedded color tables"
Broke .odp export and needed more love (bnc#715931)
This reverts commit 3e9f76415ae3f953d4585d67173b567abcba4e7d.
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx
index 2e3065d..4ffaba4 100644
--- sd/source/filter/xml/sdxmlwrp.cxx
+++ sd/source/filter/xml/sdxmlwrp.cxx
@@ -490,7 +490,7 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError )
// -------------------------------------
- /** property map for import info set */
+ /** property map for export info set */
PropertyMapEntry aImportInfoMap[] =
{
// necessary properties for XML progress bar at load time
@@ -514,8 +514,6 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError )
{ MAP_LEN( "BuildId" ), 0,
&::getCppuType( (OUString *)0 ),
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
- { MAP_LEN( "SourceStorage" ), 0, &embed::XStorage::static_type(),
- ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
{ NULL, 0, 0, NULL, 0, 0 }
};
@@ -593,9 +591,6 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError )
Reference<io::XInputStream> xInputStream;
uno::Reference < embed::XStorage > xStorage = mrMedium.GetStorage();
- OUString sSourceStorage( RTL_CONSTASCII_USTRINGPARAM("SourceStorage") );
- xInfoSet->setPropertyValue( sSourceStorage, Any( xStorage ) );
-
if( !xStorage.is() )
nRet = SD_XML_READERROR;
diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
index 6fbb6b2..7880bff 100644
--- sd/source/ui/unoidl/UnoDocumentSettings.cxx
+++ sd/source/ui/unoidl/UnoDocumentSettings.cxx
@@ -30,7 +30,6 @@
#include "precompiled_sd.hxx"
#include <vector>
-#include <com/sun/star/io/XStream.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/beans/XMultiPropertySet.hpp>
@@ -132,13 +131,10 @@ enum SdDocumentSettingsPropertyHandles
HANDLE_PRINTDRAWING, HANDLE_PRINTNOTES, HANDLE_PRINTHANDOUT, HANDLE_PRINTOUTLINE, HANDLE_MEASUREUNIT, HANDLE_SCALE_NUM,
HANDLE_SCALE_DOM, HANDLE_TABSTOP, HANDLE_PRINTPAGENAME, HANDLE_PRINTDATE, HANDLE_PRINTTIME,
HANDLE_PRINTHIDENPAGES, HANDLE_PRINTFITPAGE, HANDLE_PRINTTILEPAGE, HANDLE_PRINTBOOKLET, HANDLE_PRINTBOOKLETFRONT,
- HANDLE_PRINTBOOKLETBACK, HANDLE_PRINTQUALITY,
-
- HANDLE_COLORTABLE, // temporary partial patch addition ...
- HANDLE_COLORTABLEURL, HANDLE_DASHTABLEURL, HANDLE_LINEENDTABLEURL, HANDLE_HATCHTABLEURL, HANDLE_GRADIENTTABLEURL, HANDLE_BITMAPTABLEURL,
-
- HANDLE_FORBIDDENCHARS, HANDLE_APPLYUSERDATA, HANDLE_PAGENUMFMT, HANDLE_PRINTERNAME, HANDLE_PRINTERJOB, HANDLE_PARAGRAPHSUMMATION,
- HANDLE_CHARCOMPRESS, HANDLE_ASIANPUNCT, HANDLE_UPDATEFROMTEMPLATE, HANDLE_PRINTER_INDEPENDENT_LAYOUT
+ HANDLE_PRINTBOOKLETBACK, HANDLE_PRINTQUALITY, HANDLE_COLORTABLEURL, HANDLE_DASHTABLEURL, HANDLE_LINEENDTABLEURL, HANDLE_HATCHTABLEURL,
+ HANDLE_GRADIENTTABLEURL, HANDLE_BITMAPTABLEURL, HANDLE_FORBIDDENCHARS, HANDLE_APPLYUSERDATA, HANDLE_PAGENUMFMT,
+ HANDLE_PRINTERNAME, HANDLE_PRINTERJOB, HANDLE_PARAGRAPHSUMMATION, HANDLE_CHARCOMPRESS, HANDLE_ASIANPUNCT, HANDLE_UPDATEFROMTEMPLATE,
+ HANDLE_PRINTER_INDEPENDENT_LAYOUT
// #i33095#
,HANDLE_LOAD_READONLY, HANDLE_SAVE_VERSION
,HANDLE_SLIDESPERHANDOUT, HANDLE_HANDOUTHORIZONTAL
@@ -183,8 +179,6 @@ enum SdDocumentSettingsPropertyHandles
{ MAP_LEN("IsPrintBookletFront"), HANDLE_PRINTBOOKLETFRONT, &::getBooleanCppuType(), 0, MID_PRINTER },
{ MAP_LEN("IsPrintBookletBack"), HANDLE_PRINTBOOKLETBACK, &::getBooleanCppuType(), 0, MID_PRINTER },
{ MAP_LEN("PrintQuality"), HANDLE_PRINTQUALITY, &::getCppuType((const sal_Int32*)0), 0, MID_PRINTER },
- // stream equivalents of the below
- { MAP_LEN("ColorTable"), HANDLE_COLORTABLE, &::getCppuType((const Reference< io::XStream >*)0), 0, 0 },
{ MAP_LEN("ColorTableURL"), HANDLE_COLORTABLEURL, &::getCppuType((const OUString*)0), 0, 0 },
{ MAP_LEN("DashTableURL"), HANDLE_DASHTABLEURL, &::getCppuType((const OUString*)0), 0, 0 },
{ MAP_LEN("LineEndTableURL"), HANDLE_LINEENDTABLEURL, &::getCppuType((const OUString*)0), 0, 0 },
@@ -260,39 +254,6 @@ void DocumentSettings::_setPropertyValues( const PropertyMapEntry** ppEntries, c
switch( (*ppEntries)->mnHandle )
{
- case HANDLE_COLORTABLE:
- {
- NamedValue v;
- uno::Reference< embed::XStorage > xStorage;
- if( (bool)(*pValues >>= v) && (bool)(v.Value >>= xStorage) )
- {
- sal_Int32 nSlash = v.Name.lastIndexOf('/');
- rtl::OUString aPath, aName;
- if (nSlash < -1)
- aName = v.Name;
- else {
- aName = v.Name.copy( nSlash + 1 );
- aPath = v.Name.copy( 0, nSlash );
- }
-
- XColorTable* pColTab = new XColorTable( aPath, (XOutdevItemPool*)&pDoc->GetPool() );
- pColTab->SetName( aName );
-
- try {
- if( pColTab->LoadFrom( xStorage ) )
- {
- pDoc->SetColorTable( pColTab );
- bOk = sal_True;
- bChanged = sal_True;
- }
- } catch (uno::Exception &e) {
- // fprintf (stderr, "something failed in stream load '%s'\n",
- // rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr());
- }
- } else
- fprintf (stderr, "URGH!\n");
- break;
- }
case HANDLE_COLORTABLEURL:
{
OUString aURLString;

338
revert-allow-impress-import-of-embedded-color-tables-libs-core.diff
View File

@ -1,338 +0,0 @@
commit 841105bc9028e7a4701670d604cfd613e49aa1eb
Author: Petr Mladek <pmladek@suse.cz>
Date: Mon Sep 5 12:16:01 2011 +0200
Revert "allow impress import of embedded color tables"
Broke .odp export and needed more love (bnc#715931)
This reverts commit 615582ed01f31917548068efd3d4bba60e05924e.
diff --git a/svx/inc/svx/xtable.hxx b/svx/inc/svx/xtable.hxx
index 395515c..5a26bff 100644
--- svx/inc/svx/xtable.hxx
+++ svx/inc/svx/xtable.hxx
@@ -43,7 +43,6 @@
#include <tools/table.hxx>
#include "svx/svxdllapi.h"
-#include <com/sun/star/embed/XStorage.hpp>
#include <basegfx/polygon/b2dpolypolygon.hxx>
class Color;
@@ -294,6 +293,7 @@ public:
// ------------------
// class XColorTable
// ------------------
+
class SVX_DLLPUBLIC XColorTable : public XPropertyTable
{
public:
@@ -311,7 +311,6 @@ public:
XColorEntry* GetColor(long nIndex) const;
virtual sal_Bool Load();
- sal_Bool LoadFrom( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XStorage > &xStorage );
virtual sal_Bool Save();
virtual sal_Bool Create();
virtual sal_Bool CreateBitmapsForUI();
diff --git a/svx/source/inc/xmlxtimp.hxx b/svx/source/inc/xmlxtimp.hxx
index fd1f744..c10985f 100644
--- svx/source/inc/xmlxtimp.hxx
+++ svx/source/inc/xmlxtimp.hxx
@@ -52,9 +52,6 @@ public:
virtual ~SvxXMLXTableImport() throw ();
static sal_Bool load( const rtl::OUString& rUrl, const com::sun::star::uno::Reference< com::sun::star::container::XNameContainer >& xTable ) throw();
- static sal_Bool load( const rtl::OUString &rPath,
- const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XStorage > &xStorage,
- const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& xTable ) throw();
protected:
virtual SvXMLImportContext *CreateContext( sal_uInt16 nPrefix,
const ::rtl::OUString& rLocalName,
diff --git a/svx/source/xml/xmlxtimp.cxx b/svx/source/xml/xmlxtimp.cxx
index a05666b..88f4fe8 100644
--- svx/source/xml/xmlxtimp.cxx
+++ svx/source/xml/xmlxtimp.cxx
@@ -44,7 +44,6 @@
#include <com/sun/star/io/XOutputStream.hpp>
#include <com/sun/star/io/XSeekable.hdl>
#include <comphelper/processfactory.hxx>
-#include <comphelper/storagehelper.hxx>
#include <unotools/streamwrap.hxx>
#include <rtl/ustrbuf.hxx>
#include <sfx2/docfile.hxx>
@@ -362,106 +361,6 @@ SvxXMLXTableImport::~SvxXMLXTableImport() throw ()
{
}
-static void openStorageStream( xml::sax::InputSource *pParserInput,
- SvXMLGraphicHelper **ppGraphicHelper,
- uno::Reference < embed::XStorage > xStorage )
-{
- uno::Reference < io::XStream > xIStm;
- const String aContentStmName( RTL_CONSTASCII_USTRINGPARAM( "Content.xml" ) );
- xIStm.set( xStorage->openStreamElement( aContentStmName, embed::ElementModes::READ ), uno::UNO_QUERY_THROW );
- if( !xIStm.is() )
- {
- OSL_FAIL( "could not open Content stream" );
- return;
- }
- pParserInput->aInputStream = xIStm->getInputStream();
- *ppGraphicHelper = SvXMLGraphicHelper::Create( xStorage, GRAPHICHELPER_MODE_READ );
-}
-
-sal_Bool SvxXMLXTableImport::load( const rtl::OUString &rPath,
- const uno::Reference < embed::XStorage > &xStorage,
- const uno::Reference< XNameContainer >& xTable ) throw()
-{
- sal_Bool bRet = sal_True;
- SvXMLGraphicHelper* pGraphicHelper = 0;
-
- try
- {
- uno::Reference<lang::XMultiServiceFactory> xServiceFactory( ::comphelper::getProcessServiceFactory() );
- if( !xServiceFactory.is() )
- {
- OSL_FAIL( "SvxXMLXTableImport::load: got no service manager" );
- return sal_False;
- }
-
- uno::Reference< xml::sax::XParser > xParser( xServiceFactory->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.sax.Parser" ) ) ), uno::UNO_QUERY_THROW );
-
- xml::sax::InputSource aParserInput;
- comphelper::OStorageHelper::LifecycleProxy aNasty;
-
- if( !xStorage.is() )
- {
- SfxMedium aMedium( rPath, STREAM_READ | STREAM_NOCREATE, sal_True );
- aParserInput.sSystemId = aMedium.GetName();
-
- if( aMedium.IsStorage() )
- {
- uno::Reference < embed::XStorage > xMediumStorage( aMedium.GetStorage( sal_False ), uno::UNO_QUERY_THROW );
- openStorageStream( &aParserInput, &pGraphicHelper, xMediumStorage );
- }
- else
- aParserInput.aInputStream = aMedium.GetInputStream();
- }
- else // relative URL into a storage
- {
- uno::Reference< embed::XStorage > xSubStorage;
- try {
- xSubStorage = comphelper::OStorageHelper::GetStorageAtPath(
- xStorage, rPath, embed::ElementModes::READ, aNasty );
- } catch (uno::Exception &e) {
- }
- if( xSubStorage.is() )
- openStorageStream( &aParserInput, &pGraphicHelper, xSubStorage );
- else
- {
- ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > xStream;
- xStream = comphelper::OStorageHelper::GetStreamAtPath(
- xStorage, rPath, embed::ElementModes::READ, aNasty );
- if( !xStream.is() )
- return sal_False;
- aParserInput.aInputStream = xStream->getInputStream();
- }
- }
-
- uno::Reference< XGraphicObjectResolver > xGrfResolver;
- if (pGraphicHelper)
- xGrfResolver = pGraphicHelper;
-
- try {
- uno::Reference< io::XSeekable > xSeek( aParserInput.aInputStream, uno::UNO_QUERY_THROW );
- xSeek->seek( 0 );
- } catch( uno::Exception &) {}
-
- uno::Reference< XDocumentHandler > xHandler( new SvxXMLXTableImport( xServiceFactory, xTable, xGrfResolver ) );
- xParser->setDocumentHandler( xHandler );
- xParser->parseStream( aParserInput );
-
- if( pGraphicHelper )
- SvXMLGraphicHelper::Destroy( pGraphicHelper );
- }
- catch( uno::Exception& )
- {
-// thrown each time you load a document with property tables that are not
-// on the current machine. FIXME: would be better to check a file exists
-// before importing ...
-// fprintf (stderr, "parsing etc. exception '%s'\n",
-// rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr());
- bRet = sal_False;
- }
-
- return bRet;
-}
-
sal_Bool SvxXMLXTableImport::load( const OUString& rUrl, const uno::Reference< XNameContainer >& xTable ) throw()
{
sal_Bool bRet = sal_True;
diff --git a/svx/source/xoutdev/xtabcolr.cxx b/svx/source/xoutdev/xtabcolr.cxx
index bb32b72..4f3de11 100644
--- svx/source/xoutdev/xtabcolr.cxx
+++ svx/source/xoutdev/xtabcolr.cxx
@@ -139,21 +139,6 @@ sal_Bool XColorTable::Load()
return( sal_False );
}
-sal_Bool XColorTable::LoadFrom( const uno::Reference < embed::XStorage > &xStorage )
-{
- if( !bTableDirty )
- return sal_False;
-
- bTableDirty = sal_False;
-
- uno::Reference< container::XNameContainer > xTable( SvxUnoXColorTable_createInstance( this ), uno::UNO_QUERY );
- rtl::OUStringBuffer aURL( aPath );
- aURL.appendAscii( "/" );
- aURL.append( aName );
-
- return SvxXMLXTableImport::load( aURL.getStr(), xStorage, xTable );
-}
-
/************************************************************************/
sal_Bool XColorTable::Save()
diff --git a/xmloff/inc/xmloff/xmlimp.hxx b/xmloff/inc/xmloff/xmlimp.hxx
index 5407526..eb9a5f6 100644
--- xmloff/inc/xmloff/xmlimp.hxx
+++ xmloff/inc/xmloff/xmlimp.hxx
@@ -32,7 +32,6 @@
#include "sal/config.h"
#include "xmloff/dllapi.h"
#include "sal/types.h"
-#include <com/sun/star/embed/XStorage.hpp>
#include <com/sun/star/xml/sax/SAXParseException.hpp>
#include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp>
#include <com/sun/star/xml/sax/SAXException.hpp>
@@ -327,10 +326,6 @@ public:
GetStreamForEmbeddedObjectURLFromBase64();
::rtl::OUString ResolveEmbeddedObjectURLFromBase64();
- // get source storage we're importing from (if available)
- ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >
- GetSourceStorage();
-
void AddStyleDisplayName( sal_uInt16 nFamily,
const ::rtl::OUString& rName,
const ::rtl::OUString& rDisplayName );
diff --git a/xmloff/source/core/DocumentSettingsContext.cxx b/xmloff/source/core/DocumentSettingsContext.cxx
index 22adbe0..f0a9922 100644
--- xmloff/source/core/DocumentSettingsContext.cxx
+++ xmloff/source/core/DocumentSettingsContext.cxx
@@ -38,15 +38,12 @@
#include <xmloff/nmspmap.hxx>
#include <xmloff/xmluconv.hxx>
#include <tools/debug.hxx>
-#include <tools/urlobj.hxx>
#include <list>
#include <com/sun/star/i18n/XForbiddenCharacters.hpp>
#include <com/sun/star/container/XIndexContainer.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/formula/SymbolDescriptor.hpp>
-#include <com/sun/star/embed/ElementModes.hpp>
-#include <com/sun/star/beans/NamedValue.hpp>
#include <comphelper/processfactory.hxx>
#include <com/sun/star/util/DateTime.hpp>
#include <com/sun/star/document/XViewDataSupplier.hpp>
@@ -186,7 +183,7 @@ class XMLConfigItemContext : public SvXMLImportContext
rtl::OUString msValue;
uno::Sequence<sal_Int8> maDecoded;
com::sun::star::uno::Any& mrAny;
- rtl::OUString& mrItemName;
+ const rtl::OUString mrItemName;
XMLConfigBaseContext* mpBaseContext;
public:
@@ -194,7 +191,7 @@ public:
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList>& xAttrList,
com::sun::star::uno::Any& rAny,
- rtl::OUString& rItemName,
+ const rtl::OUString& rItemName,
XMLConfigBaseContext* pBaseContext);
virtual ~XMLConfigItemContext();
@@ -565,7 +562,7 @@ XMLConfigItemContext::XMLConfigItemContext(SvXMLImport& rImport, sal_uInt16 nPrf
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList>& xAttrList,
com::sun::star::uno::Any& rTempAny,
- rtl::OUString& rTempItemName,
+ const rtl::OUString& rTempItemName,
XMLConfigBaseContext* pTempBaseContext)
: SvXMLImportContext(rImport, nPrfx, rLName),
mrAny(rTempAny),
@@ -744,28 +741,14 @@ void XMLConfigItemContext::ManipulateConfigItem()
{
uno::Reference< util::XStringSubstitution > xStringSubsitution(
GetImport().getServiceFactory()->
- createInstance(::rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.PathSubstitution" ) ) ),
- uno::UNO_QUERY );
- rtl::OUString aURL;
- mrAny >>= aURL;
- if( xStringSubsitution.is() )
- aURL = xStringSubsitution->substituteVariables( aURL, sal_False );
- mrAny <<= aURL;
+ createInstance(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.PathSubstitution" ) ) ), uno::UNO_QUERY );
- INetURLObject aURLObj( aURL );
- if( GetImport().GetSourceStorage().is() &&
- aURLObj.GetProtocol() == INET_PROT_NOT_VALID ) // relative
+ if( xStringSubsitution.is() )
{
- beans::NamedValue v;
- v.Name = aURL;
- v.Value <<= GetImport().GetSourceStorage();
- mrAny <<= v;
-
- // rename property removing URL suffix
- rtl::OUStringBuffer aBuf( mrItemName );
- aBuf.setLength( aBuf.getLength() - 3 );
- mrItemName = aBuf.makeStringAndClear();
+ rtl::OUString aURL;
+ mrAny >>= aURL;
+ aURL = xStringSubsitution->substituteVariables( aURL, sal_False );
+ mrAny <<= aURL;
}
}
catch( uno::Exception& )
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index feff798..5c20e9e2f 100644
--- xmloff/source/core/xmlimp.cxx
+++ xmloff/source/core/xmlimp.cxx
@@ -193,8 +193,6 @@ public:
const uno::Reference< uno::XComponentContext > mxComponentContext;
- uno::Reference< embed::XStorage > mxSourceStorage;
-
std::auto_ptr< xmloff::RDFaImportHelper > mpRDFaHelper;
SvXMLImport_Impl() :
@@ -1003,10 +1001,6 @@ void SAL_CALL SvXMLImport::initialize( const uno::Sequence< uno::Any >& aArgumen
uno::Any aAny = mxImportInfo->getPropertyValue(sPropName);
aAny >>= (mpImpl->mbTextDocInOOoFileFormat);
}
-
- sPropName = OUString( RTL_CONSTASCII_USTRINGPARAM("SourceStorage" ) );
- if( xPropertySetInfo->hasPropertyByName(sPropName) )
- mxImportInfo->getPropertyValue(sPropName) >>= mpImpl->mxSourceStorage;
}
}
}
@@ -1329,11 +1323,6 @@ Reference< XOutputStream > SvXMLImport::GetStreamForGraphicObjectURLFromBase64()
return sRet;
}
-Reference< embed::XStorage > SvXMLImport::GetSourceStorage()
-{
- return mpImpl->mxSourceStorage;
-}
-
Reference < XOutputStream >
SvXMLImport::GetStreamForEmbeddedObjectURLFromBase64()
{

23
revert-allow-impress-import-of-embedded-color-tables-libs-gui-1.diff
View File

@ -1,23 +0,0 @@
commit a3bf43527f17cc8f37c97df127cdd6ce22c50e36
Author: Petr Mladek <pmladek@suse.cz>
Date: Mon Sep 5 12:17:27 2011 +0200
Revert "Nested classes need to be marked separately DLLPUBLIC, apparently"
Broke .odp export and needed more love (bnc#715931)
This reverts commit 3f8b88f96e10941fe2ef0f9d6267835a75d4faec.
diff --git a/comphelper/inc/comphelper/storagehelper.hxx b/comphelper/inc/comphelper/storagehelper.hxx
index 9381f9f..d9aa6c6 100644
--- comphelper/inc/comphelper/storagehelper.hxx
+++ comphelper/inc/comphelper/storagehelper.hxx
@@ -179,7 +179,7 @@ public:
// it is necessary to keep references to all storages down the
// path - this is 'beautiful' (TM). So we need this ugly hack:
class LifecycleProxyImpl;
- class COMPHELPER_DLLPUBLIC LifecycleProxy {
+ class LifecycleProxy {
public:
LifecycleProxyImpl *pBadness;
LifecycleProxy();

112
revert-allow-impress-import-of-embedded-color-tables-libs-gui-2.diff
View File

@ -1,112 +0,0 @@
commit d45dea82e9688229accf4b7975ffcaac3df2e2c4
Author: Petr Mladek <pmladek@suse.cz>
Date: Mon Sep 5 12:18:19 2011 +0200
Revert "add a helper class to do path resolution"
Broke .odp export and needed more love (bnc#715931)
This reverts commit 7e93c8c7e0d54a6f0d53ab43041e658f3a14e9a4.
diff --git a/comphelper/inc/comphelper/storagehelper.hxx b/comphelper/inc/comphelper/storagehelper.hxx
index d9aa6c6..2f83331 100644
--- comphelper/inc/comphelper/storagehelper.hxx
+++ comphelper/inc/comphelper/storagehelper.hxx
@@ -171,26 +171,6 @@ public:
static sal_Bool IsValidZipEntryFileName( const sal_Unicode *pChar, sal_Int32 nLength, sal_Bool bSlashAllowed );
static sal_Bool PathHasSegment( const ::rtl::OUString& aPath, const ::rtl::OUString& aSegment );
-
- // Methods to allow easy use of hierachical names inside storages
-
- // Unfortunately - the impl.s of XStorage like to invalidate all
- // their sub streams and storages when you release references, so
- // it is necessary to keep references to all storages down the
- // path - this is 'beautiful' (TM). So we need this ugly hack:
- class LifecycleProxyImpl;
- class LifecycleProxy {
- public:
- LifecycleProxyImpl *pBadness;
- LifecycleProxy();
- ~LifecycleProxy();
- };
- static ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > GetStorageAtPath(
- const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > &xStorage,
- const ::rtl::OUString& aPath, sal_uInt32 nOpenMode, LifecycleProxy &rNastiness );
- static ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > GetStreamAtPath(
- const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > &xStorage,
- const ::rtl::OUString& aPath, sal_uInt32 nOpenMode, LifecycleProxy &rNastiness );
};
}
diff --git a/comphelper/source/misc/storagehelper.cxx b/comphelper/source/misc/storagehelper.cxx
index 2491418..f703cd3 100644
--- comphelper/source/misc/storagehelper.cxx
+++ comphelper/source/misc/storagehelper.cxx
@@ -36,7 +36,6 @@
#include <com/sun/star/beans/NamedValue.hpp>
#include <com/sun/star/beans/IllegalTypeException.hpp>
-#include <vector>
#include <rtl/digest.h>
#include <ucbhelper/content.hxx>
@@ -527,58 +526,6 @@ sal_Bool OStorageHelper::PathHasSegment( const ::rtl::OUString& aPath, const ::r
return bResult;
}
-class OStorageHelper::LifecycleProxyImpl : public std::vector< uno::Reference< embed::XStorage > > {};
-OStorageHelper::LifecycleProxy::LifecycleProxy() :
- pBadness( new OStorageHelper::LifecycleProxyImpl() ) { }
-OStorageHelper::LifecycleProxy::~LifecycleProxy() { delete pBadness; }
-
-static void splitPath( std::vector<rtl::OUString> &rElems,
- const ::rtl::OUString& rPath )
-{
- for (sal_Int32 i = 0; i >= 0;)
- rElems.push_back( rPath.getToken( 0, '/', i ) );
-}
-
-static uno::Reference< embed::XStorage > LookupStorageAtPath(
- const uno::Reference< embed::XStorage > &xParentStorage,
- std::vector<rtl::OUString> &rElems, sal_uInt32 nOpenMode,
- OStorageHelper::LifecycleProxy &rNastiness )
-{
- uno::Reference< embed::XStorage > xStorage( xParentStorage );
- rNastiness.pBadness->push_back( xStorage );
- for( size_t i = 0; i < rElems.size() && xStorage.is(); i++ )
- {
- xStorage = xStorage->openStorageElement( rElems[i], nOpenMode );
- rNastiness.pBadness->push_back( xStorage );
- }
- return xStorage;
-}
-
-uno::Reference< embed::XStorage > OStorageHelper::GetStorageAtPath(
- const uno::Reference< embed::XStorage > &xStorage,
- const ::rtl::OUString& rPath, sal_uInt32 nOpenMode,
- OStorageHelper::LifecycleProxy &rNastiness )
-{
- std::vector<rtl::OUString> aElems;
- splitPath( aElems, rPath );
- return LookupStorageAtPath( xStorage, aElems, nOpenMode, rNastiness );
-}
-
-uno::Reference< io::XStream > OStorageHelper::GetStreamAtPath(
- const uno::Reference< embed::XStorage > &xParentStorage,
- const ::rtl::OUString& rPath, sal_uInt32 nOpenMode,
- OStorageHelper::LifecycleProxy &rNastiness )
-{
- std::vector<rtl::OUString> aElems;
- splitPath( aElems, rPath );
- rtl::OUString aName( aElems.back() );
- aElems.pop_back();
- uno::Reference< embed::XStorage > xStorage(
- LookupStorageAtPath( xParentStorage, aElems, nOpenMode, rNastiness ),
- uno::UNO_QUERY_THROW );
- return xStorage->openStreamElement( aName, nOpenMode );
-}
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

22
scripting-provider-build-dep.diff Normal file
View File

@ -0,0 +1,22 @@
--- scripting/util/provider/javascript/makefile.mk.old 2011-05-19 12:27:42.000000000 +0200
+++ scripting/util/provider/javascript/makefile.mk 2011-09-14 18:50:45.000000000 +0200
@@ -36,7 +36,7 @@ EXTENSIONNAME:=ScriptProviderForJavaScri
EXTENSION_ZIPNAME:=script-provider-for-javascript
COMPONENT_JARFILES=$(EXTENSIONDIR)$/$(EXTENSIONNAME).jar
-EXTENSION_PACKDEPS=$(SOLARBINDIR)$/js.jar
+EXTENSION_PACKDEPS=$(EXTENSIONDIR)$/js.jar
.IF "$(ENABLE_SCRIPTING_JAVASCRIPT)" != "YES"
@all:
--- scripting/util/provider/beanshell/makefile.mk.old 2011-05-24 14:21:08.000000000 +0200
+++ scripting/util/provider/beanshell/makefile.mk 2011-09-14 18:50:04.000000000 +0200
@@ -37,7 +37,7 @@ EXTENSION_ZIPNAME:=script-provider-for-b
COMPONENT_JARFILES=$(EXTENSIONDIR)$/$(EXTENSIONNAME).jar
.IF "$(SYSTEM_BSH)" != "YES"
-EXTENSION_PACKDEPS=$(SOLARBINDIR)$/bsh.jar
+EXTENSION_PACKDEPS=$(EXTENSIONDIR)$/bsh.jar
.ENDIF
.IF "$(ENABLE_SCRIPTING_BEANSHELL)" != "YES"

40
sysui-add-flat-openxml-to-mime-list.diff
View File

@ -1,40 +0,0 @@
--- sysui/desktop/share/documents.ulf.old 2011-08-15 20:34:57.000000000 +0200
+++ sysui/desktop/share/documents.ulf 2011-09-02 14:46:11.000000000 +0200
@@ -31,6 +31,9 @@ en-US = "%PRODUCTNAME Spreadsheet Templa
[oasis-text]
en-US = "OpenDocument Text"
+[oasis-text-flat-xml]
+en-US = "OpenDocument Text (Flat XML)"
+
[oasis-text-template]
en-US = "OpenDocument Text Template"
@@ -43,18 +46,27 @@ en-US = "OpenDocument Formula"
[oasis-presentation]
en-US = "OpenDocument Presentation"
+[oasis-presentation-flat-xml]
+en-US = "OpenDocument Presentation (Flat XML)"
+
[oasis-presentation-template]
en-US = "OpenDocument Presentation Template"
[oasis-drawing]
en-US = "OpenDocument Drawing"
+[oasis-drawing-flat-xml]
+en-US = "OpenDocument Drawing (Flat XML)"
+
[oasis-drawing-template]
en-US = "OpenDocument Drawing Template"
[oasis-spreadsheet]
en-US = "OpenDocument Spreadsheet"
+[oasis-spreadsheet-flat-xml]
+en-US = "OpenDocument Spreadsheet (Flat XML)"
+
[oasis-spreadsheet-template]
en-US = "OpenDocument Spreadsheet Template"