[libreoffice/f15/master] latest version
Caolan McNamara
caolanm at fedoraproject.org
Tue Mar 22 15:54:00 UTC 2011
commit a1751a5e03e2e19b428d469573f74a6fe8553ef6
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Mar 22 15:53:49 2011 +0000
latest version
.gitignore | 40 ++++++------
...olves-fdo-33701-ensure-node-outlives-path.patch | 65 --------------------
...n-t-leave-an-evil-thread-running-after-ma.patch | 28 ---------
libreoffice.spec | 65 ++++++++++----------
sources | 40 ++++++------
5 files changed, 73 insertions(+), 165 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0dff217..48a474f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,23 +8,23 @@
/cf8a6967f7de535ae257fa411c98eb88-mdds_0.3.0.tar.bz2
/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
/redhat-langpacks.tar.gz
-/libreoffice-artwork-3.3.1.2.tar.bz2
-/libreoffice-base-3.3.1.2.tar.bz2
-/libreoffice-bootstrap-3.3.1.2.tar.bz2
-/libreoffice-calc-3.3.1.2.tar.bz2
-/libreoffice-components-3.3.1.2.tar.bz2
-/libreoffice-extensions-3.3.1.2.tar.bz2
-/libreoffice-extras-3.3.1.2.tar.bz2
-/libreoffice-filters-3.3.1.2.tar.bz2
-/libreoffice-help-3.3.1.2.tar.bz2
-/libreoffice-impress-3.3.1.2.tar.bz2
-/libreoffice-l10n-3.3.1.2.tar.bz2
-/libreoffice-libs-core-3.3.1.2.tar.bz2
-/libreoffice-libs-extern-3.3.1.2.tar.bz2
-/libreoffice-libs-extern-sys-3.3.1.2.tar.bz2
-/libreoffice-libs-gui-3.3.1.2.tar.bz2
-/libreoffice-postprocess-3.3.1.2.tar.bz2
-/libreoffice-sdk-3.3.1.2.tar.bz2
-/libreoffice-testing-3.3.1.2.tar.bz2
-/libreoffice-ure-3.3.1.2.tar.bz2
-/libreoffice-writer-3.3.1.2.tar.bz2
+/libreoffice-artwork-3.3.2.2.tar.bz2
+/libreoffice-base-3.3.2.2.tar.bz2
+/libreoffice-bootstrap-3.3.2.2.tar.bz2
+/libreoffice-calc-3.3.2.2.tar.bz2
+/libreoffice-components-3.3.2.2.tar.bz2
+/libreoffice-extensions-3.3.2.2.tar.bz2
+/libreoffice-extras-3.3.2.2.tar.bz2
+/libreoffice-filters-3.3.2.2.tar.bz2
+/libreoffice-help-3.3.2.2.tar.bz2
+/libreoffice-impress-3.3.2.2.tar.bz2
+/libreoffice-l10n-3.3.2.2.tar.bz2
+/libreoffice-libs-core-3.3.2.2.tar.bz2
+/libreoffice-libs-extern-3.3.2.2.tar.bz2
+/libreoffice-libs-extern-sys-3.3.2.2.tar.bz2
+/libreoffice-libs-gui-3.3.2.2.tar.bz2
+/libreoffice-postprocess-3.3.2.2.tar.bz2
+/libreoffice-sdk-3.3.2.2.tar.bz2
+/libreoffice-testing-3.3.2.2.tar.bz2
+/libreoffice-ure-3.3.2.2.tar.bz2
+/libreoffice-writer-3.3.2.2.tar.bz2
diff --git a/libreoffice.spec b/libreoffice.spec
index 557ab98..3207cf0 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -28,8 +28,8 @@
Summary: Free Software Productivity Suite
Name: libreoffice
Epoch: 1
-Version: 3.3.1.2
-Release: 12%{?dist}
+Version: 3.3.2.2
+Release: 1%{?dist}
License: LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and (CDDL or GPLv2) and Public Domain
Group: Applications/Productivity
URL: http://www.documentfoundation.org/develop
@@ -116,21 +116,19 @@ Patch27: 0001-rhbz-649310-don-t-crash-deregistering-diff.-platform.patch
Patch28: 0001-Resolves-rhbz-674330-dereference-of-NULL-mpBase.patch
Patch29: 0001-rhbz-678284-Get-correct-current-position-when-shift-page-up-and-.patch
Patch30: 0001-Resolves-rhbz-681159-bandaid-for-crash.patch
-Patch31: 0001-Resolves-fdo-33701-ensure-node-outlives-path.patch
-Patch32: 0001-Resolves-rhbz-672818-bandaid-for-crash-in-SwTxtNode-.patch
-Patch33: 0001-valgrind-don-t-leave-an-evil-thread-running-after-ma.patch
-Patch34: 0001-install-high-resolution-icons.patch
-Patch35: 0001-Resolves-rhbz-682716-pa-IN-isn-t-handled-by-fontconf.patch
-Patch36: 0001-Resolves-rhbz-682621-better-resizing-of-overtall-gly.patch
-Patch37: 0001-Related-rhbz-684477-make-sure-this-is-thread-safe.patch
-Patch38: 0001-Resolves-rhbz-684620-crash-with-NULL-pTableBox.patch
-Patch39: libreoffice-fdo33947.sd.print.crash.patch
-Patch40: 0001-add-cairo_ft_font_face_create_for_pattern-wrapper.patch
-Patch41: 0001-Related-rhbz-680460-reorganize-this-to-make-it-inher.patch
-Patch42: 0001-Related-rhbz-680460-don-t-bother-with-an-interim-Fon.patch
-Patch43: 0001-Resolves-rhbz-680460-honour-lcdfilter-subpixeling-et.patch
-Patch44: 0001-Cut-Gordian-Knot-of-who-owns-the-font-options.patch
-Patch45: 0001-beware-of-invalidated-iterator.patch
+Patch31: 0001-Resolves-rhbz-672818-bandaid-for-crash-in-SwTxtNode-.patch
+Patch32: 0001-install-high-resolution-icons.patch
+Patch33: 0001-Resolves-rhbz-682716-pa-IN-isn-t-handled-by-fontconf.patch
+Patch34: 0001-Resolves-rhbz-682621-better-resizing-of-overtall-gly.patch
+Patch35: 0001-Related-rhbz-684477-make-sure-this-is-thread-safe.patch
+Patch36: 0001-Resolves-rhbz-684620-crash-with-NULL-pTableBox.patch
+Patch37: libreoffice-fdo33947.sd.print.crash.patch
+Patch38: 0001-add-cairo_ft_font_face_create_for_pattern-wrapper.patch
+Patch39: 0001-Related-rhbz-680460-reorganize-this-to-make-it-inher.patch
+Patch40: 0001-Related-rhbz-680460-don-t-bother-with-an-interim-Fon.patch
+Patch41: 0001-Resolves-rhbz-680460-honour-lcdfilter-subpixeling-et.patch
+Patch42: 0001-Cut-Gordian-Knot-of-who-owns-the-font-options.patch
+Patch43: 0001-beware-of-invalidated-iterator.patch
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%define instdir %{_libdir}
@@ -764,21 +762,19 @@ mv -f redhat.soc extras/source/palettes/standard.soc
%patch28 -p1 -b .rhbz674330-dereference-of-NULL-mpBase.patch
%patch29 -p1 -b .rhbz678284-Get-correct-current-position-when-shift-page-up-and-.patch
%patch30 -p1 -b .rhbz681159-bandaid-for-crash.patch
-%patch31 -p1 -b .fdo33701-ensure-node-outlives-path.patch
-%patch32 -p1 -b .rhbz672818-bandaid-for-crash-in-SwTxtNode-.patch
-%patch33 -p1 -b .valgrind-don-t-leave-an-evil-thread-running-after-ma.patch
-%patch34 -p1 -b .install-high-resolution-icons.patch
-%patch35 -p1 -b .rhbz682716-pa-IN-isn-t-handled-by-fontconf.patch
-%patch36 -p1 -b .rhbz682621-better-resizing-of-overtall-gly.patch
-%patch37 -p1 -b .rhbz684477-make-sure-this-is-thread-safe.patch
-%patch38 -p1 -b .rhbz684620-crash-with-NULL-pTableBox.patch
-%patch39 -p1 -b .fdo33947.sd.print.crash.patch
-%patch40 -p1 -b .add-cairo_ft_font_face_create_for_pattern-wrapper.patch
-%patch41 -p1 -b .rhbz680460-reorganize-this-to-make-it-inher.patch
-%patch42 -p1 -b .rhbz680460-don-t-bother-with-an-interim-Fon.patch
-%patch43 -p1 -b .rhbz680460-honour-lcdfilter-subpixeling-et.patch
-%patch44 -p1 -b .Cut-Gordian-Knot-of-who-owns-the-font-options.patch
-%patch45 -p1 -b .beware-of-invalidated-iterator.patch
+%patch31 -p1 -b .rhbz672818-bandaid-for-crash-in-SwTxtNode-.patch
+%patch32 -p1 -b .install-high-resolution-icons.patch
+%patch33 -p1 -b .rhbz682716-pa-IN-isn-t-handled-by-fontconf.patch
+%patch34 -p1 -b .rhbz682621-better-resizing-of-overtall-gly.patch
+%patch35 -p1 -b .rhbz684477-make-sure-this-is-thread-safe.patch
+%patch36 -p1 -b .rhbz684620-crash-with-NULL-pTableBox.patch
+%patch37 -p1 -b .fdo33947.sd.print.crash.patch
+%patch38 -p1 -b .add-cairo_ft_font_face_create_for_pattern-wrapper.patch
+%patch39 -p1 -b .rhbz680460-reorganize-this-to-make-it-inher.patch
+%patch40 -p1 -b .rhbz680460-don-t-bother-with-an-interim-Fon.patch
+%patch41 -p1 -b .rhbz680460-honour-lcdfilter-subpixeling-et.patch
+%patch42 -p1 -b .Cut-Gordian-Knot-of-who-owns-the-font-options.patch
+%patch43 -p1 -b .beware-of-invalidated-iterator.patch
touch scripting/source/pyprov/delzip
touch scripting/util/provider/beanshell/delzip
@@ -2125,6 +2121,11 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%{basisinstdir}/program/kde-open-url
%changelog
+* Tue Mar 22 2011 Caolán McNamara <caolanm at redhat.com> 3.3.2.2-1
+- latest version
+- drop integrated 0001-Resolves-fdo-33701-ensure-node-outlives-path.patch
+- drop integrated 0001-valgrind-don-t-leave-an-evil-thread-running-after-ma.patch
+
* Tue Mar 22 2011 Caolán McNamara <caolanm at redhat.com> 3.3.1.2-12
- Fix fontoptions cache
- avoid crash in calc on changing size of rows (dtardon)
diff --git a/sources b/sources
index 5b41016..40577c5 100644
--- a/sources
+++ b/sources
@@ -8,23 +8,23 @@ fdb27bfe2dbe2e7b57ae194d9bf36bab fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3
cf8a6967f7de535ae257fa411c98eb88 cf8a6967f7de535ae257fa411c98eb88-mdds_0.3.0.tar.bz2
17410483b5b5f267aa18b7e00b65e6e0 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
35c9d670889318e26aad389ed750012f redhat-langpacks.tar.gz
-2e5df28d87481132f1144814891d1c8c libreoffice-artwork-3.3.1.2.tar.bz2
-7cb38a57cde864113f39791434750575 libreoffice-base-3.3.1.2.tar.bz2
-f6c5dde281f3e5bf8c1751ef33dc9f6e libreoffice-bootstrap-3.3.1.2.tar.bz2
-24a04a8c174b9eceadcb458518bc7059 libreoffice-calc-3.3.1.2.tar.bz2
-a0894d4bc695fe66f1ef9ba9487cc2ca libreoffice-components-3.3.1.2.tar.bz2
-4ede652e150cb142a2cf1f79cdbf29df libreoffice-extensions-3.3.1.2.tar.bz2
-18af2a33fdf17eca51b1a71ba3731b98 libreoffice-extras-3.3.1.2.tar.bz2
-d83022a1d114ec0162ddc8831a11c721 libreoffice-filters-3.3.1.2.tar.bz2
-df8bb2bde5fc508c7f72a5dcb9b0a8f9 libreoffice-help-3.3.1.2.tar.bz2
-c0b79ca07f4f5cbfec6c1dacea319255 libreoffice-impress-3.3.1.2.tar.bz2
-453e7a81441b4ffc9ea42eb3c536a5f1 libreoffice-l10n-3.3.1.2.tar.bz2
-12b687fbf8efcc5646994c1604215ba1 libreoffice-libs-core-3.3.1.2.tar.bz2
-de734a6cc9067cd50a646bbf927ef1c6 libreoffice-libs-extern-3.3.1.2.tar.bz2
-7216fbf22f2dfeca9d6e86b82ca96432 libreoffice-libs-extern-sys-3.3.1.2.tar.bz2
-4103b20657d8b4dccc6043ecf9af6198 libreoffice-libs-gui-3.3.1.2.tar.bz2
-82006e66f16541253667361d37e1feac libreoffice-postprocess-3.3.1.2.tar.bz2
-ec3bac46dae5de6ef404a2d3b7a6161d libreoffice-sdk-3.3.1.2.tar.bz2
-0be95f1b4578e3f31f74ed33d0402b65 libreoffice-testing-3.3.1.2.tar.bz2
-7f921131e85714018bf3f2c295c27db0 libreoffice-ure-3.3.1.2.tar.bz2
-b2cd588b9837039767f653efe20919bc libreoffice-writer-3.3.1.2.tar.bz2
+cd9f83d8dc2f85f06b2999fd3d23a74d libreoffice-artwork-3.3.2.2.tar.bz2
+46fb3c85cc878daabb58d94fa848a59d libreoffice-base-3.3.2.2.tar.bz2
+19698765fe35dcbb1f6d7d55c617c39f libreoffice-bootstrap-3.3.2.2.tar.bz2
+0274eb33f462e620cb2f37aa696d18b1 libreoffice-calc-3.3.2.2.tar.bz2
+a5f11a035faa6160121dd2d3f984065f libreoffice-components-3.3.2.2.tar.bz2
+d54e5f7e5cde7f648d74e382eb5e44fc libreoffice-extensions-3.3.2.2.tar.bz2
+db5d3a8886ec451c11e1ef3cea132ce0 libreoffice-extras-3.3.2.2.tar.bz2
+4ae9b40116ef3f840b232cb3454be4e3 libreoffice-filters-3.3.2.2.tar.bz2
+2dc8e4b347866f9469eb6c42a9cb0b81 libreoffice-help-3.3.2.2.tar.bz2
+e9211340b2a7f48c17883db76d1e8e03 libreoffice-impress-3.3.2.2.tar.bz2
+688768909f823b5006162d27638aa15e libreoffice-l10n-3.3.2.2.tar.bz2
+26ca2152535ba45bf71d8aa3b26fc967 libreoffice-libs-core-3.3.2.2.tar.bz2
+9df0af97ec8d085864c5341678bb1d0d libreoffice-libs-extern-3.3.2.2.tar.bz2
+09b22bf1a812affbfe561230940d7da2 libreoffice-libs-extern-sys-3.3.2.2.tar.bz2
+e3dc1c328dfdf4a288946957c69ad32b libreoffice-libs-gui-3.3.2.2.tar.bz2
+5c0a8203253d053f23613e68cdb69565 libreoffice-postprocess-3.3.2.2.tar.bz2
+2e68a800e323fd3286a0a3305e3d3e39 libreoffice-sdk-3.3.2.2.tar.bz2
+e91523550f9cae015923685ad3fce5ad libreoffice-testing-3.3.2.2.tar.bz2
+a17434cc2469a263ffabd345e90d8911 libreoffice-ure-3.3.2.2.tar.bz2
+6faf9924a74b836527906f49fcea40c2 libreoffice-writer-3.3.2.2.tar.bz2
More information about the scm-commits
mailing list