From 6879ffb2aaf4a6487821016c3b9f01b739f45dc7f67a5b8621763605ae16202e Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sun, 12 Dec 2010 14:28:24 +0000 Subject: [PATCH] Accepting request 55733 from home:vuntz:branches:GNOME:Factory Will fix the patch tag line, OBS-URL: https://build.opensuse.org/request/show/55733 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/shared-mime-info?expand=0&rev=18 --- shared-mime-info-fix-parallel-build.patch | 33 +++++++++++++++++++++++ shared-mime-info.changes | 8 ++++++ shared-mime-info.spec | 6 ++++- 3 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 shared-mime-info-fix-parallel-build.patch diff --git a/shared-mime-info-fix-parallel-build.patch b/shared-mime-info-fix-parallel-build.patch new file mode 100644 index 0000000..8889ac3 --- /dev/null +++ b/shared-mime-info-fix-parallel-build.patch @@ -0,0 +1,33 @@ +From 68e31f61f5e50e5222bc05437d1123e932922796 Mon Sep 17 00:00:00 2001 +From: Samuli Suominen +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; \ diff --git a/shared-mime-info.changes b/shared-mime-info.changes index c762335..112f345 100644 --- a/shared-mime-info.changes +++ b/shared-mime-info.changes @@ -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 diff --git a/shared-mime-info.spec b/shared-mime-info.spec index dcbfc7c..1e137d3 100644 --- a/shared-mime-info.spec +++ b/shared-mime-info.spec @@ -32,6 +32,8 @@ Summary: Shared MIME Database Source: %{name}-%{version}.tar.bz2 Source1: mime-info-to-mime Source2: macros.shared-mime-info +# PATCH-FIX-UPSTREAM shared-mime-info-fix-parallel-build.patch vuntz@opensuse.org -- Fix parallel build +Patch0: shared-mime-info-fix-parallel-build.patch # needed by mime-info-to-mime: Requires: /bin/rm /bin/mkdir /usr/bin/fgrep # needed by update-mime-database @@ -50,7 +52,9 @@ This package contains: %prep %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 %configure