diff --git a/shared-mime-info.spec b/shared-mime-info.spec index d2b68b4..c812b00 100644 --- a/shared-mime-info.spec +++ b/shared-mime-info.spec @@ -1,7 +1,7 @@ Summary: Shared MIME information database Name: shared-mime-info Version: 2.0 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ URL: http://freedesktop.org/Software/shared-mime-info Source0: https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/0440063a2e6823a4b1a6fb2f2af8350f/shared-mime-info-2.0.tar.xz @@ -23,8 +23,9 @@ BuildRequires: xmlto BuildRequires: glib2-devel BuildRequires: gettext BuildRequires: itstool +BuildRequires: make BuildRequires: meson -BuildRequires: git +BuildRequires: git-core # Disable pkgconfig autodep %global __requires_exclude ^/usr/bin/pkg-config$ @@ -38,15 +39,15 @@ a file. This is generally done by examining the file's name or contents, and looking up the correct MIME type in a database. %prep -%autosetup -S git +%autosetup -S git_am tar xjf %SOURCE6 mv xdgmime-*/ xdgmime/ %build -cd ./xdgmime/ -make -cd .. -%meson -Dupdate-mimedb=false -Dxdg-mime-path=./xdgmime/ +%make_build -C xdgmime +# the updated mimedb is later owned as %%ghost to ensure proper file-ownership +# it also asserts it is possible to build it +%meson -Dupdate-mimedb=true -Dxdg-mime-path=./xdgmime/ %meson_build %install @@ -57,14 +58,12 @@ find $RPM_BUILD_ROOT%{_datadir}/mime -type d \ find $RPM_BUILD_ROOT%{_datadir}/mime -type f -not -path "*/packages/*" \ | sed -e "s|^$RPM_BUILD_ROOT|%%ghost |" >> %{name}.files -mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications -install -m 644 %SOURCE1 $RPM_BUILD_ROOT/%{_datadir}/applications/mimeapps.list - # Support fallback/generic mimeapps.list (currently based on an old version of # gnome-mimeapps.list), see: # https://lists.fedoraproject.org/pipermail/devel/2015-July/212403.html # https://bugzilla.redhat.com/show_bug.cgi?id=1243049 -cp %SOURCE1 $RPM_BUILD_ROOT%{_datadir}/applications/mimeapps.list +mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications +install -m 644 %SOURCE1 $RPM_BUILD_ROOT/%{_datadir}/applications/mimeapps.list ## remove bogus translation files ## translations are already in the xml file installed @@ -85,17 +84,21 @@ update-mime-database -n %{_datadir}/mime &> /dev/null ||: %files -f %{name}.files %license COPYING %doc README.md NEWS HACKING.md data/shared-mime-info-spec.xml -%{_bindir}/* +%{_bindir}/update-mime-database %{_datadir}/mime/packages/* %{_datadir}/applications/mimeapps.list # better to co-own this dir than to pull in pkgconfig %dir %{_datadir}/pkgconfig %{_datadir}/pkgconfig/shared-mime-info.pc -%{_mandir}/man*/* +%{_mandir}/man*/update-mime-database.* %{_datadir}/gettext/its/shared-mime-info.its %{_datadir}/gettext/its/shared-mime-info.loc %changelog +* Sun Nov 8 2020 Miro HronĨok - 2.0-5 +- Own the generated files (as %%ghosts) +- Fixes: rhbz#1486468 + * Tue Aug 25 2020 Bastien Nocera - 2.0-4 + shared-mime-info-2.0-4 - Remove GNOME specific defaults apps list, move to gnome-desktop3