[libreoffice] 3.6.1 rc1

[David Tardon]

commit e3b84da6985fbda36a4f7571cb46b89bc101c110
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Aug 16 13:00:22 2012 +0200

    3.6.1 rc1

 .gitignore                                        |    4 ++
 0001-rhbz-842552-always-create-text-content.patch |   34 ---------------------
 libreoffice.spec                                  |   11 ++++---
 openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch  |    6 ++--
 sources                                           |    8 ++--
 5 files changed, 17 insertions(+), 46 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ed0cb5a..29212af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -125,3 +125,7 @@
 /libreoffice-core-3.6.0.4.tar.xz
 /libreoffice-help-3.6.0.4.tar.xz
 /libreoffice-translations-3.6.0.4.tar.xz
+/libreoffice-binfilter-3.6.1.1.tar.xz
+/libreoffice-core-3.6.1.1.tar.xz
+/libreoffice-help-3.6.1.1.tar.xz
+/libreoffice-translations-3.6.1.1.tar.xz
diff --git a/libreoffice.spec b/libreoffice.spec
index ebabcf9..788af55 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -1,5 +1,5 @@
 # download path contains version without the last (fourth) digit
-%define libo_version 3.6.0
+%define libo_version 3.6.1
 # Should contain .alphaX / .betaX, if this is pre-release (actually
 # pre-RC) version. The pre-release string is part of tarball file names,
 # so we need a way to define it easily at one place.
@@ -33,8 +33,8 @@
 Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
-Version:        %{libo_version}.4
-Release:        3%{?libo_prerelease}%{?dist}
+Version:        %{libo_version}.1
+Release:        1%{?libo_prerelease}%{?dist}
 License:        (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic
 Group:          Applications/Productivity
 URL:            http://www.documentfoundation.org/develop
@@ -168,7 +168,6 @@ Patch8:  0001-Resolves-rhbz-838368-view-ignored-while-view-accepte.patch
 # TODO: look what the problem is
 Patch9:  0001-disable-failing-check.patch
 Patch10: 0001-Resolves-rhbz-836937-insanely-slow-with-Zemberek-ins.patch
-Patch11: 0001-rhbz-842552-always-create-text-content.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -776,7 +775,6 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch8  -p1 -b .rhbz838368-view-ignored-while-view-accepte.patch
 %patch9  -p1 -b .disable-failing-check.patch
 %patch10 -p1 -b .rhbz-836937-insanely-slow-with-Zemberek-ins.patch
-%patch11 -p1 -b .rhbz-842552-always-create-text-content.patch
 
 # TODO: check this
 # these are horribly incomplete--empty translations and copied english
@@ -2011,6 +2009,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif
 
 %changelog
+* Wed Aug 15 2012 David Tardon <dtardon at redhat.com> - 1:3.6.1.1-1
+- 3.6.1 rc1
+
 * Sun Aug 12 2012 Kevin Fenzi <kevin at scrye.com> - 1:3.6.0.4-3
 - Rebuild for new boost
 
diff --git a/openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch b/openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
index afd33a4..b5a7ff7 100644
--- a/openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
+++ b/openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
@@ -33,13 +33,13 @@
 +
  #collect all bootstrap variables specified on the command line
  #so that they can be passed as arguments to javaldx later on
- #Recognize the "sync" option. sync must be applied without any other
+ for arg in $@
 @@ -110,6 +137,8 @@
  # SAL_NO_XINITTHREADS=true; export SAL_NO_XINITTHREADS
  
  # execute binary
--exec "$sd_prog/unopkg.bin" "$@" $JVMFWKPARAMS \
-+"$sd_prog/unopkg.bin" "$@" $JVMFWKPARAMS \
+-exec "$sd_prog/unopkg.bin" "$@" \
++"$sd_prog/unopkg.bin" "$@" \
      "-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"
 -
 +if [ -n "$INSTDIR" ]; then
diff --git a/sources b/sources
index d1757c4..4725361 100644
--- a/sources
+++ b/sources
@@ -9,7 +9,7 @@ c1b5b8d1dd929a1261a6f8872d92b799  redhat-langpacks.tar.gz
 fdb27bfe2dbe2e7b57ae194d9bf36bab  fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
 a7983f859eafb2677d7ff386a023bc40  a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
 1f24ab1d39f4a51faf22244c94a6203f  1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
-d63fed7dd5b368d1753eeebb5972c740  libreoffice-binfilter-3.6.0.4.tar.xz
-67cf97e86c75363238a371f64ef5f606  libreoffice-core-3.6.0.4.tar.xz
-8422b0c4c797abeefed3ee4490586dd2  libreoffice-help-3.6.0.4.tar.xz
-6cc8fa86be8c657ba23434c6c8d99416  libreoffice-translations-3.6.0.4.tar.xz
+edc01324ed978c41cf780a810b9fb0e0  libreoffice-binfilter-3.6.1.1.tar.xz
+8e2550fe7c1732841ceb89bc2bdef835  libreoffice-core-3.6.1.1.tar.xz
+f4e70255502cbed27d6a4aec3ca3440c  libreoffice-help-3.6.1.1.tar.xz
+e0620afcc401aa19cd094d65095f9d82  libreoffice-translations-3.6.1.1.tar.xz