From 985105075ba841cb33bea2f51c408c5066d7c234373382b0134cef1775d429c4 Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Tue, 3 Nov 2015 06:07:18 +0000 Subject: [PATCH] Accepting request 342138 from home:arvidjaar:bnc:953022 - Modify grub2-linguas.sh-no-rsync.patch to re-enable en@quot catalog (boo#953022). Other autogenerated catalogs still fail to build due to missing C.UTF-8 locale. OBS-URL: https://build.opensuse.org/request/show/342138 OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=186 --- grub2-linguas.sh-no-rsync.patch | 22 ++++++++-------------- grub2.changes | 7 +++++++ grub2.spec | 2 +- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/grub2-linguas.sh-no-rsync.patch b/grub2-linguas.sh-no-rsync.patch index 3f0415a..df9f653 100644 --- a/grub2-linguas.sh-no-rsync.patch +++ b/grub2-linguas.sh-no-rsync.patch @@ -4,24 +4,18 @@ Subject: disable rsync to make it possible to use in RPM build We need to create po/LINGUAS to generate message catalogs. Use linguas.sh to ensure we always use the same rules as upstream, but disable rsync. -Index: grub-2.00/linguas.sh +Index: grub-2.02~beta2/linguas.sh =================================================================== ---- grub-2.00.orig/linguas.sh -+++ grub-2.00/linguas.sh -@@ -1,6 +1,6 @@ +--- grub-2.02~beta2.orig/linguas.sh 2015-11-02 20:47:03.471686784 +0300 ++++ grub-2.02~beta2/linguas.sh 2015-11-02 20:48:15.707687638 +0300 +@@ -1,8 +1,8 @@ #!/bin/sh -rsync -Lrtvz --exclude=ko.po translationproject.org::tp/latest/grub/ po +#rsync -Lrtvz --exclude=ko.po translationproject.org::tp/latest/grub/ po - autogenerated="en@quot en@hebrew de@hebrew en@cyrillic en@greek en@arabic en@piglatin de_CH" +-autogenerated="en@quot en@hebrew de@hebrew en@cyrillic en@greek en@arabic en@piglatin de_CH" ++autogenerated="en@quot" # en@hebrew de@hebrew en@cyrillic en@greek en@arabic en@piglatin de_CH" -@@ -14,7 +14,7 @@ done - ( - cd po && ls *.po| cut -d. -f1 - for x in $autogenerated; do -- echo "$x"; -+ : echo "$x"; - done - ) | sort | uniq | xargs - ) >po/LINGUAS + + for x in $autogenerated; do diff --git a/grub2.changes b/grub2.changes index b7e14e2..508d98c 100644 --- a/grub2.changes +++ b/grub2.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Nov 1 21:30:02 UTC 2015 - arvidjaar@gmail.com + +- Modify grub2-linguas.sh-no-rsync.patch to re-enable en@quot catalog + (boo#953022). Other autogenerated catalogs still fail to build due + to missing C.UTF-8 locale. + ------------------------------------------------------------------- Fri Oct 30 10:09:02 UTC 2015 - mchang@suse.com diff --git a/grub2.spec b/grub2.spec index 6973643..ccce862 100644 --- a/grub2.spec +++ b/grub2.spec @@ -1,7 +1,7 @@ # # spec file for package grub2 # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed