From c94c5624907ae75d60a4489c83489e7d09652b9df93a4618a68951071b76eae2 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Wed, 26 Oct 2011 04:52:59 +0000 Subject: [PATCH] Accepting request 89309 from home:vuntz:branches:GNOME:Apps Fix build OBS-URL: https://build.opensuse.org/request/show/89309 OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/gnumeric?expand=0&rev=53 --- gnumeric.changes | 8 ++++++++ gnumeric.spec | 26 ++++++++------------------ 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/gnumeric.changes b/gnumeric.changes index 6109977..38207b9 100644 --- a/gnumeric.changes +++ b/gnumeric.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Oct 25 18:24:25 UTC 2011 - vuntz@opensuse.org + +- Use a more generic hack in %setup to remove incomplete + translations created by translation-update-upstream. Should fix + build breakages created when translation-update-upstream is + updated and adds new translations. + ------------------------------------------------------------------- Mon Oct 3 07:38:26 UTC 2011 - vuntz@opensuse.org diff --git a/gnumeric.spec b/gnumeric.spec index 357b94c..a582650 100644 --- a/gnumeric.spec +++ b/gnumeric.spec @@ -95,24 +95,14 @@ Gnumeric is part of the GNOME project. %setup -q translation-update-upstream translation-update-upstream po-functions gnumeric-functions -# translation-update-upstream provides incomplete upstream translations -# from the upstream git. Remove them until upstream provides a fix. See -# po/LINGUAS for more. -if test -f po-functions/id.po ; then - echo "\"id\" locale removal in gnumeric.spec is obsolete. Please remove it." -else - sed -i '/^id$/d' po/LINGUAS -fi -if test -f po-functions/pa.po ; then - echo "\"pa\" locale removal in gnumeric.spec is obsolete. Please remove it." -else - sed -i '/^pa$/d' po/LINGUAS -fi -if test -f po-functions/zh_HK.po ; then - echo "\"zh_HK\" locale removal in gnumeric.spec is obsolete. Please remove it." -else - sed -i '/^zh_HK$/d' po/LINGUAS -fi +# remove incomplete translations caused by translation-update-upstream (global LINGUAS file, two domains) +for LNG in po/*.po ; do + LNG=`basename ${LNG%%.po}` + if ! test -f po-functions/$LNG.po ; then + echo "Removing incomplete $LNG from LINGUAS." + sed -i "/^$LNG\$/d" po/LINGUAS + fi +done %build export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"