From 4310772a82ea435827db06333a48314f5be2a64a Mon Sep 17 00:00:00 2001 From: David Tardon Date: Dec 19 2016 20:47:08 +0000 Subject: add 5.2.4 buildfix --- diff --git a/.gitignore b/.gitignore index 75c313b..e723375 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,6 @@ /libreoffice-5.2.4.2.tar.xz /libreoffice-help-5.2.4.2.tar.xz /libreoffice-translations-5.2.4.2.tar.xz +/libreoffice-5.2.4.2-buildfix1.tar.xz +/libreoffice-help-5.2.4.2-buildfix1.tar.xz +/libreoffice-translations-5.2.4.2-buildfix1.tar.xz diff --git a/libreoffice.spec b/libreoffice.spec index 5975f18..e9b4bd3 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -5,7 +5,7 @@ # so we need a way to define it easily at one place. %define libo_prerelease %{nil} # Should contain any suffix of release tarball name, e.g., -buildfix1. -%define libo_buildfix %{nil} +%define libo_buildfix -buildfix1 # rhbz#715152 state vendor %if 0%{?rhel} %define vendoroption --with-vendor="Red Hat, Inc." @@ -1005,7 +1005,7 @@ done \ %{!?-l:%{error:-l must be present}} %prep -%setup -q -n %{name}-%{version}%{?libo_prerelease} -b 1 -b 2 +%setup -q -n %{name}-%{version}%{?libo_prerelease}%{?libo_buildfix} -b 1 -b 2 rm -rf git-hooks */git-hooks # set up git repo diff --git a/sources b/sources index e9ee810..7775c60 100644 --- a/sources +++ b/sources @@ -8,6 +8,6 @@ SHA512 (libreoffice-multiliblauncher.sh) = db532afdf5000bc66f9e02c7d0ab586468466 SHA512 (4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2) = 1e8a39205f21206d239871bd636f17768eb3997e08ba065c1111a537564bec2b4e97bcb2f7cd9e652a1d9b4f31cb0662010303c393aedc84b920bb5f41b27be8 SHA512 (ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz) = 2f8d473916abf9822367edbe857fc2e12dc9858d12e790d689d787e439904bd6a452bf631043aa66e7502457ab0815a473657f58fca17a213e2490f5655e5ae5 SHA512 (libgltf-0.0.2.tar.bz2) = 74ca5e5e0f38ee5a67e870b49f4adf6c9710dc696afb776149618c05d15e3527d605143230f7ceacd199b609bcbb683cfc72d8e4ef22ba5b9ca777c8a2b53dcf -SHA512 (libreoffice-5.2.4.2.tar.xz) = 17b892f7c6b43189a08e5b2f8844cec486293daaa9b22afe4b9a0b8e3747cc9646018eb976c80af1a8eea34c29077fb945ff724d8d0f6ee20cebbce94e5ded5b -SHA512 (libreoffice-help-5.2.4.2.tar.xz) = f0ad65a01c589e3a2377130221d42497848a8407b71fe6450b1dd4bd7978c66ee42281f0da5a881c7317750804af5108ec50cf79707b2910a0b879039e487d0b -SHA512 (libreoffice-translations-5.2.4.2.tar.xz) = 73ca6b70d74243feb98901603b174327c5825d3cdaa8033f554c26b5cc8bc01d788b998928eefbe56b6d16239a771bbf89ed6ec9179d7e04a6ccd1610599e8ef +SHA512 (libreoffice-5.2.4.2-buildfix1.tar.xz) = caa53621c1ba7f8c7c87e9a28770bf909ffec3a5b7217e279c4681004f86375f8acf0b485fee0cd9dbd52c568e5e0435f79cf1aede11090c9dadd6bdab296067 +SHA512 (libreoffice-help-5.2.4.2-buildfix1.tar.xz) = 868c24f39fa517b8ea300b6acba0228f3cf4fb73b360f31977d8728f614fda8464c5cc91cb33f24abadc9fc063ccff640729d131835718d4e991e92b6b0d9515 +SHA512 (libreoffice-translations-5.2.4.2-buildfix1.tar.xz) = 42eee38fe9fd26d8714d846260956fc15a86c0ecddb16f763b3e4bff1699aa7c28b3d5b9a4faac4c4044791698ee92f3636d88f0a5d857afb909fe49d345b435