diff --git a/.gitignore b/.gitignore index e81c04d..ac79590 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,6 @@ /libreoffice-5.2.0.0.beta1.tar.xz /libreoffice-help-5.2.0.0.beta1.tar.xz /libreoffice-translations-5.2.0.0.beta1.tar.xz +/libreoffice-5.2.0.0.beta2.tar.xz +/libreoffice-help-5.2.0.0.beta2.tar.xz +/libreoffice-translations-5.2.0.0.beta2.tar.xz diff --git a/libreoffice.spec b/libreoffice.spec index fcc0727..d3d24cd 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: 7%{?libo_prerelease}%{?dist} +Release: 8%{?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/ @@ -1573,6 +1573,10 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar %{baseinstdir}/program/opengl/backgroundVertexShader.glsl %{baseinstdir}/program/opengl/blendedTextureFragmentShader.glsl %{baseinstdir}/program/opengl/blendedTextureVertexShader.glsl +%{baseinstdir}/program/opengl/combinedFragmentShader.glsl +%{baseinstdir}/program/opengl/combinedTextureFragmentShader.glsl +%{baseinstdir}/program/opengl/combinedTextureVertexShader.glsl +%{baseinstdir}/program/opengl/combinedVertexShader.glsl %{baseinstdir}/program/opengl/commonFragmentShader.glsl %{baseinstdir}/program/opengl/commonVertexShader.glsl %{baseinstdir}/program/opengl/convolutionFragmentShader.glsl @@ -2231,6 +2235,9 @@ done %endif %changelog +* Thu Jun 09 2016 David Tardon - 1:5.2.0.0-8.beta2 +- update to 5.2.0 beta2 + * Thu May 26 2016 David Tardon - 1:5.2.0.0-7.beta1 - update to 5.2.0 beta1 diff --git a/sources b/sources index 7685dcf..9fa267a 100644 --- a/sources +++ b/sources @@ -7,6 +7,6 @@ a7983f859eafb2677d7ff386a023bc40 a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2. 12fb8b5b0d5132726e57b9b9fc7e22c4 libreoffice-multiliblauncher.sh 4b87018f7fff1d054939d19920b751a0 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 ce12af00283eb90d9281956524250d6e ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz -33371d32594fc54dcb5ecd2dad51d6e5 libreoffice-5.2.0.0.beta1.tar.xz -a667b24fc7f830587673cf4f6c5cec9d libreoffice-help-5.2.0.0.beta1.tar.xz -4951526c374d3c49a01e2609908e503e libreoffice-translations-5.2.0.0.beta1.tar.xz +484d287d943f3ff4d69239a47e5b06e1 libreoffice-5.2.0.0.beta2.tar.xz +c0cb82517f584e94217b796db887e4fc libreoffice-help-5.2.0.0.beta2.tar.xz +946a70d47c609e15ba95b8640de77a5c libreoffice-translations-5.2.0.0.beta2.tar.xz