From 0280e1ac0530dbe381bcd4c87777cad3ae9750a5 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sun, 26 Aug 2012 13:40:12 +0200 Subject: [PATCH] 3.6.1 rc2 --- .gitignore | 4 ++++ 0001-configure-fix-S390X-CPUNAME.patch | 29 -------------------------- libreoffice.spec | 9 ++++---- sources | 8 +++---- 4 files changed, 13 insertions(+), 37 deletions(-) delete mode 100644 0001-configure-fix-S390X-CPUNAME.patch diff --git a/.gitignore b/.gitignore index 8101bf4..70cc2ad 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,7 @@ /libreoffice-core-3.6.1.1.tar.xz /libreoffice-help-3.6.1.1.tar.xz /libreoffice-translations-3.6.1.1.tar.xz +/libreoffice-binfilter-3.6.1.2.tar.xz +/libreoffice-core-3.6.1.2.tar.xz +/libreoffice-help-3.6.1.2.tar.xz +/libreoffice-translations-3.6.1.2.tar.xz diff --git a/0001-configure-fix-S390X-CPUNAME.patch b/0001-configure-fix-S390X-CPUNAME.patch deleted file mode 100644 index 8c50e94..0000000 --- a/0001-configure-fix-S390X-CPUNAME.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 8c482683edf6aee17d4718150158293461b88b3b Mon Sep 17 00:00:00 2001 -From: Michael Stahl -Date: Mon, 20 Aug 2012 12:41:08 +0200 -Subject: [PATCH] configure: fix S390X CPUNAME: - -The value was changed to S390x, presumably by accident, breaking the -build (regression from 480b32d3809830002ecc28508d40af3ecd4ad272). - -Change-Id: Icca90818c6363855437a273714a8317becdfd0e5 ---- - configure.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.in b/configure.in -index c47a5fe..6f8d115 100644 ---- a/configure.in -+++ b/configure.in -@@ -3459,7 +3459,7 @@ linux-gnu*) - ;; - s390x) - CPU=3 -- CPUNAME=S390x -+ CPUNAME=S390X - RTL_ARCH=S390x - LIB64="lib64" - OUTPATH=unxlngs390x --- -1.7.11.2 - diff --git a/libreoffice.spec b/libreoffice.spec index 7e66c26..80a31e9 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -33,8 +33,8 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 -Version: %{libo_version}.1 -Release: 2%{?libo_prerelease}%{?dist} +Version: %{libo_version}.2 +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 @@ -169,7 +169,6 @@ Patch8: 0001-Resolves-rhbz-838368-view-ignored-while-view-accepte.patch Patch9: 0001-disable-failing-check.patch Patch10: 0001-Resolves-rhbz-836937-insanely-slow-with-Zemberek-ins.patch Patch11: 0001-Resolves-rhbz-846775-Clipboard-must-be-disposed-befo.patch -Patch12: 0001-configure-fix-S390X-CPUNAME.patch Patch13: 0001-Resolves-rhbz-842292-crash-in-calling-callback-whose.patch %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} @@ -779,7 +778,6 @@ mv -f redhat.soc extras/source/palettes/standard.soc %patch9 -p1 -b .disable-failing-check.patch %patch10 -p1 -b .rhbz-836937-insanely-slow-with-Zemberek-ins.patch %patch11 -p1 -b .rhbz-846775-Clipboard-must-be-disposed-befo.patch -%patch12 -p1 -b .0001-configure-fix-S390X-CPUNAME.patch %patch13 -p1 -b .rhbz-842292-crash-in-calling-callback-whose.patch # TODO: check this @@ -2011,6 +2009,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %endif %changelog +* Sun Aug 26 2012 David Tardon - 1:3.6.1.2-1 +- 3.6.1 rc2 + * Wed Aug 22 2012 Caolán McNamara - 1:3.6.1.1-2 - Resolves: rhbz#846775 Clipboard must be disposed before selection - Resolves: rhbz#842292 crash in scrolling multiselection in draw diff --git a/sources b/sources index 4725361..828f0ef 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 -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 +88d13733fd16590f3a188ec77ab394af libreoffice-binfilter-3.6.1.2.tar.xz +3ddcf145b74daa4361e48dafe97e7d21 libreoffice-core-3.6.1.2.tar.xz +7966e66099729d23d9ee594f526a50ed libreoffice-help-3.6.1.2.tar.xz +2555590c1b4395857fc5c469f7f1bd0c libreoffice-translations-3.6.1.2.tar.xz