From c615ee1656bb979a0fbc3ccab577958a77029aa2fd04e94c8ea6146b75a84e81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 17 Jan 2018 10:39:40 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=580 --- libreoffice.spec | 7 ++----- lo-provides | 6 ------ lo-requires | 6 ------ 3 files changed, 2 insertions(+), 17 deletions(-) delete mode 100644 lo-provides delete mode 100644 lo-requires diff --git a/libreoffice.spec b/libreoffice.spec index b4f24ed..b7ce9ec 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -40,9 +40,8 @@ %else # Hack in the bundled libs to not pop up on requires/provides to avoid # faking libreoffice provide some system packages -%define _use_internal_dependency_generator 0 -%define __find_provides /bin/sh %_sourcedir/lo-provides %name -%define __find_requires /bin/sh %_sourcedir/lo-requires %name +%global __provides_exclude_from ^%{_libdir}/libreoffice/lib{gpg,assuan}*\\.pc$ +%global __requires_exclude_from ^%{_libdir}/libreoffice/lib{gpg,assuan}*\\.pc$ %bcond_with system_gpgme %endif Name: libreoffice @@ -64,8 +63,6 @@ Source402: %{external_url}/b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_%{nu Source450: %{external_url}/1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt Source452: %{external_url}/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2 # GPGME bundle list -Source998: lo-provides -Source999: lo-requires Source1000: %{external_url}/gpgme-1.8.0.tar.bz2 Source1001: %{external_url}/libgpg-error-1.26.tar.bz2 Source1002: %{external_url}/libassuan-2.4.3.tar.bz2 diff --git a/lo-provides b/lo-provides deleted file mode 100644 index c918422..0000000 --- a/lo-provides +++ /dev/null @@ -1,6 +0,0 @@ -# hide some private libraries from provides -grep -v -e libgpgme.so \ - -e libgpgmepp.so \ - -e libassuan.so \ - -e libgpg-error.so \ - | /usr/lib/rpm/find-provides diff --git a/lo-requires b/lo-requires deleted file mode 100644 index 22be3ea..0000000 --- a/lo-requires +++ /dev/null @@ -1,6 +0,0 @@ -# do not require some internal libraries -/usr/lib/rpm/find-requires “$@” | \ -grep -v -e libgpgme.so \ - -e libgpgmepp.so \ - -e libassuan.so \ - -e libgpg-error.so