pool/shared-mime-info
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 802681 from GNOME:Factory

Browse Source 
- 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. (forwarded request 802623 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/802681
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/shared-mime-info?expand=0&rev=63
This commit is contained in:
Dominique Leuenberger 2020-05-13 20:55:26 +00:00 committed by Git OBS Bridge
commit f3e3c0081c
3 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
shared-mime-info.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Mon May 11 08:39:01 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
- 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 <bjorn.lie@gmail.com>
- Add smi-Fix-pkg-config-installation-path.patch: Fix pkg-config
installation path.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed May 6 16:52:14 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de> Wed May 6 16:52:14 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de>

6
shared-mime-info.spec
View File

@ -27,6 +27,8 @@ Group: System/X11/Utilities
URL: https://gitlab.freedesktop.org/xdg/shared-mime-info URL: https://gitlab.freedesktop.org/xdg/shared-mime-info
Source0: %{url}/uploads/%{commitid}/%{name}-%{version}.tar.xz Source0: %{url}/uploads/%{commitid}/%{name}-%{version}.tar.xz
Source1: macros.shared-mime-info 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: glib2-devel
BuildRequires: itstool BuildRequires: itstool
@ -63,6 +65,8 @@ This package contains:
%install %install
%meson_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} %find_lang %{name} %{?no_lang_C}
# Install rpm macros # Install rpm macros
install -D -m644 %{SOURCE1} %{buildroot}%{_rpmmacrodir}/macros.shared-mime-info install -D -m644 %{SOURCE1} %{buildroot}%{_rpmmacrodir}/macros.shared-mime-info
@ -83,7 +87,7 @@ export PKGSYSTEM_ENABLE_FSYNC=0
%doc NEWS README.md %doc NEWS README.md
%{_bindir}/* %{_bindir}/*
%{_datadir}/mime/packages/*.xml %{_datadir}/mime/packages/*.xml
%{_libdir}/pkgconfig/*.pc %{_datadir}/pkgconfig/*.pc
%{_datadir}/gettext/its/shared-mime-info.* %{_datadir}/gettext/its/shared-mime-info.*
%ghost %{_datadir}/mime/[a-ms-vxX]* %ghost %{_datadir}/mime/[a-ms-vxX]*
%{_mandir}/man?/*%{ext_man} %{_mandir}/man?/*%{ext_man}

22
smi-Fix-pkg-config-installation-path.patch Normal file
View File

@ -0,0 +1,22 @@
From 6bf9e4ff0fb7eff11a02bd937045bf5dc291841a Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
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