From 4d7bced6b83a6dd68af82bc2574edcf08faaddcf9c1e54b0c2785e7caaf01365 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Sun, 9 Feb 2020 14:55:29 +0000 Subject: [PATCH] Accepting request 772496 from home:junknot - Remove unneeded (and counterintuitive) mysql/mariadb dep from core RPMs. Move it instead to the -base package, where it's really used. OBS-URL: https://build.opensuse.org/request/show/772496 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=857 --- libreoffice.changes | 6 ++++++ libreoffice.spec | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/libreoffice.changes b/libreoffice.changes index 2412b9f..318aa54 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Feb 9 04:51:53 UTC 2020 - Thomas Williams + +- Remove unneeded (and counterintuitive) mysql/mariadb dep from core + RPMs. Move it instead to the -base package, where it's really used. + ------------------------------------------------------------------- Thu Feb 6 09:55:01 UTC 2020 - Wolfgang Bauer diff --git a/libreoffice.spec b/libreoffice.spec index 5bb31d8..e882de5 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1356,6 +1356,11 @@ export DESTDIR=%{buildroot} export SRCDIR="./" ./solenv/bin/install-gdb-printers -a %{_datadir}/gdb/auto-load%{_libdir}/%{name} -c -i %{_libdir}/%{name} -p %{_datadir}/libreoffice/gdb +# Why would the mysql lib which is only USED by base not be IN THE BASE PACKAGE?!? +grep -v "%{_libdir}/libreoffice/program/libmysqlclo.so" file-lists/common_list.txt > tmplist +mv tmplist file-lists/common_list.txt +echo "%{_libdir}/libreoffice/program/libmysqlclo.so" >> file-lists/base_list.txt + # We have ton of duped files so run over it %fdupes %{buildroot}%{_prefix}