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

Accepting request 142610 from LibreOffice:Unstable

Browse Source 
- update to 3.6.3.2.3 (SUSE 3.6-rc3, tag suse-3.6-3, based on upstream 3.6.3.2)

OBS-URL: https://build.opensuse.org/request/show/142610
OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=17
This commit is contained in:
Petr Mladek 2012-11-23 16:08:34 +00:00 committed by Git OBS Bridge
parent 8bba43e8d5
commit f8edee92b3
35 changed files with 197 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
build-i18npool-with-icu-4.0.diff
View File

@ -1,13 +0,0 @@
--- i18npool/source/ordinalsuffix/ordinalsuffix.cxx.old 2012-10-12 12:39:47.000000000 +0200
+++ i18npool/source/ordinalsuffix/ordinalsuffix.cxx 2012-10-15 14:59:19.000000000 +0200
@@ -97,7 +97,9 @@ uno::Sequence< OUString > SAL_CALL Ordin
return retValue;
icu::UnicodeString sFormatWithNoOrdinal;
- xNumberFormat->format((int32_t)nNumber, sFormatWithNoOrdinal, NULL, nCode);
+ icu::Formattable ftmNumber((int32_t)nNumber);
+ icu::FieldPosition icuPos;
+ xNumberFormat->format(ftmNumber, sFormatWithNoOrdinal, icuPos, nCode);
if (!U_SUCCESS(nCode))
return retValue;

15
install-with-hardlinks.diff Normal file
View File

@ -0,0 +1,15 @@
--- solenv/bin/modules/installer/worker.pm.old 2012-11-07 15:41:56.000000000 +0100
+++ solenv/bin/modules/installer/worker.pm 2012-11-15 17:46:20.000000000 +0100
@@ -519,7 +519,11 @@ sub install_simple ($$$$$$)
unlink "$destdir$destination";
}
- copy ("$sourcepath", "$destdir$destination") || die "Can't copy file: $sourcepath -> $destdir$destination $!";
+ my $copied = 0;
+ # try to save space by hardlinking files; symlinks can't be hardlinked ;-)
+ $copied = link ("$sourcepath", "$destdir$destination") if (! -l $sourcepath);
+ $copied = copy ("$sourcepath", "$destdir$destination") if (! $copied);
+ die "Can't copy file: $sourcepath -> $destdir$destination $!" if (! $copied);
my $sourcestat = stat($sourcepath);
utime ($sourcestat->atime, $sourcestat->mtime, "$destdir$destination");
chmod (oct($unixrights), "$destdir$destination") || die "Can't change permissions: $!";

3
libreoffice-binfilter-3.6.3.2.2.tar.bz2
View File

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

3
libreoffice-binfilter-3.6.3.2.3.tar.bz2 Normal file
View File

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

5
libreoffice-branding-upstream.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Nov 23 15:43:06 UTC 2012 - pmladek@suse.com
- update to 3.6.3.2.3 (SUSE 3.6-rc3, tag suse-3.6-3, based on upstream 3.6.3.2)
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Nov 7 15:30:31 UTC 2012 - pmladek@suse.com Wed Nov 7 15:30:31 UTC 2012 - pmladek@suse.com

2
libreoffice-branding-upstream.spec
View File

@ -17,7 +17,7 @@
Name: libreoffice-branding-upstream Name: libreoffice-branding-upstream
Version: 3.6.3.2.2 Version: 3.6.3.2.3
Release: 0 Release: 0
%define lo_home libreoffice %define lo_home libreoffice
Summary: Original Branding for LibreOffice Summary: Original Branding for LibreOffice

3
libreoffice-core-3.6.3.2.2.tar.bz2
View File

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

3
libreoffice-core-3.6.3.2.3.tar.bz2 Normal file
View File

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

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

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

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

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

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

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Nov 23 15:43:06 UTC 2012 - pmladek@suse.com
- update to 3.6.3.2.3 (SUSE 3.6-rc3, tag suse-3.6-3, based on upstream 3.6.3.2)
- bin obsolete build-i18npool-with-icu-4.0.diff
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Nov 7 15:30:31 UTC 2012 - pmladek@suse.com Wed Nov 7 15:30:31 UTC 2012 - pmladek@suse.com

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

