From 7a957a0bb4b5c4d47fc7369d87412a902e7b1a440a7f49094126239669c36d59 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 9 Mar 2018 10:09:18 +0000 Subject: [PATCH] Accepting request 583605 from GNOME:Next Scripted push of project GNOME:Next OBS-URL: https://build.opensuse.org/request/show/583605 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/shared-mime-info?expand=0&rev=68 --- shared-mime-info.changes | 5 +++++ shared-mime-info.spec | 28 +++++++++++++++------------- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/shared-mime-info.changes b/shared-mime-info.changes index ffabb2e..604f8f6 100644 --- a/shared-mime-info.changes +++ b/shared-mime-info.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Feb 28 16:39:36 UTC 2018 - dimstar@opensuse.org + +- Modernize spec-file by calling spec-cleaner + ------------------------------------------------------------------- Wed Oct 11 14:14:36 CEST 2017 - sbrabec@suse.com diff --git a/shared-mime-info.spec b/shared-mime-info.spec index 32f6d9b..efad88a 100644 --- a/shared-mime-info.spec +++ b/shared-mime-info.spec @@ -1,7 +1,7 @@ # # spec file for package shared-mime-info # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,10 +19,10 @@ Name: shared-mime-info Version: 1.9 Release: 0 -Url: http://freedesktop.org/wiki/Software/shared-mime-info Summary: Shared MIME Database -License: GPL-2.0+ +License: GPL-2.0-or-later Group: System/X11/Utilities +URL: http://freedesktop.org/wiki/Software/shared-mime-info Source: http://people.freedesktop.org/~hadess/%{name}-%{version}.tar.xz Source1: macros.shared-mime-info BuildRequires: glib2-devel @@ -33,11 +33,12 @@ BuildRequires: libxml2-tools BuildRequires: translation-update-upstream # libgio-2_0-0 Requires: shared-mime-info, but this can't exist yet. We explicitly ignore this dependency here. #!BuildIgnore: shared-mime-info +# FIXME: use proper Requires(pre/post/preun/...) +PreReq: libglib-2_0-0 # needed by update-mime-database -PreReq: libxml2-2 libglib-2_0-0 -Provides: %{name}-devel = %{version}-%{release} -BuildRoot: %{_tmppath}/%{name}-%{version}-build +PreReq: libxml2-2 Recommends: %{name}-lang +Provides: %{name}-devel = %{version}-%{release} %description This package contains: @@ -49,6 +50,7 @@ This package contains: - The update-mime-database command, used to install new MIME data. %lang_package + %prep %setup -q translation-update-upstream @@ -56,16 +58,16 @@ translation-update-upstream %build %configure \ --disable-default-make-check -make +make %{?_smp_mflags} %install -%makeinstall +%make_install %find_lang %{name} %{?no_lang_C} # Install rpm macros -install -D -m644 %{S:1} %{buildroot}%{_sysconfdir}/rpm/macros.shared-mime-info +install -D -m644 %{SOURCE1} %{buildroot}%{_sysconfdir}/rpm/macros.shared-mime-info %check -make check +make %{?_smp_mflags} check %filetriggerin -- %{_datadir}/mime export PKGSYSTEM_ENABLE_FSYNC=0 @@ -76,13 +78,13 @@ export PKGSYSTEM_ENABLE_FSYNC=0 [ -x %{_bindir}/update-mime-database ] && %{_bindir}/update-mime-database "%{_datadir}/mime" %files -%defattr (-, root, root) -%doc COPYING ChangeLog NEWS README +%license COPYING +%doc ChangeLog NEWS README %{_bindir}/* %{_datadir}/mime/packages/*.xml %{_datadir}/pkgconfig/*.pc %ghost %{_datadir}/mime/[a-ms-vxX]* -%{_mandir}/man?/*.* +%{_mandir}/man?/*%{ext_man} %{_sysconfdir}/rpm/macros.shared-mime-info %files lang -f %{name}.lang