From 8cc4e7fcebc57d63446dcffa12085a453bfb10201fcce2954a150bda3adbd6b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Tue, 14 Apr 2020 10:17:51 +0000 Subject: [PATCH] Accepting request 793222 from GNOME:Next New upstream rel OBS-URL: https://build.opensuse.org/request/show/793222 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/shared-mime-info?expand=0&rev=82 --- _service | 16 -------------- shared-mime-info-1.12.obscpio | 3 --- shared-mime-info-1.15.tar.xz | 3 +++ shared-mime-info.changes | 39 +++++++++++++++++++++++++++++++++++ shared-mime-info.obsinfo | 5 ----- shared-mime-info.spec | 22 +++++++++++--------- 6 files changed, 54 insertions(+), 34 deletions(-) delete mode 100644 _service delete mode 100644 shared-mime-info-1.12.obscpio create mode 100644 shared-mime-info-1.15.tar.xz delete mode 100644 shared-mime-info.obsinfo diff --git a/_service b/_service deleted file mode 100644 index 1e9e874..0000000 --- a/_service +++ /dev/null @@ -1,16 +0,0 @@ - - - https://gitlab.freedesktop.org/xdg/shared-mime-info.git - git - 1.12 - Release-1-12 - - - - - - *.tar - xz - - - diff --git a/shared-mime-info-1.12.obscpio b/shared-mime-info-1.12.obscpio deleted file mode 100644 index 710234f..0000000 --- a/shared-mime-info-1.12.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2d70db55dde9024f54575ac985c86b8639837c774fadc7e57269f1078b91df71 -size 28580877 diff --git a/shared-mime-info-1.15.tar.xz b/shared-mime-info-1.15.tar.xz new file mode 100644 index 0000000..6175f69 --- /dev/null +++ b/shared-mime-info-1.15.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f482b027437c99e53b81037a9843fccd549243fd52145d016e9c7174a4f5db90 +size 772708 diff --git a/shared-mime-info.changes b/shared-mime-info.changes index fbe6887..3910ac3 100644 --- a/shared-mime-info.changes +++ b/shared-mime-info.changes @@ -1,3 +1,42 @@ +------------------------------------------------------------------- +Sat Apr 11 17:07:32 UTC 2020 - Bjørn Lie + +- Update to version 1.15: + + Add Kindle 8 eBook format. + + Fix some HTML files being detected as XML. +- Changes from version 1.14: + + Add mime-type for QCOW images. + + Fix matching SVG files in some circumstances (again). +- Changes from version 1.13.1: + + Fix matching SVG files in some circumstances. +- Changes from version 1.13: + + Add code of conduct document. + + Use itstool and gettext to generate translations. + + Add content-tree type for OSTree USB repositories. + + Add match for MPEG-4 v1 videos. + + Adjust a lot of user readable mime-type descriptions. + + Fix WOFF/WOFF2 mime-types. + + Prefer text/html to XHTML for *.html files. + + Better magic for text/html files. + + Fix SVG magic for files embedded in HTML. + + Add *.sgd as a glob for Mega Drive ROMs. + + Specification: Mention that sub-class-of can be aliases. + + Tools: Enable Large File Support in update-mime-database. + + Test suite: + - Make test suite failures fatal. + - Add test for duplicate mime-types. + - Fix WarpScript test. + - Generate the specification in the CI, to avoid it becoming + syntactically invalid. +- Stop using source service, it leads to a undetected build cycle. +- Following this: Drop libtool BuildRequires and stop passing + autogen.sh to bootstrap, we are now using upstream release + tarballs. +- Add itstool BuildRequires: New dependency. +- Disable t-u-u, currently breaks the build. +- Stop passing --disable-default-make-check to configure, no longer + needed, nor recognized. + ------------------------------------------------------------------- Sat Jan 25 14:19:37 UTC 2020 - Dominique Leuenberger diff --git a/shared-mime-info.obsinfo b/shared-mime-info.obsinfo deleted file mode 100644 index eddada9..0000000 --- a/shared-mime-info.obsinfo +++ /dev/null @@ -1,5 +0,0 @@ -name: shared-mime-info -version: 1.12 -mtime: 1547738010 -commit: 41a9a684249cd47aef4d65f81180ee69aa358d71 - diff --git a/shared-mime-info.spec b/shared-mime-info.spec index fc8a955..7a72a97 100644 --- a/shared-mime-info.spec +++ b/shared-mime-info.spec @@ -1,7 +1,7 @@ # # spec file for package shared-mime-info # -# Copyright (c) 2019 SUSE LLC. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,22 +16,25 @@ # +%define commitid b27eb88e4155d8fccb8bb3cd12025d5b + Name: shared-mime-info -Version: 1.12 +Version: 1.15 Release: 0 Summary: Shared MIME Database License: GPL-2.0-or-later Group: System/X11/Utilities -URL: https://gitlab.freedesktop.org/xdg/shared-mime-info/ -Source0: %{name}-%{version}.tar.xz +URL: https://gitlab.freedesktop.org/xdg/shared-mime-info +Source0: %{url}/uploads/%{commitid}/%{name}-%{version}.tar.xz Source1: macros.shared-mime-info + BuildRequires: glib2-devel BuildRequires: intltool -BuildRequires: libtool +BuildRequires: itstool BuildRequires: libxml2-devel # needed for xmllint BuildRequires: libxml2-tools -BuildRequires: translation-update-upstream +#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 # needed by update-mime-database @@ -50,12 +53,11 @@ This package contains: %prep %autosetup -p1 -translation-update-upstream +# Broken as of 1.15 +#translation-update-upstream %build -NOCONFIGURE=1 ./autogen.sh %configure \ - --disable-default-make-check \ %{nil} %make_build @@ -66,7 +68,7 @@ NOCONFIGURE=1 ./autogen.sh install -D -m644 %{SOURCE1} %{buildroot}%{_rpmmacrodir}/macros.shared-mime-info %check -make %{?_smp_mflags} check +%make_build check %filetriggerin -- %{_datadir}/mime export PKGSYSTEM_ENABLE_FSYNC=0