@ -22,7 +22,7 @@ Name: libreoffice-help-en-US
## Generated by: ## Generated by:
## perl lo-help-gen-spec libreoffice-help-en-US.spec.in lo-help-en-US ## perl lo-help-gen-spec libreoffice-help-en-US.spec.in lo-help-en-US
################################################################### ###################################################################
Version: 3.6.3.2.2 Version: 3.6.3.2.3
Release: 0 Release: 0
%define gnu_make_version 3.82 %define gnu_make_version 3.82
%define gnu_make_snapshot 20120301 %define gnu_make_snapshot 20120301
@ -124,8 +124,6 @@ Source201: lo-help-gen-spec
Source202: lo-help-en-US Source202: lo-help-en-US
# cups is not needed for helpcontent build # cups is not needed for helpcontent build
Patch0: build-helpcontent-do-not-check-cups.diff Patch0: build-helpcontent-do-not-check-cups.diff
# use function provided already by icu-4.0
Patch1: build-i18npool-with-icu-4.0.diff
# #
# Patches against zip-3.0 # Patches against zip-3.0
Patch2000: zip-3.0-iso8859_2.patch Patch2000: zip-3.0-iso8859_2.patch
@ -149,7 +147,6 @@ stuff is in LibreOffice-l10n-en-US.
%else %else
%setup -q -a30 -a31 -n libreoffice-core-%version %setup -q -a30 -a31 -n libreoffice-core-%version
%patch0 %patch0
%patch1
bin/unpack-sources `pwd` %{S:1} %{S:2} bin/unpack-sources `pwd` %{S:1} %{S:2}
# extra fixes # extra fixes
# #
@ -336,4 +333,5 @@ 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 %files -f file-lists/help_en_US_list.txt -n libreoffice-help-en-US
%defattr(-,root,root) %defattr(-,root,root)
%changelog %changelog

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

@ -18,7 +18,7 @@
Name: libreoffice-help-en-US Name: libreoffice-help-en-US
@DO_NOT_EDIT_COMMENT@ @DO_NOT_EDIT_COMMENT@
Version: 3.6.3.2.2 Version: 3.6.3.2.3
Release: 0 Release: 0
%define gnu_make_version 3.82 %define gnu_make_version 3.82
%define gnu_make_snapshot 20120301 %define gnu_make_snapshot 20120301
@ -120,8 +120,6 @@ Source201: lo-help-gen-spec
Source202: lo-help-en-US Source202: lo-help-en-US
# cups is not needed for helpcontent build # cups is not needed for helpcontent build
Patch0: build-helpcontent-do-not-check-cups.diff Patch0: build-helpcontent-do-not-check-cups.diff
# use function provided already by icu-4.0
Patch1: build-i18npool-with-icu-4.0.diff
# #
# Patches against zip-3.0 # Patches against zip-3.0
Patch2000: zip-3.0-iso8859_2.patch Patch2000: zip-3.0-iso8859_2.patch
@ -145,7 +143,6 @@ stuff is in LibreOffice-l10n-en-US.
%else %else
%setup -q -a30 -a31 -n libreoffice-core-%version %setup -q -a30 -a31 -n libreoffice-core-%version
%patch0 %patch0
%patch1
bin/unpack-sources `pwd` %{S:1} %{S:2} bin/unpack-sources `pwd` %{S:1} %{S:2}
# extra fixes # extra fixes
# #

6
libreoffice-help-group1.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Nov 23 15:43:06 UTC 2012 - pmladek@suse.com
- update to 3.6.3.2.3 (SUSE 3.6-rc3, tag suse-3.6-3, based on upstream 3.6.3.2)
- bin obsolete build-i18npool-with-icu-4.0.diff
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Nov 7 15:30:31 UTC 2012 - pmladek@suse.com Wed Nov 7 15:30:31 UTC 2012 - pmladek@suse.com

5
libreoffice-help-group1.spec
View File

