From bddd8646fdc736875a91bae6541febf1c8637e805f14ba64d752ff50cfec278c Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 11 May 2020 13:16:05 +0000 Subject: [PATCH] Accepting request 802623 from GNOME:Next - Create and own /usr/share/mime/application: many packages install files in there and it makes sense to continue delivering the basic directory layout. - Add smi-Fix-pkg-config-installation-path.patch: Fix pkg-config installation path. OBS-URL: https://build.opensuse.org/request/show/802623 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/shared-mime-info?expand=0&rev=87 --- shared-mime-info.changes | 13 +++++++++++++ shared-mime-info.spec | 6 +++++- smi-Fix-pkg-config-installation-path.patch | 22 ++++++++++++++++++++++ 3 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 smi-Fix-pkg-config-installation-path.patch diff --git a/shared-mime-info.changes b/shared-mime-info.changes index 7d07712..f69ad0f 100644 --- a/shared-mime-info.changes +++ b/shared-mime-info.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon May 11 08:39:01 UTC 2020 - Dominique Leuenberger + +- Create and own /usr/share/mime/application: many packages install + files in there and it makes sense to continue delivering the + basic directory layout. + +------------------------------------------------------------------- +Fri May 8 20:42:05 UTC 2020 - Bjørn Lie + +- Add smi-Fix-pkg-config-installation-path.patch: Fix pkg-config + installation path. + ------------------------------------------------------------------- Wed May 6 16:52:14 UTC 2020 - Stefan Brüns diff --git a/shared-mime-info.spec b/shared-mime-info.spec index ee3107a..189c3a8 100644 --- a/shared-mime-info.spec +++ b/shared-mime-info.spec @@ -27,6 +27,8 @@ Group: System/X11/Utilities URL: https://gitlab.freedesktop.org/xdg/shared-mime-info Source0: %{url}/uploads/%{commitid}/%{name}-%{version}.tar.xz Source1: macros.shared-mime-info +# PATCH-FIX-UPSTREAM smi-Fix-pkg-config-installation-path.patch -- Fix pkg-config installation path +Patch0: smi-Fix-pkg-config-installation-path.patch BuildRequires: glib2-devel BuildRequires: itstool @@ -63,6 +65,8 @@ This package contains: %install %meson_install +# we also deliver %{_datadir}/mime/application directory - many other packages install files in there +if [ ! -d %{buildroot}%{_datadir}/mime/application ]; then mkdir -p %{buildroot}%{_datadir}/mime/application; fi %find_lang %{name} %{?no_lang_C} # Install rpm macros install -D -m644 %{SOURCE1} %{buildroot}%{_rpmmacrodir}/macros.shared-mime-info @@ -83,7 +87,7 @@ export PKGSYSTEM_ENABLE_FSYNC=0 %doc NEWS README.md %{_bindir}/* %{_datadir}/mime/packages/*.xml -%{_libdir}/pkgconfig/*.pc +%{_datadir}/pkgconfig/*.pc %{_datadir}/gettext/its/shared-mime-info.* %ghost %{_datadir}/mime/[a-ms-vxX]* %{_mandir}/man?/*%{ext_man} diff --git a/smi-Fix-pkg-config-installation-path.patch b/smi-Fix-pkg-config-installation-path.patch new file mode 100644 index 0000000..34381e4 --- /dev/null +++ b/smi-Fix-pkg-config-installation-path.patch @@ -0,0 +1,22 @@ +From 6bf9e4ff0fb7eff11a02bd937045bf5dc291841a Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Wed, 6 May 2020 16:48:47 +0200 +Subject: [PATCH] data: Fix pkg-config installation path + +--- + data/meson.build | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/data/meson.build b/data/meson.build +index 25ce031..e22b544 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -38,4 +38,5 @@ pkgconfig.generate( + name: 'shared-mime-info', + description: 'Freedesktop common MIME database', + version: meson.project_version(), ++ install_dir: get_option('datadir') / 'pkgconfig' + ) +-- +2.26.2 +