#21 Use system dragonbox
Merged 9 months ago by limb. Opened 9 months ago by mattia.
rpms/ mattia/libreoffice dragonbox  into  rawhide

Use system dragonbox
Mattia Verga • 9 months ago  
file modified
+5 -3
@@ -58,7 +58,7 @@ 

  Name:           libreoffice

  Epoch:          1

  Version:        %{libo_version}.1

- Release:        1%{?libo_prerelease}%{?dist}

+ Release:        2%{?libo_prerelease}%{?dist}

  # default new files are: MPLv2

  # older files are typically: MPLv2 incorporating work under ASLv2

  # nlpsolver is: LGPLv3
@@ -83,7 +83,6 @@ 

  Source8:        libreoffice-multiliblauncher.sh

  

  Source9:        %{external_url}/dtoa-20180411.tgz

- Source10:       %{external_url}/dragonbox-1.1.3.tar.gz

  Source11:       %{external_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip

  #Unfortunately later versions of hsqldb changed the file format, so if we use a later version we lose

  #backwards compatability.
@@ -139,6 +138,7 @@ 

  BuildRequires: Box2D-devel

  BuildRequires: boost-devel

  BuildRequires: cups-devel

+ BuildRequires: dragonbox-static

  BuildRequires: fontpackages-devel

  %if 0%{?fedora}

  BuildRequires: firebird-devel
@@ -1117,7 +1117,6 @@ 

   --without-export-validation \

   --without-fonts \

   --without-lxml \

-  --without-system-dragonbox \

   --without-system-libfixmath \

   --with-gdrive-client-secret="GYWrDtzyZQZ0_g5YoBCC6F0I" \

   --with-gdrive-client-id="457862564325.apps.googleusercontent.com" \
@@ -2258,6 +2257,9 @@ 

  %{_includedir}/LibreOfficeKit

  

  %changelog

+ * Mon Sep 04 2023 Mattia Verga <mattia.verga@proton.me> - 1:7.6.1.1-2

+ - Unbundle dragonbox

+ 

  * Mon Aug 28 2023 Gwyn Ciesla <gwync@protonmail.com> - 1:7.6.1.1-1

  - 7.6.1.1

  

file modified
-1
@@ -9,5 +9,4 @@ 

  SHA512 (a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip) = 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a

  SHA512 (f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf) = 6a6d131dad5191614950a49323ae6d9385afe331983c1c85fde82ce6ee816051d95dde9ef90658b8f0a8a0a21754e72ff724bf41f6b96c046b7b4c2660f7095b

  SHA512 (libreoffice-multiliblauncher.sh) = db532afdf5000bc66f9e02c7d0ab586468466f63f8f0bdb204832581e8277c5c59f688fa096548d642411cb8c46e8de4a744676b4e624c075262cfd6945138cd

- SHA512 (dragonbox-1.1.3.tar.gz) = 41ac356ebced3312c0f9ea0f07ff372337ab78af69071f63f63dc12bd2b0088d5d89aae3792276599dd0393bfdfd2b979946c43d36042e43105080bcdcbe089d

  SHA512 (dtoa-20180411.tgz) = 722aa814c33a34bfffe6c0201b0035cc3b65854a0ba9ae2f51620a89d68019353e2c306651b35bca337186b22b2e9865ef3c5e3df8e9328006f882e4577f8c85

no initial comment

Build succeeded.
https://fedora.softwarefactory-project.io/zuul/buildset/87bf058293ad49cbacb7886915fc7881

Pull-Request has been merged by limb

9 months ago
Metadata