@ -22,7 +22,7 @@ Name: libreoffice-help-group1
## Generated by: ## Generated by:
## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX ## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX
################################################################### ###################################################################
Version: 3.6.3.2.2 Version: 3.6.3.2.3
Release: 0 Release: 0
%define gnu_make_version 3.82 %define gnu_make_version 3.82
%define gnu_make_snapshot 20120301 %define gnu_make_snapshot 20120301
@ -106,8 +106,6 @@ Source201: lo-help-gen-spec
Source202: lo-help-groupX Source202: lo-help-groupX
# cups is not needed for helpcontent build # cups is not needed for helpcontent build
Patch0: build-helpcontent-do-not-check-cups.diff Patch0: build-helpcontent-do-not-check-cups.diff
# use function provided already by icu-4.0
Patch1: build-i18npool-with-icu-4.0.diff
# #
# Patches against zip-3.0 # Patches against zip-3.0
Patch2000: zip-3.0-iso8859_2.patch Patch2000: zip-3.0-iso8859_2.patch
@ -334,7 +332,6 @@ is in libreoffice-l10n-en-GB.
%else %else
%setup -q -a30 -a31 -n libreoffice-core-%version %setup -q -a30 -a31 -n libreoffice-core-%version
%patch0 %patch0
%patch1
bin/unpack-sources `pwd` %{S:1} %{S:2} bin/unpack-sources `pwd` %{S:1} %{S:2}
# #
# patch zip-3.0 # patch zip-3.0

6
libreoffice-help-group2.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Nov 23 15:43:06 UTC 2012 - pmladek@suse.com
- update to 3.6.3.2.3 (SUSE 3.6-rc3, tag suse-3.6-3, based on upstream 3.6.3.2)
- bin obsolete build-i18npool-with-icu-4.0.diff
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Nov 7 15:30:31 UTC 2012 - pmladek@suse.com Wed Nov 7 15:30:31 UTC 2012 - pmladek@suse.com

5
libreoffice-help-group2.spec
View File

@ -22,7 +22,7 @@ Name: libreoffice-help-group2
## Generated by: ## Generated by:
## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX ## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX
################################################################### ###################################################################
Version: 3.6.3.2.2 Version: 3.6.3.2.3
Release: 0 Release: 0
%define gnu_make_version 3.82 %define gnu_make_version 3.82
%define gnu_make_snapshot 20120301 %define gnu_make_snapshot 20120301
@ -106,8 +106,6 @@ Source201: lo-help-gen-spec
Source202: lo-help-groupX Source202: lo-help-groupX
# cups is not needed for helpcontent build # cups is not needed for helpcontent build
Patch0: build-helpcontent-do-not-check-cups.diff Patch0: build-helpcontent-do-not-check-cups.diff
# use function provided already by icu-4.0
Patch1: build-i18npool-with-icu-4.0.diff
# #
# Patches against zip-3.0 # Patches against zip-3.0
Patch2000: zip-3.0-iso8859_2.patch Patch2000: zip-3.0-iso8859_2.patch
@ -322,7 +320,6 @@ is in libreoffice-l10n-fr.
%else %else
%setup -q -a30 -a31 -n libreoffice-core-%version %setup -q -a30 -a31 -n libreoffice-core-%version
%patch0 %patch0
%patch1
bin/unpack-sources `pwd` %{S:1} %{S:2} bin/unpack-sources `pwd` %{S:1} %{S:2}
# #
# patch zip-3.0 # patch zip-3.0

6
libreoffice-help-group3.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Nov 23 15:43:06 UTC 2012 - pmladek@suse.com
- update to 3.6.3.2.3 (SUSE 3.6-rc3, tag suse-3.6-3, based on upstream 3.6.3.2)
- bin obsolete build-i18npool-with-icu-4.0.diff
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Nov 7 15:30:31 UTC 2012 - pmladek@suse.com Wed Nov 7 15:30:31 UTC 2012 - pmladek@suse.com

5
libreoffice-help-group3.spec
View File

