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

Accepting request 55785 from GNOME:Factory

Browse Source 
Accepted submit request 55785 from user vuntz

OBS-URL: https://build.opensuse.org/request/show/55785
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/shared-mime-info?expand=0&rev=21
This commit is contained in:
Marcus Rückert 2010-12-13 11:30:11 +00:00 committed by Git OBS Bridge
commit f9be267b27
3 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
shared-mime-info-fix-parallel-build.patch Normal file
View File

@ -0,0 +1,33 @@
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; \

8
shared-mime-info.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Sun Dec 12 12:53:36 CET 2010 - vuntz@opensuse.org
- Add shared-mime-info-fix-parallel-build.patch to fix parallel
build.
- Disable call to translation-update-upstream because it adds some
misnamed translations. See bnc#658999.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Dec 7 11:39:11 CET 2010 - vuntz@opensuse.org Tue Dec 7 11:39:11 CET 2010 - vuntz@opensuse.org

6
shared-mime-info.spec
View File

@ -32,6 +32,8 @@ Summary: Shared MIME Database
Source: %{name}-%{version}.tar.bz2 Source: %{name}-%{version}.tar.bz2
Source1: mime-info-to-mime Source1: mime-info-to-mime
Source2: macros.shared-mime-info 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
# needed by mime-info-to-mime: # needed by mime-info-to-mime:
Requires: /bin/rm /bin/mkdir /usr/bin/fgrep Requires: /bin/rm /bin/mkdir /usr/bin/fgrep
# needed by update-mime-database # needed by update-mime-database
@ -50,7 +52,9 @@ This package contains:
%prep %prep
%setup -q %setup -q
translation-update-upstream # Disabled because of bnc#658999: it adds ara.po, which is wrong and makes the build fail
#translation-update-upstream
%patch0 -p1
%build %build
%configure %configure