diff --git a/.gitignore b/.gitignore index 63d7e82..fea42f3 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ /a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip /17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip /185d60944ea767075d27247c3162b3bc-unowinreg.dll +/49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.ttf /libreoffice-multiliblauncher.sh /libreoffice-6.2.0.3.tar.xz /libreoffice-6.2.0.3.tar.xz.asc diff --git a/libreoffice.spec b/libreoffice.spec index 1820358..d33e44e 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -74,6 +74,7 @@ Source11: %{external_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip #Unfortunately later versions of hsqldb changed the file format, so if we use a later version we loose #backwards compatability. Source12: %{external_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip +Source13: %{external_url}/49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.ttf %global bundling_options %{?bundling_options} --without-system-hsqldb Provides: bundled(hsqldb) = 1.8.0 @@ -108,6 +109,7 @@ BuildRequires: gperf BuildRequires: icu BuildRequires: libtool-ltdl-devel BuildRequires: make +BuildRequires: mariadb-connector-c-devel BuildRequires: perl(Digest::MD5) %if 0%{?fedora} BuildRequires: glibc-all-langpacks @@ -1510,7 +1512,6 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar %{baseinstdir}/program/libmozbootstraplo.so %{baseinstdir}/program/libmsfilterlo.so %{baseinstdir}/program/libmtfrendererlo.so -%{baseinstdir}/program/libmysqllo.so %{baseinstdir}/program/libodbclo.so %{baseinstdir}/program/liboglcanvaslo.so %{baseinstdir}/program/liboffacclo.so @@ -1567,65 +1568,7 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar %{baseinstdir}/program/libmsformslo.so %{baseinstdir}/program/opencl %dir %{baseinstdir}/program/opengl -%{baseinstdir}/program/opengl/areaHashCRC64TFragmentShader.glsl -%{baseinstdir}/program/opengl/areaScaleFragmentShader.glsl -%{baseinstdir}/program/opengl/areaScaleFastFragmentShader.glsl -%{baseinstdir}/program/opengl/backgroundFragmentShader.glsl -%{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 -%{baseinstdir}/program/opengl/debugFragmentShader.glsl -%{baseinstdir}/program/opengl/debugVertexShader.glsl -%{baseinstdir}/program/opengl/diffTextureFragmentShader.glsl -%{baseinstdir}/program/opengl/dumbVertexShader.glsl -%{baseinstdir}/program/opengl/dummyVertexShader.glsl -%{baseinstdir}/program/opengl/greyscaleFragmentShader.glsl -%{baseinstdir}/program/opengl/invert50FragmentShader.glsl -%{baseinstdir}/program/opengl/lineFragmentShader.glsl -%{baseinstdir}/program/opengl/lineVertexShader.glsl -%{baseinstdir}/program/opengl/linearGradientFragmentShader.glsl -%{baseinstdir}/program/opengl/linearMultiColorGradientFragmentShader.glsl -%{baseinstdir}/program/opengl/linearTwoColorGradientFragmentShader.glsl -%{baseinstdir}/program/opengl/maskedTextureFragmentShader.glsl -%{baseinstdir}/program/opengl/maskedTextureVertexShader.glsl -%{baseinstdir}/program/opengl/maskFragmentShader.glsl -%{baseinstdir}/program/opengl/pickingFragmentShader.glsl -%{baseinstdir}/program/opengl/pickingVertexShader.glsl -%{baseinstdir}/program/opengl/radialGradientFragmentShader.glsl -%{baseinstdir}/program/opengl/radialMultiColorGradientFragmentShader.glsl -%{baseinstdir}/program/opengl/radialTwoColorGradientFragmentShader.glsl -%{baseinstdir}/program/opengl/rectangularMultiColorGradientFragmentShader.glsl -%{baseinstdir}/program/opengl/rectangularTwoColorGradientFragmentShader.glsl -%{baseinstdir}/program/opengl/renderTextureFragmentShader.glsl -%{baseinstdir}/program/opengl/renderTextureVertexShader.glsl -%{baseinstdir}/program/opengl/replaceColorFragmentShader.glsl -%{baseinstdir}/program/opengl/screenTextFragmentShader.glsl -%{baseinstdir}/program/opengl/screenTextVertexShader.glsl -%{baseinstdir}/program/opengl/shape3DFragmentShader.glsl -%{baseinstdir}/program/opengl/shape3DFragmentShaderBatch.glsl -%{baseinstdir}/program/opengl/shape3DFragmentShaderBatchScroll.glsl -%{baseinstdir}/program/opengl/shape3DFragmentShaderV300.glsl -%{baseinstdir}/program/opengl/shape3DVertexShader.glsl -%{baseinstdir}/program/opengl/shape3DVertexShaderBatch.glsl -%{baseinstdir}/program/opengl/shape3DVertexShaderBatchScroll.glsl -%{baseinstdir}/program/opengl/shape3DVertexShaderV300.glsl -%{baseinstdir}/program/opengl/solidFragmentShader.glsl -%{baseinstdir}/program/opengl/symbolFragmentShader.glsl -%{baseinstdir}/program/opengl/symbolVertexShader.glsl -%{baseinstdir}/program/opengl/textFragmentShader.glsl -%{baseinstdir}/program/opengl/textFragmentShaderBatch.glsl -%{baseinstdir}/program/opengl/textVertexShader.glsl -%{baseinstdir}/program/opengl/textVertexShaderBatch.glsl -%{baseinstdir}/program/opengl/textureFragmentShader.glsl -%{baseinstdir}/program/opengl/textureVertexShader.glsl -%{baseinstdir}/program/opengl/transformedTextureVertexShader.glsl +%{baseinstdir}/program/opengl/*.glsl %{baseinstdir}/program/types/offapi.rdb %{baseinstdir}/program/libpasswordcontainerlo.so %{baseinstdir}/program/pagein-common diff --git a/sources b/sources index 8298efe..5bac4c2 100644 --- a/sources +++ b/sources @@ -4,6 +4,7 @@ SHA512 (17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip) = a231eba4a1baca11766 SHA512 (185d60944ea767075d27247c3162b3bc-unowinreg.dll) = 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c SHA512 (a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip) = 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a SHA512 (0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = b9c02d63e9b47a838dbe67c05b9e9e4983d13b9d74794e1c30c73d341c3bc905c9edec3a72fa339ae8c0e06d97e69ac2ea23bf51336b77af14cab7ae67721a46 +SHA512 (49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.ttf) = 359ba0314a0e5094aa2a10067e5613b10cb9044dca04d49bae68afd8a49d88e070b9a5321b77fd15ef5685109f664409ae1af24d40edd7b462f1366a1967b0e2 SHA512 (libreoffice-multiliblauncher.sh) = db532afdf5000bc66f9e02c7d0ab586468466f63f8f0bdb204832581e8277c5c59f688fa096548d642411cb8c46e8de4a744676b4e624c075262cfd6945138cd SHA512 (libreoffice-6.2.0.3.tar.xz) = 991cab829c88010b5df0c40e6422fd725f7854d256cfa7ffcf595549ccc49aeebe135513b56c5ccdc810ea07b8df186004a3d9e5d84b5d69992996158166d0c1 SHA512 (libreoffice-6.2.0.3.tar.xz.asc) = e66a1d018f02250106a473693ac4b4b643438087c686f00a63c4876266a678ecee6624575964110ff9c9226c5de5660b1c242322ece09d66d5d36644961ea16b