@ -22,7 +22,7 @@ Name: libreoffice-help-group3
## Generated by: ## Generated by:
## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX ## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX
################################################################### ###################################################################
Version: 3.6.3.2.2 Version: 3.6.3.2.3
Release: 0 Release: 0
%define gnu_make_version 3.82 %define gnu_make_version 3.82
%define gnu_make_snapshot 20120301 %define gnu_make_snapshot 20120301
@ -106,8 +106,6 @@ Source201: lo-help-gen-spec
Source202: lo-help-groupX Source202: lo-help-groupX
# cups is not needed for helpcontent build # cups is not needed for helpcontent build
Patch0: build-helpcontent-do-not-check-cups.diff Patch0: build-helpcontent-do-not-check-cups.diff
# use function provided already by icu-4.0
Patch1: build-i18npool-with-icu-4.0.diff
# #
# Patches against zip-3.0 # Patches against zip-3.0
Patch2000: zip-3.0-iso8859_2.patch Patch2000: zip-3.0-iso8859_2.patch
@ -334,7 +332,6 @@ is in libreoffice-l10n-km.
%else %else
%setup -q -a30 -a31 -n libreoffice-core-%version %setup -q -a30 -a31 -n libreoffice-core-%version
%patch0 %patch0
%patch1
bin/unpack-sources `pwd` %{S:1} %{S:2} bin/unpack-sources `pwd` %{S:1} %{S:2}
# #
# patch zip-3.0 # patch zip-3.0

6
libreoffice-help-group4.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Nov 23 15:43:06 UTC 2012 - pmladek@suse.com
- update to 3.6.3.2.3 (SUSE 3.6-rc3, tag suse-3.6-3, based on upstream 3.6.3.2)
- bin obsolete build-i18npool-with-icu-4.0.diff
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Nov 7 15:30:31 UTC 2012 - pmladek@suse.com Wed Nov 7 15:30:31 UTC 2012 - pmladek@suse.com

5
libreoffice-help-group4.spec
View File

@ -22,7 +22,7 @@ Name: libreoffice-help-group4
## Generated by: ## Generated by:
## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX ## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX
################################################################### ###################################################################
Version: 3.6.3.2.2 Version: 3.6.3.2.3
Release: 0 Release: 0
%define gnu_make_version 3.82 %define gnu_make_version 3.82
%define gnu_make_snapshot 20120301 %define gnu_make_snapshot 20120301
@ -106,8 +106,6 @@ Source201: lo-help-gen-spec
Source202: lo-help-groupX Source202: lo-help-groupX
# cups is not needed for helpcontent build # cups is not needed for helpcontent build
Patch0: build-helpcontent-do-not-check-cups.diff Patch0: build-helpcontent-do-not-check-cups.diff
# use function provided already by icu-4.0
Patch1: build-i18npool-with-icu-4.0.diff
# #
# Patches against zip-3.0 # Patches against zip-3.0
Patch2000: zip-3.0-iso8859_2.patch Patch2000: zip-3.0-iso8859_2.patch
@ -322,7 +320,6 @@ is in libreoffice-l10n-pt-BR.
%else %else
%setup -q -a30 -a31 -n libreoffice-core-%version %setup -q -a30 -a31 -n libreoffice-core-%version
%patch0 %patch0
%patch1
bin/unpack-sources `pwd` %{S:1} %{S:2} bin/unpack-sources `pwd` %{S:1} %{S:2}
# #
# patch zip-3.0 # patch zip-3.0

6
libreoffice-help-group5.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Nov 23 15:43:06 UTC 2012 - pmladek@suse.com
- update to 3.6.3.2.3 (SUSE 3.6-rc3, tag suse-3.6-3, based on upstream 3.6.3.2)
- bin obsolete build-i18npool-with-icu-4.0.diff
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Nov 7 15:30:31 UTC 2012 - pmladek@suse.com Wed Nov 7 15:30:31 UTC 2012 - pmladek@suse.com

5
libreoffice-help-group5.spec
View File

@ -22,7 +22,7 @@ Name: libreoffice-help-group5
## Generated by: ## Generated by:
## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX ## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX
################################################################### ###################################################################
Version: 3.6.3.2.2 Version: 3.6.3.2.3
Release: 0 Release: 0
%define gnu_make_version 3.82 %define gnu_make_version 3.82
%define gnu_make_snapshot 20120301 %define gnu_make_snapshot 20120301
@ -106,8 +106,6 @@ Source201: lo-help-gen-spec
Source202: lo-help-groupX Source202: lo-help-groupX
# cups is not needed for helpcontent build # cups is not needed for helpcontent build
Patch0: build-helpcontent-do-not-check-cups.diff Patch0: build-helpcontent-do-not-check-cups.diff
# use function provided already by icu-4.0
Patch1: build-i18npool-with-icu-4.0.diff
# #
# Patches against zip-3.0 # Patches against zip-3.0
Patch2000: zip-3.0-iso8859_2.patch Patch2000: zip-3.0-iso8859_2.patch
@ -349,7 +347,6 @@ is in libreoffice-l10n-zh-TW.
%else %else
%setup -q -a30 -a31 -n libreoffice-core-%version %setup -q -a30 -a31 -n libreoffice-core-%version
%patch0 %patch0
%patch1
bin/unpack-sources `pwd` %{S:1} %{S:2} bin/unpack-sources `pwd` %{S:1} %{S:2}
# #
# patch zip-3.0 # patch zip-3.0

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

