From 704bf114eeda2db23c1512ceb2a7cf4190eda79914654d889fd5c61a10ef25bf Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 13 Dec 2010 11:30:32 +0000 Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/shared-mime-info revision 22.0 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/shared-mime-info?expand=0&rev=e6eb682813c9d9f31acac62f50fe9454 --- shared-mime-info.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared-mime-info.spec b/shared-mime-info.spec index b1cd462..fa588ec 100644 --- a/shared-mime-info.spec +++ b/shared-mime-info.spec @@ -24,7 +24,7 @@ BuildRequires: intltool BuildRequires: libxml2-devel BuildRequires: translation-update-upstream Version: 0.90 -Release: 1 +Release: 2 Url: http://freedesktop.org/wiki/Software/shared-mime-info Group: System/X11/Utilities License: GPLv2+ From fad5ec3535a1f2a90910e2c75d7c29046e8d6bd192054e7c2c5b13bca39816e4 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Tue, 14 Dec 2010 18:24:32 +0000 Subject: [PATCH 2/2] Accepting request 55994 from home:vuntz:branches:GNOME:Factory OBS-URL: https://build.opensuse.org/request/show/55994 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/shared-mime-info?expand=0&rev=21 --- shared-mime-info.changes | 8 ++++++++ shared-mime-info.spec | 5 ++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/shared-mime-info.changes b/shared-mime-info.changes index 112f345..24c117f 100644 --- a/shared-mime-info.changes +++ b/shared-mime-info.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Dec 14 19:07:26 CET 2010 - vuntz@opensuse.org + +- Just give up on the parallel build: it fails again. Since this + module is really small, it doesn't matter much anyway. +- Re-enable call to translation-update-upstream: bnc#658999 has + been fixed. + ------------------------------------------------------------------- Sun Dec 12 12:53:36 CET 2010 - vuntz@opensuse.org diff --git a/shared-mime-info.spec b/shared-mime-info.spec index fa588ec..96200e6 100644 --- a/shared-mime-info.spec +++ b/shared-mime-info.spec @@ -52,13 +52,12 @@ This package contains: %prep %setup -q -# Disabled because of bnc#658999: it adds ara.po, which is wrong and makes the build fail -#translation-update-upstream +translation-update-upstream %patch0 -p1 %build %configure -%__make %{?jobs:-j%jobs} +make %install %makeinstall