From 9a02f6f340a82ef85d512936041d527a57fc6da9 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Wed, 24 Oct 2012 08:22:20 +0200 Subject: [PATCH] 3.6.3 rc2 --- .gitignore | 12 +++++ ...8479-fdo-56281-doubled-in-German-ok-.patch | 45 ------------------- libreoffice.spec | 10 +++-- sources | 8 ++-- 4 files changed, 22 insertions(+), 53 deletions(-) delete mode 100644 0001-Resolves-rhbz-868479-fdo-56281-doubled-in-German-ok-.patch diff --git a/.gitignore b/.gitignore index a11c32d..e54ba12 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,15 @@ /libreoffice-core-3.6.3.1.tar.xz /libreoffice-help-3.6.3.1.tar.xz /libreoffice-translations-3.6.3.1.tar.xz +/libreoffice-binfilter-3.6.2.1.tar.xz +/libreoffice-binfilter-3.6.2.2.tar.xz +/libreoffice-binfilter-3.6.3.2.tar.xz +/libreoffice-core-3.6.2.1.tar.xz +/libreoffice-core-3.6.2.2.tar.xz +/libreoffice-core-3.6.3.2.tar.xz +/libreoffice-help-3.6.2.1.tar.xz +/libreoffice-help-3.6.2.2.tar.xz +/libreoffice-help-3.6.3.2.tar.xz +/libreoffice-translations-3.6.2.1.tar.xz +/libreoffice-translations-3.6.2.2.tar.xz +/libreoffice-translations-3.6.3.2.tar.xz diff --git a/0001-Resolves-rhbz-868479-fdo-56281-doubled-in-German-ok-.patch b/0001-Resolves-rhbz-868479-fdo-56281-doubled-in-German-ok-.patch deleted file mode 100644 index f54f7ed..0000000 --- a/0001-Resolves-rhbz-868479-fdo-56281-doubled-in-German-ok-.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 920807d4491834cd88e545fdb930c9105d58c4cd Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Mon, 22 Oct 2012 13:31:38 +0100 -Subject: [PATCH] Resolves: rhbz#868479 / fdo#56281 doubled ~ in German - ok/cancel translations - -We have unix-specific code adding ~ to OK/Cancel. So don't add ~ if -string already contains those. - -Though its an open question if the presence of ~ is a bad thing -for the Windows case. i.e. if we should have tooling to not -allow the OK/Cancel translations to contain ~ in the first place, -of if we should drop the ifdef UNX and do it globally now - -Change-Id: I461c6ac9ca574ed188f51472919be82ec582e389 ---- - vcl/source/control/button.cxx | 13 ++++++++----- - 1 file changed, 8 insertions(+), 5 deletions(-) - -diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx -index 373143b..d2336ec 100644 ---- a/vcl/source/control/button.cxx -+++ b/vcl/source/control/button.cxx -@@ -151,13 +151,15 @@ - { - sal_uInt32 nResId = aResIdAry[(sal_uInt16)eButton].nResId; - aText = ResId(nResId, *pResMgr).toString(); -- -- // Windows (apparently) has some magic auto-accelerator evil around -- // ok / cancel so add this only for Unix --#ifdef UNX -- if( nResId == SV_BUTTONTEXT_OK || nResId == SV_BUTTONTEXT_CANCEL ) -- aText.Insert( String::CreateFromAscii("~"), 0 ); -+ if (nResId == SV_BUTTONTEXT_OK || nResId == SV_BUTTONTEXT_CANCEL) -+ { -+#ifndef WNT -+ // Windows (apparently) has some magic auto-accelerator evil around -+ // ok / cancel so add accelerators only for Unix -+ if (aText.Search('~') == STRING_NOTFOUND) -+ aText.Insert(rtl::OUString("~"), 0); - #endif -+ } - } - else - { diff --git a/libreoffice.spec b/libreoffice.spec index 77a53a6..59d9d86 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: 3%{?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 @@ -178,7 +178,6 @@ Patch18: 0004-tweak-old-school-gstreamer-link-line.patch Patch19: 0005-Don-t-fail-configure-with-older-gstreamer-plugins-ba.patch Patch20: 0006-gstreamer-various-fixes-for-1.0-and-cleanups.patch Patch21: 0007-gstreamer-fix-leaking-pads.patch -Patch22: 0001-Resolves-rhbz-868479-fdo-56281-doubled-in-German-ok-.patch %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %define instdir %{_libdir} @@ -796,7 +795,6 @@ mv -f redhat.soc extras/source/palettes/standard.soc %patch19 -p1 -b .Don-t-fail-configure-with-older-gstreamer-plugins-ba.patch %patch20 -p1 -b .gstreamer-various-fixes-for-1.0-and-cleanups.patch %patch21 -p1 -b .gstreamer-fix-leaking-pads.patch -%patch22 -p1 -b .rhbz-868479-fdo-56281-doubled-in-German-ok-.patch # TODO: check this # these are horribly incomplete--empty translations and copied english @@ -2028,6 +2026,10 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %endif %changelog +* Wed Oct 24 2012 David Tardon - 1:3.6.3.2-1 +- 3.6.3 rc2 +- drop integrated 0001-Resolves-rhbz-868479-fdo-56281-doubled-in-German-ok-.patch + * Mon Oct 22 2012 Caolán McNamara - 1:3.6.3.1-3 - Resolves: rhbz#868479 guard against duplicated ~ in OK/Cancel diff --git a/sources b/sources index 392c889..d3e1c76 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 -d490ce962d6c3557d1ff6af5edff9b12 libreoffice-binfilter-3.6.3.1.tar.xz -efe440ce1f806e0d0602a412ddabadb6 libreoffice-core-3.6.3.1.tar.xz -d6c187aaf3d5c0e179b3ffbba7beefd0 libreoffice-help-3.6.3.1.tar.xz -93950a79bb29d35fb22fcb317ad5ac57 libreoffice-translations-3.6.3.1.tar.xz +80439aafc2250cc878f503062f864b80 libreoffice-binfilter-3.6.3.2.tar.xz +17ccf623caa77dc135d5343a51fa1ddd libreoffice-core-3.6.3.2.tar.xz +94a8d18009f8e0e4ae80dc34c43604d7 libreoffice-help-3.6.3.2.tar.xz +f76c4439c211f229d49e5fb10ca2ba73 libreoffice-translations-3.6.3.2.tar.xz