@ -18,7 +18,7 @@
Name: libreoffice-help-group@GROUP_NUMBER@ Name: libreoffice-help-group@GROUP_NUMBER@
@DO_NOT_EDIT_COMMENT@ @DO_NOT_EDIT_COMMENT@
Version: 3.6.3.2.2 Version: 3.6.3.2.3
Release: 0 Release: 0
%define gnu_make_version 3.82 %define gnu_make_version 3.82
%define gnu_make_snapshot 20120301 %define gnu_make_snapshot 20120301
@ -102,8 +102,6 @@ Source201: lo-help-gen-spec
Source202: lo-help-groupX Source202: lo-help-groupX
# cups is not needed for helpcontent build # cups is not needed for helpcontent build
Patch0: build-helpcontent-do-not-check-cups.diff Patch0: build-helpcontent-do-not-check-cups.diff
# use function provided already by icu-4.0
Patch1: build-i18npool-with-icu-4.0.diff
# #
# Patches against zip-3.0 # Patches against zip-3.0
Patch2000: zip-3.0-iso8859_2.patch Patch2000: zip-3.0-iso8859_2.patch
@ -127,7 +125,6 @@ development.
%else %else
%setup -q -a30 -a31 -n libreoffice-core-%version %setup -q -a30 -a31 -n libreoffice-core-%version
%patch0 %patch0
%patch1
bin/unpack-sources `pwd` %{S:1} %{S:2} bin/unpack-sources `pwd` %{S:1} %{S:2}
# #
# patch zip-3.0 # patch zip-3.0

5
libreoffice-icon-themes.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Nov 23 15:43:06 UTC 2012 - pmladek@suse.com
- update to 3.6.3.2.3 (SUSE 3.6-rc3, tag suse-3.6-3, based on upstream 3.6.3.2)
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Nov 7 15:30:31 UTC 2012 - pmladek@suse.com Wed Nov 7 15:30:31 UTC 2012 - pmladek@suse.com

2
libreoffice-icon-themes.spec
View File

@ -17,7 +17,7 @@
Name: libreoffice-icon-themes Name: libreoffice-icon-themes
Version: 3.6.3.2.2 Version: 3.6.3.2.3
Release: 0 Release: 0
%define ooo_home libreoffice %define ooo_home libreoffice
BuildRequires: libreoffice-icon-themes-prebuilt = %version BuildRequires: libreoffice-icon-themes-prebuilt = %version

5
libreoffice-l10n.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Nov 23 15:43:06 UTC 2012 - pmladek@suse.com
- update to 3.6.3.2.3 (SUSE 3.6-rc3, tag suse-3.6-3, based on upstream 3.6.3.2)
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Nov 7 15:30:31 UTC 2012 - pmladek@suse.com Wed Nov 7 15:30:31 UTC 2012 - pmladek@suse.com

6
libreoffice-l10n.spec
View File

