Accepting request 83354 from home:vuntz:branches:GNOME:Factory
Update to 0.91 OBS-URL: https://build.opensuse.org/request/show/83354 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/shared-mime-info?expand=0&rev=25
This commit is contained in:
parent
8df99ba7d7
commit
239080f315
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:52c9f84a8c72de631a0458542980b1728560f59845eb5e93e1dbe825f4b72304
|
||||
size 580163
|
3
shared-mime-info-0.91.tar.xz
Normal file
3
shared-mime-info-0.91.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:98cfebe1d809afb24934e634373821e2a1dfa86fc6462cab230589a1c80988bd
|
||||
size 488740
|
@ -1,33 +0,0 @@
|
||||
From 68e31f61f5e50e5222bc05437d1123e932922796 Mon Sep 17 00:00:00 2001
|
||||
From: Samuli Suominen <ssuominen@gentoo.org>
|
||||
Date: Mon, 06 Dec 2010 19:46:57 +0000
|
||||
Subject: Fix parallel build
|
||||
|
||||
https://bugs.freedesktop.org/show_bug.cgi?id=32127
|
||||
---
|
||||
Index: shared-mime-info-0.90/Makefile.am
|
||||
===================================================================
|
||||
--- shared-mime-info-0.90.orig/Makefile.am
|
||||
+++ shared-mime-info-0.90/Makefile.am
|
||||
@@ -72,7 +72,7 @@ all: check create-pot
|
||||
create-pot:
|
||||
$(MAKE) -C po shared-mime-info.pot
|
||||
|
||||
-check: freedesktop.org.xml update-mime-database check-translations
|
||||
+check: create-pot freedesktop.org.xml update-mime-database check-translations
|
||||
if test -n $(XMLLINT) ; then \
|
||||
if test -e $(top_builddir)/freedesktop.org.xml; then \
|
||||
xmllint --noout --valid $(top_builddir)/freedesktop.org.xml; \
|
||||
Index: shared-mime-info-0.90/Makefile.in
|
||||
===================================================================
|
||||
--- shared-mime-info-0.90.orig/Makefile.in
|
||||
+++ shared-mime-info-0.90/Makefile.in
|
||||
@@ -1058,7 +1058,7 @@ all: check create-pot
|
||||
create-pot:
|
||||
$(MAKE) -C po shared-mime-info.pot
|
||||
|
||||
-check: freedesktop.org.xml update-mime-database check-translations
|
||||
+check: create-pot freedesktop.org.xml update-mime-database check-translations
|
||||
if test -n $(XMLLINT) ; then \
|
||||
if test -e $(top_builddir)/freedesktop.org.xml; then \
|
||||
xmllint --noout --valid $(top_builddir)/freedesktop.org.xml; \
|
@ -1,3 +1,51 @@
|
||||
-------------------------------------------------------------------
|
||||
Sun Sep 18 16:06:55 UTC 2011 - vuntz@opensuse.org
|
||||
|
||||
- Update to version 0.91:
|
||||
+ Mime-type Changes:
|
||||
- Add WWF
|
||||
- Add application/vnd.android.package-archive.
|
||||
- Add root-XML for SVG
|
||||
- Add Qt QML
|
||||
- Add application/x-fictionbook
|
||||
- Add application/x-mobipocket-ebook
|
||||
- Add another alias for ASX playlists
|
||||
- Add video/3gp, video/x-mpeg, video/x-mpeg2, video/divx, and
|
||||
video/msvideo aliases
|
||||
- Add MSOffice 12 and OOXML mime-types
|
||||
- Add video/vnd.mpegurl
|
||||
- Java class tweaks
|
||||
- Add magic for Megadrive ROMs
|
||||
- Add application/vnd.tcpdump.pcap
|
||||
- Fix root-XML for XSL
|
||||
- Add extension for Scheme text files
|
||||
- Add extensions for VRML documents
|
||||
- Loosen magic for FLTK fluid files
|
||||
- Move application/x-reject to text/x-reject
|
||||
- Add application/x-nzb
|
||||
- Remove glob from text/x-uri
|
||||
- Added a *.wsgi pattern for python scripts
|
||||
- Add DVI, PKCS, RELAX NG, and S/MIME acronyms.
|
||||
- Use text/vcard instead of deprecated text/directory for
|
||||
vCards.
|
||||
- Add text/x-markdown
|
||||
- Add WebVTT
|
||||
- Add *.php5 and *.phps as patterns for PHP
|
||||
- Make dash scripts shell scripts
|
||||
- Add application/x-iso9660-image alias for
|
||||
application/x-cd-image
|
||||
- Add text/x-scala mime type
|
||||
- Add another magic for XSPF files
|
||||
- Update CHM mime-type to application/vnd.ms-htmlhelp
|
||||
+ Other:
|
||||
- Fix parallel build
|
||||
- Update GPLv2 COPYING file
|
||||
- Use XZ tarballs by default
|
||||
- Drop shared-mime-info-fix-parallel-build.patch: fixed upstream.
|
||||
- Add xz BuildRequires because we can't build a package for a
|
||||
xz-compressed tarball without explicitly specifying that... See
|
||||
bnc#697467 for more details.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 18 08:41:44 CET 2011 - vuntz@opensuse.org
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package shared-mime-info (Version 0.90)
|
||||
# spec file for package shared-mime-info
|
||||
#
|
||||
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2011 SUSE LINUX Products 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,21 +19,21 @@
|
||||
|
||||
|
||||
Name: shared-mime-info
|
||||
BuildRequires: glib2-devel
|
||||
BuildRequires: intltool
|
||||
BuildRequires: libxml2-devel
|
||||
BuildRequires: translation-update-upstream
|
||||
Version: 0.90
|
||||
Release: 3
|
||||
Version: 0.91
|
||||
Release: 1
|
||||
Url: http://freedesktop.org/wiki/Software/shared-mime-info
|
||||
Group: System/X11/Utilities
|
||||
License: GPLv2+
|
||||
Summary: Shared MIME Database
|
||||
Source: %{name}-%{version}.tar.bz2
|
||||
Source: http://people.freedesktop.org/~hadess/%{name}-%{version}.tar.xz
|
||||
Source1: mime-info-to-mime
|
||||
Source2: macros.shared-mime-info
|
||||
# PATCH-FIX-UPSTREAM shared-mime-info-fix-parallel-build.patch fdo#32127 vuntz@opensuse.org -- Fix parallel build, patch taken from upstream git.
|
||||
Patch0: shared-mime-info-fix-parallel-build.patch
|
||||
BuildRequires: glib2-devel
|
||||
BuildRequires: intltool
|
||||
BuildRequires: libxml2-devel
|
||||
BuildRequires: translation-update-upstream
|
||||
# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467
|
||||
BuildRequires: xz
|
||||
# needed by mime-info-to-mime:
|
||||
Requires: /bin/rm /bin/mkdir /usr/bin/fgrep
|
||||
# needed by update-mime-database
|
||||
@ -53,7 +53,6 @@ This package contains:
|
||||
%prep
|
||||
%setup -q
|
||||
translation-update-upstream
|
||||
%patch0 -p1
|
||||
|
||||
%build
|
||||
%configure
|
||||
|
Loading…
x
Reference in New Issue
Block a user