[libreoffice] next milestone
Caolan McNamara
caolanm at fedoraproject.org
Thu Jan 20 11:44:23 UTC 2011
commit 541198f195e9370f3258fbed367ff1dfddf45004
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 20 11:44:12 2011 +0000
next milestone
.gitignore | 40 ++++++++++----------
...x-presenter-screens-description.xml-build.patch | 25 ------------
libreoffice.spec | 22 ++++++-----
...fice.org-3.1.0.ooo102061.sc.cellanchoring.patch | 10 ++--
sources | 40 ++++++++++----------
5 files changed, 57 insertions(+), 80 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d084e1c..584a966 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,23 +7,23 @@
/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
/cf8a6967f7de535ae257fa411c98eb88-mdds_0.3.0.tar.bz2
/redhat-langpacks.tar.gz
-/libreoffice-artwork-3.3.0.3.tar.bz2
-/libreoffice-base-3.3.0.3.tar.bz2
-/libreoffice-bootstrap-3.3.0.3.tar.bz2
-/libreoffice-calc-3.3.0.3.tar.bz2
-/libreoffice-components-3.3.0.3.tar.bz2
-/libreoffice-extensions-3.3.0.3.tar.bz2
-/libreoffice-extras-3.3.0.3.tar.bz2
-/libreoffice-filters-3.3.0.3.tar.bz2
-/libreoffice-help-3.3.0.3.tar.bz2
-/libreoffice-impress-3.3.0.3.tar.bz2
-/libreoffice-l10n-3.3.0.3.tar.bz2
-/libreoffice-libs-core-3.3.0.3.tar.bz2
-/libreoffice-libs-extern-3.3.0.3.tar.bz2
-/libreoffice-libs-extern-sys-3.3.0.3.tar.bz2
-/libreoffice-libs-gui-3.3.0.3.tar.bz2
-/libreoffice-postprocess-3.3.0.3.tar.bz2
-/libreoffice-sdk-3.3.0.3.tar.bz2
-/libreoffice-testing-3.3.0.3.tar.bz2
-/libreoffice-ure-3.3.0.3.tar.bz2
-/libreoffice-writer-3.3.0.3.tar.bz2
+/libreoffice-artwork-3.3.0.4.tar.bz2
+/libreoffice-base-3.3.0.4.tar.bz2
+/libreoffice-bootstrap-3.3.0.4.tar.bz2
+/libreoffice-calc-3.3.0.4.tar.bz2
+/libreoffice-components-3.3.0.4.tar.bz2
+/libreoffice-extensions-3.3.0.4.tar.bz2
+/libreoffice-extras-3.3.0.4.tar.bz2
+/libreoffice-filters-3.3.0.4.tar.bz2
+/libreoffice-help-3.3.0.4.tar.bz2
+/libreoffice-impress-3.3.0.4.tar.bz2
+/libreoffice-l10n-3.3.0.4.tar.bz2
+/libreoffice-libs-core-3.3.0.4.tar.bz2
+/libreoffice-libs-extern-3.3.0.4.tar.bz2
+/libreoffice-libs-extern-sys-3.3.0.4.tar.bz2
+/libreoffice-libs-gui-3.3.0.4.tar.bz2
+/libreoffice-postprocess-3.3.0.4.tar.bz2
+/libreoffice-sdk-3.3.0.4.tar.bz2
+/libreoffice-testing-3.3.0.4.tar.bz2
+/libreoffice-ure-3.3.0.4.tar.bz2
+/libreoffice-writer-3.3.0.4.tar.bz2
diff --git a/libreoffice.spec b/libreoffice.spec
index 5601d53..dc145cc 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -27,8 +27,8 @@
Summary: Free Software Productivity Suite
Name: libreoffice
-Version: 3.3.0.3
-Release: 2%{?dist}
+Version: 3.3.0.4
+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
@@ -99,10 +99,9 @@ Patch12: turn-script-providers-into-extensions.patch
Patch13: libreoffice-installfix.patch
Patch14: 0001-tidy-this-up-and-don-t-bail-out-on-mislength-records.patch
Patch15: libreoffice-bootstrap-kde.patch
-Patch16: 0001-fix-presenter-screens-description.xml-build.patch
-Patch17: 0001-don-t-pushback-and-process-a-corrupt-extension.patch
-Patch18: 0001-free-ctxt-after-taking-lastError-details.patch
-Patch19: 0001-Removed-suspect-hack.-Cursor-on-post-it-now-scrolls-.patch
+Patch16: 0001-don-t-pushback-and-process-a-corrupt-extension.patch
+Patch17: 0001-free-ctxt-after-taking-lastError-details.patch
+Patch18: 0001-Removed-suspect-hack.-Cursor-on-post-it-now-scrolls-.patch
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%define instdir %{_libdir}
@@ -721,10 +720,9 @@ mv -f redhat.soc extras/source/palettes/standard.soc
%patch13 -p1 -b .libreoffice-installfix.patch
%patch14 -p1 -b .don-t-bail-out-on-mislength-records.patch
%patch15 -p1 -b .libreoffice-bootstrap-kde.patch
-%patch16 -p1 -b .fix-presenter-screens-description.xml-build.patch
-%patch17 -p1 -b .don-t-pushback-and-process-a-corrupt-extension.patch
-%patch18 -p1 -b .free-ctxt-after-taking-lastError-details.patch
-%patch19 -p1 -b .Cursor-on-post-it-now-scrolls-.patch
+%patch16 -p1 -b .don-t-pushback-and-process-a-corrupt-extension.patch
+%patch17 -p1 -b .free-ctxt-after-taking-lastError-details.patch
+%patch18 -p1 -b .Cursor-on-post-it-now-scrolls-.patch
touch scripting/source/pyprov/delzip
touch scripting/util/provider/beanshell/delzip
touch scripting/util/provider/javascript/delzip
@@ -2065,6 +2063,10 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%{basisinstdir}/program/kde-open-url
%changelog
+* Thu Jan 20 2011 Caolán McNamara <caolanm at redhat.com> 3.3.0.4-1
+- next release candidate
+- drop integrated 0001-fix-presenter-screens-description.xml-build.patch
+
* Tue Jan 18 2011 Caolán McNamara <caolanm at redhat.com> 3.3.0.3-2
- backport fix to get presenter screen working
- make handling busted extensions more robust
diff --git a/openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch b/openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch
index 08fd19f..54068f6 100644
--- a/openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch
+++ b/openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch
@@ -451,8 +451,8 @@ diff -ru sc.orig/source/core/data/drwlayer.cxx sc/source/core/data/drwlayer.cxx
- MoveAreaTwips( nTab, aRect, Point( 0,nDifTwips ), aTopLeft );
}
- BOOL ScDrawLayer::HasObjectsInRows( SCTAB nTab, SCROW nStartRow, SCROW nEndRow, bool bIncludeNotes )
-@@ -1823,35 +1744,105 @@
+ BOOL ScDrawLayer::HasObjectsInRows( SCTAB nTab, SCROW nStartRow, SCROW nEndRow )
+@@ -1821,35 +1742,105 @@
}
}
@@ -577,7 +577,7 @@ diff -ru sc.orig/source/core/data/drwlayer.cxx sc/source/core/data/drwlayer.cxx
if( pObj && bCreate )
{
ScDrawObjData* pData = new ScDrawObjData;
-@@ -1888,15 +1879,7 @@
+@@ -1886,15 +1877,7 @@
ScIMapInfo* ScDrawLayer::GetIMapInfo( SdrObject* pObj ) // static
{
@@ -594,7 +594,7 @@ diff -ru sc.orig/source/core/data/drwlayer.cxx sc/source/core/data/drwlayer.cxx
}
// static:
-@@ -1949,7 +1932,7 @@
+@@ -1947,7 +1930,7 @@
else if ( pObj->ISA( SdrOle2Obj ) ) // OLE-Objekt
{
// TODO/LEAN: working with visual area needs running state
@@ -603,7 +603,7 @@ diff -ru sc.orig/source/core/data/drwlayer.cxx sc/source/core/data/drwlayer.cxx
bObjSupported = TRUE;
}
-@@ -1967,14 +1950,9 @@
+@@ -1965,14 +1948,9 @@
ScMacroInfo* ScDrawLayer::GetMacroInfo( SdrObject* pObj, BOOL bCreate ) // static
{
diff --git a/sources b/sources
index b169c99..6ac3dc7 100644
--- a/sources
+++ b/sources
@@ -7,23 +7,23 @@ ada24d37d8d638b3d8a9985e80bc2978 ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.
fdb27bfe2dbe2e7b57ae194d9bf36bab fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
cf8a6967f7de535ae257fa411c98eb88 cf8a6967f7de535ae257fa411c98eb88-mdds_0.3.0.tar.bz2
35c9d670889318e26aad389ed750012f redhat-langpacks.tar.gz
-11ee2da5ec106223b2b8ba3203607515 libreoffice-artwork-3.3.0.3.tar.bz2
-9bc41b4af306537991aa3de1910addc2 libreoffice-base-3.3.0.3.tar.bz2
-ec307f3a4df0692fe60af99d22fbc940 libreoffice-bootstrap-3.3.0.3.tar.bz2
-ac3c78e8ffffa0540bb553b33efec0dd libreoffice-calc-3.3.0.3.tar.bz2
-4bfdd7ad282b6205bdec98c882e495bf libreoffice-components-3.3.0.3.tar.bz2
-432e61b0eb465d74d9567bf4a10f1934 libreoffice-extensions-3.3.0.3.tar.bz2
-6649515e90c66762d9a903e7a3c16038 libreoffice-extras-3.3.0.3.tar.bz2
-892900e12636ef15bf849c265d99ad81 libreoffice-filters-3.3.0.3.tar.bz2
-dbda4c20c232ee45e46caf7de2d528ad libreoffice-help-3.3.0.3.tar.bz2
-b081ed3295db7b8191945325eb80b812 libreoffice-impress-3.3.0.3.tar.bz2
-d7d8642744e6de6a5b10eaa346ce260a libreoffice-l10n-3.3.0.3.tar.bz2
-12b7e3d935700e37ef76b290c4d5b128 libreoffice-libs-core-3.3.0.3.tar.bz2
-0c3ea3e8396e683993914728e81a3b90 libreoffice-libs-extern-3.3.0.3.tar.bz2
-0092f8e145ad8692178e5b6ffa9bf568 libreoffice-libs-extern-sys-3.3.0.3.tar.bz2
-113b0586f43c36f0140738a590da06b7 libreoffice-libs-gui-3.3.0.3.tar.bz2
-8d605664153911ee9697c3747e06baf8 libreoffice-postprocess-3.3.0.3.tar.bz2
-156c9d9e56289ec9069496bbc8948066 libreoffice-sdk-3.3.0.3.tar.bz2
-11b60a6b6210463669a5b41a6a8d5d30 libreoffice-testing-3.3.0.3.tar.bz2
-7d5bb5e94baebe3e2011cc704499204c libreoffice-ure-3.3.0.3.tar.bz2
-87b07de3b38bec509f005487743147b5 libreoffice-writer-3.3.0.3.tar.bz2
+357d7f61055be4d1578ffbce7141ab39 libreoffice-artwork-3.3.0.4.tar.bz2
+bea2cff353ccbb920b63030cdbe3d594 libreoffice-base-3.3.0.4.tar.bz2
+06e2fee08afedc14c83f5507ccd2d50f libreoffice-bootstrap-3.3.0.4.tar.bz2
+1e80e2a79944d25fdf6f2c1ca1bc2ef4 libreoffice-calc-3.3.0.4.tar.bz2
+0b49961f543db288cae3a417b6a99626 libreoffice-components-3.3.0.4.tar.bz2
+d6f5f6bfa7daaf56080cc1d539e4712b libreoffice-extensions-3.3.0.4.tar.bz2
+f8f82c168687463a42132082fe22613c libreoffice-extras-3.3.0.4.tar.bz2
+c78fe9f78d36027bf6b8776dde9c8a67 libreoffice-filters-3.3.0.4.tar.bz2
+9fbccd3346915d0bc2a0983759bb633f libreoffice-help-3.3.0.4.tar.bz2
+425c012c0388e54ceb1931fce263f288 libreoffice-impress-3.3.0.4.tar.bz2
+81aaf450f370e9f668e3a8d202a813fa libreoffice-l10n-3.3.0.4.tar.bz2
+073beed7ee117d60beb5cde3dd0f213f libreoffice-libs-core-3.3.0.4.tar.bz2
+e290c975fb908350e52e270fa3739357 libreoffice-libs-extern-3.3.0.4.tar.bz2
+204bd0f37a1d912e3fd404e35b94fe6f libreoffice-libs-extern-sys-3.3.0.4.tar.bz2
+37a52ed5334c761b5afed9aa5a67fc0d libreoffice-libs-gui-3.3.0.4.tar.bz2
+7a335a7f92dd92a400a00db68b04c99e libreoffice-postprocess-3.3.0.4.tar.bz2
+120ef457bf896b37dcc919607dd3bad3 libreoffice-sdk-3.3.0.4.tar.bz2
+41e4a40a49662ff74d508d8366532db6 libreoffice-testing-3.3.0.4.tar.bz2
+f15765db3397832f8a31c6cf130c3aad libreoffice-ure-3.3.0.4.tar.bz2
+02ed1670d5d0b4dcb82da82d030f6cb9 libreoffice-writer-3.3.0.4.tar.bz2
More information about the scm-commits
mailing list