@ -22,7 +22,7 @@
## perl lo-l10n-gen-spec libreoffice-l10n.spec.in lo-l10n-data ## perl lo-l10n-gen-spec libreoffice-l10n.spec.in lo-l10n-data
################################################################### ###################################################################
Name: libreoffice-l10n Name: libreoffice-l10n
Version: 3.6.3.2.2 Version: 3.6.3.2.3
Release: 0 Release: 0
%define piece l10n %define piece l10n
%define ooo_home libreoffice %define ooo_home libreoffice
@ -1664,8 +1664,8 @@ PreReq: grep
PreReq: libreoffice >= 3.5 PreReq: libreoffice >= 3.5
%endif %endif
Requires: libreoffice = %{version} Requires: libreoffice = %{version}
Provides: OpenOffice_org-sh-YU = %version
Provides: OpenOffice_org-sh-YU:%_prefix/ooo-2.0/program/resource/sw680sh-YU.res Provides: OpenOffice_org-sh-YU:%_prefix/ooo-2.0/program/resource/sw680sh-YU.res
Provides: OpenOffice_org-sh-YU = %version
Obsoletes: OpenOffice_org-sh-YU < %version Obsoletes: OpenOffice_org-sh-YU < %version
# compat stuff # compat stuff
Provides: OpenOffice_org-sh = %{version} Provides: OpenOffice_org-sh = %{version}
@ -1752,8 +1752,8 @@ PreReq: libreoffice >= 3.5
%endif %endif
Requires: libreoffice = %{version} Requires: libreoffice = %{version}
Requires: scalable-font-ru Requires: scalable-font-ru
Provides: OpenOffice_org-sr-CS = %version
Provides: OpenOffice_org-sr-CS:%_prefix/ooo-2.0/program/resource/sw680sr-CS.res Provides: OpenOffice_org-sr-CS:%_prefix/ooo-2.0/program/resource/sw680sr-CS.res
Provides: OpenOffice_org-sr-CS = %version
Obsoletes: OpenOffice_org-sr-CS < %version Obsoletes: OpenOffice_org-sr-CS < %version
# compat stuff # compat stuff
Provides: OpenOffice_org-sr = %{version} Provides: OpenOffice_org-sr = %{version}

2
libreoffice-l10n.spec.in
View File

@ -18,7 +18,7 @@
@DO_NOT_EDIT_COMMENT@ @DO_NOT_EDIT_COMMENT@
Name: libreoffice-l10n Name: libreoffice-l10n
Version: 3.6.3.2.2 Version: 3.6.3.2.3
Release: 0 Release: 0
%define piece l10n %define piece l10n
%define ooo_home libreoffice %define ooo_home libreoffice

15
libreoffice-poppler-0.17.0-reject-fix.diff
View File

