[libreoffice] 3.5.2 rc1

[David Tardon]

commit 70c793af04477293842f6ef2d104ffa9d5c187cf
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Mar 25 16:51:56 2012 +0200

    3.5.2 rc1

 .gitignore                                   |    4 ++++
 libreoffice-ensure-non-broken-xml-tree.patch |   13 -------------
 libreoffice.spec                             |   12 +++++++-----
 sources                                      |    8 ++++----
 4 files changed, 15 insertions(+), 22 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index eb938e4..c395f8f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -77,3 +77,7 @@
 /libreoffice-core-3.5.1.2.tar.xz
 /libreoffice-help-3.5.1.2.tar.xz
 /libreoffice-translations-3.5.1.2.tar.xz
+/libreoffice-binfilter-3.5.2.1.tar.xz
+/libreoffice-core-3.5.2.1.tar.xz
+/libreoffice-help-3.5.2.1.tar.xz
+/libreoffice-translations-3.5.2.1.tar.xz
diff --git a/libreoffice-ensure-non-broken-xml-tree.patch b/libreoffice-ensure-non-broken-xml-tree.patch
index 0f387c7..dc8a23a 100644
--- a/libreoffice-ensure-non-broken-xml-tree.patch
+++ b/libreoffice-ensure-non-broken-xml-tree.patch
@@ -36,19 +36,6 @@ index 0418fc1..4de797c 100644
  ULFCONV*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/ulfconv
  
  MAKEDEPEND*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/makedepend
-diff --git a/translations/source/nb/helpcontent2/source/text/scalc.po b/translations/source/nb/helpcontent2/source/text/scalc.po
-index 79d8255..eea430f 100644
---- a/translations/source/nb/helpcontent2/source/text/scalc.po
-+++ b/translations/source/nb/helpcontent2/source/text/scalc.po
-@@ -177,7 +177,7 @@ msgstr "<ahelp hid=\".\"><emph>Bildelinja</emph> vises når du setter inn eller
- 
- #: main0203.xhp#tit.help.text
- msgid "Drawing Object Properties Bar"
--msgstr "Linja <emph>Egenskaper for tegneobjekter</emph>"
-+msgstr "Linja \"Egenskaper for tegneobjekter\""
- 
- #: main0203.xhp#hd_id3154346.1.help.text
- msgid "<link href=\"text/scalc/main0203.xhp\" name=\"Drawing Object Properties Bar\">Drawing Object Properties Bar</link>"
 diff --git a/translations/source/nn/helpcontent2/source/text/scalc.po b/translations/source/nn/helpcontent2/source/text/scalc.po
 index 9105195..d8573a3 100644
 --- a/translations/source/nn/helpcontent2/source/text/scalc.po
diff --git a/libreoffice.spec b/libreoffice.spec
index e9d2e82..775dac4 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -1,4 +1,4 @@
-%define libo_version 3.5.1
+%define libo_version 3.5.2
 # rhbz#715152 state vendor
 %if 0%{?rhel}
 %define vendoroption --with-vendor="Red Hat, Inc."
@@ -34,8 +34,8 @@
 Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
-Version:        %{libo_version}.2
-Release:        2%{?dist}
+Version:        %{libo_version}.1
+Release:        1%{?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
@@ -138,7 +138,6 @@ Patch21: 0001-Related-rhbz-799628-crash-with-chewing-IM-with-g3g.patch
 Patch22: 0001-silence-SolarMutex-not-locked-spew.patch
 Patch23: 0001-Resolves-rhbz-799525-put-flat-odf-mimetypes-in-xsltf.patch
 Patch24: 0001-Resolves-rhbz-800272-complain-about-unknown-command-.patch
-Patch25: 0001-yet-another-clash-with-macro-name.patch
 Patch26: 0001-fix-setting-of-paper-tray-from-print-dialog-fdo-4393.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
@@ -986,7 +985,6 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch22 -p1 -b .silence-SolarMutex-not-locked-spew.patch
 %patch23 -p1 -b .rhbz-799525-put-flat-odf-mimetypes-in-xsltf.patch
 %patch24 -p1 -b .rhbz-800272-complain-about-unknown-command-.patch
-%patch25 -p1 -b .yet-another-clash-with-macro-name.patch
 %patch26 -p1 -b .fix-setting-of-paper-tray-from-print-dialog-fdo-4393.patch
 
 # TODO: check this
@@ -2275,6 +2273,10 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif
 
 %changelog
+* Sun Mar 25 2012 David Tardon <dtardon at redhat.com> - 3.5.2.1-1
+- 3.5.2 rc1
+-drop integrated 0001-yet-another-clash-with-macro-name.patch
+
 * Wed Mar 14 2012 David Tardon <dtardon at redhat.com> - 3.5.1.2-2
 - Resolves: rhbz#770209 can't change paper tray setting while printing
 
diff --git a/sources b/sources
index 06972d7..f258dfc 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
-15d242aefa61993f2324a3bea953862b  libreoffice-binfilter-3.5.1.2.tar.xz
-1edf0d39a7a921f6415f6a6ec7b314b3  libreoffice-core-3.5.1.2.tar.xz
-607b544cd7b38f9e6db6fe7da25007a7  libreoffice-help-3.5.1.2.tar.xz
-a3fa7818bfab14a6cccec645193e9982  libreoffice-translations-3.5.1.2.tar.xz
+d18c2dcdb448d2ee17cd9eed0d94cb8c  libreoffice-binfilter-3.5.2.1.tar.xz
+100dd5e9de3496dd412d78a4afdcb4cc  libreoffice-core-3.5.2.1.tar.xz
+41cca7337c78df96c7b473f80d27f31f  libreoffice-help-3.5.2.1.tar.xz
+74ecbd5aca5b696b817457ec6f1cd05e  libreoffice-translations-3.5.2.1.tar.xz