diff --git a/.gitignore b/.gitignore index aa122e0..f0c03de 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,6 @@ /libreoffice-5.3.0.0.beta1.tar.xz /libreoffice-help-5.3.0.0.beta1.tar.xz /libreoffice-translations-5.3.0.0.beta1.tar.xz +/libreoffice-5.3.0.0.beta2.tar.xz +/libreoffice-help-5.3.0.0.beta2.tar.xz +/libreoffice-translations-5.3.0.0.beta2.tar.xz diff --git a/0001-Resolves-rhbz-1035092-no-shortcut-key-for-Italian-To.patch b/0001-Resolves-rhbz-1035092-no-shortcut-key-for-Italian-To.patch deleted file mode 100644 index 417e7d4..0000000 --- a/0001-Resolves-rhbz-1035092-no-shortcut-key-for-Italian-To.patch +++ /dev/null @@ -1,27 +0,0 @@ -From eaf5194e57a9a6b82672a019c8db30c9a67ff21a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Wed, 27 Nov 2013 11:20:04 +0000 -Subject: [PATCH] Resolves: rhbz#1035092 no shortcut key for Italian 'Tools' - menu - -Change-Id: I2f8867e7d4b9c7884d1d3af4f34a93fa5da08b47 ---- - source/it/officecfg/registry/data/org/openoffice/Office/UI.po | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/source/it/officecfg/registry/data/org/openoffice/Office/UI.po b/source/it/officecfg/registry/data/org/openoffice/Office/UI.po -index ea1ff2f..97dc332 100644 ---- a/translations/source/it/officecfg/registry/data/org/openoffice/Office/UI.po -+++ b/translations/source/it/officecfg/registry/data/org/openoffice/Office/UI.po -@@ -18673,7 +18673,7 @@ msgctxt "" - "Label\n" - "value.text" - msgid "~Tools" --msgstr "Strumenti" -+msgstr "~Strumenti" - - #: GenericCommands.xcu - msgctxt "" --- -1.8.3.1 - diff --git a/libreoffice.spec b/libreoffice.spec index 26564cc..b8a69fb 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -3,7 +3,7 @@ # 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. -%define libo_prerelease .beta1 +%define libo_prerelease .beta2 # Should contain any suffix of release tarball name, e.g., -buildfix1. %define libo_buildfix %{nil} # rhbz#715152 state vendor @@ -55,7 +55,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.0 -Release: 4%{?libo_prerelease}%{?dist} +Release: 5%{?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 and MPLv2.0 and CC0 URL: http://www.libreoffice.org/ @@ -225,15 +225,13 @@ Patch0: openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch # not upstreamed Patch1: libreoffice-installfix.patch # not upstreamed -Patch2: 0001-Resolves-rhbz-1035092-no-shortcut-key-for-Italian-To.patch +Patch2: 0001-never-run-autogen.sh.patch # not upstreamed -Patch3: 0001-never-run-autogen.sh.patch -# not upstreamed -Patch4: 0001-add-X-TryExec-entries-to-desktop-files.patch -Patch5: 0001-rhbz-1353069-don-t-record-undo-information-in-the-cl.patch +Patch3: 0001-add-X-TryExec-entries-to-desktop-files.patch # not upstreamed: upstream wants an automatic restart after a crash; we # want a nice abrt report -Patch8: 0001-don-t-suppress-crashes.patch +Patch4: 0001-don-t-suppress-crashes.patch +Patch5: 0001-rhbz-1353069-don-t-record-undo-information-in-the-cl.patch %if 0%{?rhel} # not upstreamed @@ -2289,6 +2287,9 @@ done %endif %changelog +* Thu Dec 15 2016 David Tardon - 1:5.3.0.0-5.beta2 +- update to 5.3.0 beta2 + * Tue Dec 13 2016 Caolán McNamara - 1:5.3.0.0-4.beta1 - rebuild for hunspell-1.5.4 diff --git a/sources b/sources index 6afbcad..f560aa4 100644 --- a/sources +++ b/sources @@ -1,12 +1,12 @@ -86b1daaa438f5a7bea9a52d7b9799ac0 86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz -798b2ffdc8bcfe7bca2cf92b62caf685 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip -35c94d2df8893241173de1d16b6034c0 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip -17410483b5b5f267aa18b7e00b65e6e0 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip -185d60944ea767075d27247c3162b3bc 185d60944ea767075d27247c3162b3bc-unowinreg.dll -a7983f859eafb2677d7ff386a023bc40 a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip -0168229624cfac409e766913506961a8 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz -12fb8b5b0d5132726e57b9b9fc7e22c4 libreoffice-multiliblauncher.sh -4b87018f7fff1d054939d19920b751a0 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 -6adab0f370826e7c7dbd957d0ff57802 libreoffice-5.3.0.0.beta1.tar.xz -ca30b97aafb18f3d1d726246314852c1 libreoffice-help-5.3.0.0.beta1.tar.xz -22e1d19861d542fc062efc014450c4d5 libreoffice-translations-5.3.0.0.beta1.tar.xz +SHA512 (86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz) = 20b0c0ba517c764fcd32165254ae6dcdda8fb72ca3279dbfcf42d899e91d380b78d9be3b1c3d32910eaad5544a4fc51218e32579b10e6b6639338a7bd8b1ddc5 +SHA512 (798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip) = ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f +SHA512 (35c94d2df8893241173de1d16b6034c0-swingExSrc.zip) = 4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a +SHA512 (17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip) = a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a +SHA512 (185d60944ea767075d27247c3162b3bc-unowinreg.dll) = 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c +SHA512 (a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip) = 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a +SHA512 (0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = b9c02d63e9b47a838dbe67c05b9e9e4983d13b9d74794e1c30c73d341c3bc905c9edec3a72fa339ae8c0e06d97e69ac2ea23bf51336b77af14cab7ae67721a46 +SHA512 (libreoffice-multiliblauncher.sh) = db532afdf5000bc66f9e02c7d0ab586468466f63f8f0bdb204832581e8277c5c59f688fa096548d642411cb8c46e8de4a744676b4e624c075262cfd6945138cd +SHA512 (4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2) = 1e8a39205f21206d239871bd636f17768eb3997e08ba065c1111a537564bec2b4e97bcb2f7cd9e652a1d9b4f31cb0662010303c393aedc84b920bb5f41b27be8 +SHA512 (libreoffice-5.3.0.0.beta2.tar.xz) = 4fb5d9cac5ef4e7dad56bebc0bde493f1f2ee4f39cc6f3a1dcdfd65d774495dbb5c8c7848ecda3b26b1741561fa5eb999f06110576aa8a893a23290322473019 +SHA512 (libreoffice-help-5.3.0.0.beta2.tar.xz) = 0cb3d2f93f0ac6865a5bbd80cc1a214463c1a8c25e4d7ef7046d103851658cd93cef91fde53d8301c7ba7289f4af4dc3a4fbe91fa9f9aae8a287c106aafaab3e +SHA512 (libreoffice-translations-5.3.0.0.beta2.tar.xz) = 8fa509cd4afe183ed8858b7328645c90b472c093f0eccfb76c9ec3fac4475d71ddbd9676db6af0a16f42625181a5dd3531f5f583a61db44bbdc97c37d73b3111