@ -23,19 +23,24 @@ Index: sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
=================================================================== ===================================================================
--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.orig --- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.orig
+++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -46,11 +46,7 @@ @@ -46,16 +46,7 @@
#pragma warning(push, 1) #pragma warning(push, 1)
#endif #endif
-#if POPPLER_CHECK_VERSION(0, 21, 0) -// sigh, UTF8.h was removed in poppler-0.21.0 and put back in 0.21.1
-// FIXME: we can't use #if POPPLER_CHECK_VERSION(0, 21, 0) && !POPPLER_CHECK_VERSION(0, 21, 1)
-// because the internal poppler does not provide poppler-version.h and the macro always returns 0
-#if POPPLER_CHECK_VERSION(0, 21, 1)
#include "UTF8.h"
-#elif POPPLER_CHECK_VERSION(0, 21, 0)
-#include "UTF.h" -#include "UTF.h"
-#else -#else
#include "UTF8.h" -#include "UTF8.h"
-#endif -#endif
#if defined __SUNPRO_CC #if defined __SUNPRO_CC
#pragma enable_warn #pragma enable_warn
@@ -158,11 +154,7 @@ void writeBinaryBuffer( const OutputBuff @@ -163,11 +154,7 @@ void writeBinaryBuffer( const OutputBuff
void writeJpeg_( OutputBuffer& o_rOutputBuf, Stream* str, bool bWithLinefeed ) void writeJpeg_( OutputBuffer& o_rOutputBuf, Stream* str, bool bWithLinefeed )
{ {
// dump JPEG file as-is // dump JPEG file as-is
@ -47,7 +52,7 @@ Index: sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
str->reset(); str->reset();
int c; int c;
@@ -501,13 +493,7 @@ void PDFOutDev::endPage() @@ -506,13 +493,7 @@ void PDFOutDev::endPage()
printf("endPage\n"); printf("endPage\n");
} }

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

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

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

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

41
libreoffice.changes
View File

@ -1,3 +1,44 @@
-------------------------------------------------------------------
Fri Nov 23 15:43:06 UTC 2012 - pmladek@suse.com
- update to 3.6.3.2.3 (SUSE 3.6-rc3, tag suse-3.6-3, based on upstream 3.6.3.2)
* hyperlink DOCX export (bnc#789482)
* delete also note caption (fdo#56584)
* numbers as text conversion (fdo#55875)
* special pages in DOC import (fdo#53909)
* column width in DOCX Import (bnc#780645)
* test equality by order index (fdo#54898)
* shrunken text in DOCX import (bnc#773061)
* better input field selection (bnc#780277)
* accept fraction input if preset (fdo#55369)
* fraction formats with hard denom (fdo#56205)
* broken bold text in presentation (fdo#47432)
* non-math/chart OLE in DOCX export (fdo#51550)
* embedded spreadsheets in PPTX export (bnc#780830)
* remove conditional formats without range (fdo#56983)
* rotated text in emf images looks thicker (bnc#782833)
* nicer toolbars even for XP, not only Vista and higher
* only set entries for existing sort entries (fdo#56958)
* squashed glyphs with Cairo canvas (fdo#55931, bnc#681110)
* change in formula options should cause repaint (fdo#56776)
* make sure that the sort vector is large enough (fdo#56958)
* update default Hebrew font to Lucida Sans Unicode (fdo#55034)
* broadcast deletion to dependent formula cells (fdo#53364, i#101869,
fdo#54074, fdo#56278, fdo#55059, i#99844)
- bin obsolete orbit2-devel from BuildRequires
- bin obsolete build-i18npool-with-icu-4.0.diff
- sdext-poppler-0.21.1.diff: fix build with poppler-0.21.1
-------------------------------------------------------------------
Thu Nov 15 17:20:52 UTC 2012 - pmladek@suse.com
- build with debug symbols fails in OBS when creating RPMs because
there is not enough space in the virtual machines; try to save
some space in the %%install phase:
* install-with-hardlinks.diff: use hardlinks in BuildRoot
* remove the huge translation sources
* use these hacks only when %save_space == 1
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Nov 7 15:30:31 UTC 2012 - pmladek@suse.com Wed Nov 7 15:30:31 UTC 2012 - pmladek@suse.com

27
libreoffice.spec
View File

@ -42,7 +42,6 @@ BuildRequires: libxml2-devel
BuildRequires: lpsolve-devel BuildRequires: lpsolve-devel
BuildRequires: mono-devel BuildRequires: mono-devel
BuildRequires: neon-devel BuildRequires: neon-devel
BuildRequires: orbit2-devel
BuildRequires: pam-devel BuildRequires: pam-devel
BuildRequires: patch BuildRequires: patch
BuildRequires: perl-Archive-Zip BuildRequires: perl-Archive-Zip
@ -175,6 +174,9 @@ BuildRequires: gst-plugins-base-devel
# 1 = yes (the number is defined be the number of cpus) # 1 = yes (the number is defined be the number of cpus)
# 2,3,4... = yes (force the number of modules to be built in parallel) # 2,3,4... = yes (force the number of modules to be built in parallel)
%define build_module_in_parallel 1 %define build_module_in_parallel 1
# save_space: 0 = no
# 1 = yes (do some hacks to safe space in the installation phase)
%define save_space 1
# debug_build: 0 = no # debug_build: 0 = no
# 1 = yes (enable depency tracking, ccache) # 1 = yes (enable depency tracking, ccache)
%define debug_build 0 %define debug_build 0
@ -221,7 +223,7 @@ BuildRequires: gst-plugins-base-devel
# the manifest file must be in the right place; registration does not work with some repacked jars # the manifest file must be in the right place; registration does not work with some repacked jars
%define __jar_repack %{nil} %define __jar_repack %{nil}
%endif %endif
Version: 3.6.3.2.2 Version: 3.6.3.2.3
Release: 0 Release: 0
Requires: libreoffice-branding < 4 Requires: libreoffice-branding < 4
Requires: libreoffice-branding > 3.2.99.3 Requires: libreoffice-branding > 3.2.99.3
@ -621,12 +623,12 @@ Patch13: jvmfwk-disable-gcj.diff
# generate selected bytecode version also in gbuild # generate selected bytecode version also in gbuild
# FIXME: push upstream and be ready to fix problem on other systems # FIXME: push upstream and be ready to fix problem on other systems
Patch14: solenv-java-source-version.diff Patch14: solenv-java-source-version.diff
# use function provided already by icu-4.0
# pushed upstream for lo-4.0
Patch15: build-i18npool-with-icu-4.0.diff
# fix build with poppler-0.21.0 # fix build with poppler-0.21.0
# pushed upstream for LO-4.0 # pushed upstream for LO-4.0
Patch16: sdext-poppler-0.21.0.diff Patch15: sdext-poppler-0.21.0.diff
# fix build with poppler-0.21.1
# pushed upstream for LO-4.0
Patch16: sdext-poppler-0.21.1.diff
# correcly pack KDE and TDE addressbook (bnc#779697) # correcly pack KDE and TDE addressbook (bnc#779697)
Patch17: pack-addressbook.diff Patch17: pack-addressbook.diff
# add pyuno to python path # add pyuno to python path
@ -642,6 +644,8 @@ Patch910: libreoffice-poppler-0.17.0-reject-fix.diff
Patch920: redland-rpath-hack.diff Patch920: redland-rpath-hack.diff
# FIXME: temporary disable failing xpdf test on Factory # FIXME: temporary disable failing xpdf test on Factory
Patch930: sdext-disable-failing-xpdf-test.diff Patch930: sdext-disable-failing-xpdf-test.diff
# try to save space by using hardlinks
Patch990: install-with-hardlinks.diff
# #
# Patches against zip-3.0 # Patches against zip-3.0
Patch2000: zip-3.0-iso8859_2.patch Patch2000: zip-3.0-iso8859_2.patch
@ -1340,7 +1344,7 @@ the LibreOffice localizations separately.
%patch13 -p1 %patch13 -p1
%patch14 %patch14
%patch15 %patch15
%patch16 %patch16 -p1
%patch17 %patch17
%patch18 %patch18
# #
@ -1363,6 +1367,10 @@ the LibreOffice localizations separately.
# temporary disable failing xpdf test # temporary disable failing xpdf test
%patch930 %patch930
%endif %endif
%if %save_space == 1
# use hardlinks when installing files
%patch990
%endif
# other sources # other sources
bin/unpack-sources `pwd` %{S:1} %{S:2} %{S:3} bin/unpack-sources `pwd` %{S:1} %{S:2} %{S:3}
# 256x256 icons # 256x256 icons
@ -1791,6 +1799,11 @@ fi
mkdir -p $RPM_BUILD_ROOT%python_sitelib mkdir -p $RPM_BUILD_ROOT%python_sitelib
ln -s %_libdir/libreoffice/program/uno.py $RPM_BUILD_ROOT%python_sitelib/uno.py ln -s %_libdir/libreoffice/program/uno.py $RPM_BUILD_ROOT%python_sitelib/uno.py
ln -s %_libdir/libreoffice/program/unohelper.py $RPM_BUILD_ROOT%python_sitelib/unohelper.py ln -s %_libdir/libreoffice/program/unohelper.py $RPM_BUILD_ROOT%python_sitelib/unohelper.py
################
# try to save some more space before creating rpms
%if %save_space == 1
rm -rf translations/source
%endif
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT

33
sdext-poppler-0.21.1.diff Normal file
View File

@ -0,0 +1,33 @@
From 445d88ee22bb5bfbe2c42b5618734b9661defd3d Mon Sep 17 00:00:00 2001
From: Petr Mladek <pmladek@suse.cz>
Date: Wed, 21 Nov 2012 17:37:26 +0100
Subject: [PATCH] fix build with poppler-0.21.1
heh, they put back UTF8.h
Change-Id: Id915b1a1e41440a4b53058779355e99e3592e5fa
---
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index 7adc487..765d0be 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -34,7 +34,12 @@
#pragma warning(push, 1)
#endif
-#if POPPLER_CHECK_VERSION(0, 21, 0)
+// sigh, UTF8.h was removed in poppler-0.21.0 and put back in 0.21.1
+// FIXME: we can't use #if POPPLER_CHECK_VERSION(0, 21, 0) && !POPPLER_CHECK_VERSION(0, 21, 1)
+// because the internal poppler does not provide poppler-version.h and the macro always returns 0
+#if POPPLER_CHECK_VERSION(0, 21, 1)
+#include "UTF8.h"
+#elif POPPLER_CHECK_VERSION(0, 21, 0)
#include "UTF.h"
#else
#include "UTF8.h"
--
1.7.12.3