rpms/util-linux-ng/F-11 util-linux-ng-2.14-sfdisk-dump.patch, NONE, 1.1 util-linux-ng.spec, 1.46, 1.47

[kzak]

Author: kzak

Update of /cvs/pkgs/rpms/util-linux-ng/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5870

Modified Files:
	util-linux-ng.spec 
Added Files:
	util-linux-ng-2.14-sfdisk-dump.patch 
Log Message:
* Fri Sep 11 2009 Karel Zak <kzak at redhat.com> 2.14.2-10
- fix #522718 - sfdisk -d /dev/xxx | sfdisk --force /dev/yyy fails when LANG is set 


util-linux-ng-2.14-sfdisk-dump.patch:
 sfdisk.c |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

--- NEW FILE util-linux-ng-2.14-sfdisk-dump.patch ---
>From 1f1614f6a89de4b06e1843d0fadbca3f8a5521fe Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak at redhat.com>
Date: Fri, 11 Sep 2009 14:00:50 +0200
Subject: [PATCH 1/2] sfdisk: dump has to be $LANG insensitive

This stupid bug has been introduced by:

	commit add5133f4ad5136aac3ce7627e615d14893d0aeb
	Author: Pedro Ribeiro <p.m42.ribeiro at gmail.com>
	Date:   Fri Oct 3 08:52:35 2008 +0200
	fdisk: several strings without gettext calls

... so it shows that we need to improve our review process... :-(

Address-Red-Hat-Bug: #522718
Signed-off-by: Karel Zak <kzak at redhat.com>
---
 fdisk/sfdisk.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/fdisk/sfdisk.c b/fdisk/sfdisk.c
index 8fae5bb..427cb40 100644
--- a/fdisk/sfdisk.c
+++ b/fdisk/sfdisk.c
@@ -930,8 +930,8 @@ get_disksize(int format) {
 static void
 out_partition_header(char *dev, int format, struct geometry G) {
     if (dump) {
-	printf(_("# partition table of %s\n"), dev);
-	printf(_("unit: sectors\n\n"));
+	printf("# partition table of %s\n", dev);
+	printf("unit: sectors\n\n");
 	return;
     }
 
@@ -1059,12 +1059,12 @@ out_partition(char *dev, int format, struct part_desc *p,
     size = p->size;
 
     if (dump) {
-	printf(_(" start=%9lu"), start);
-	printf(_(", size=%9lu"), size);
+	printf(" start=%9lu", start);
+	printf(", size=%9lu", size);
 	if (p->ptype == DOS_TYPE) {
 	    printf(", Id=%2x", p->p.sys_type);
 	    if (p->p.bootable == 0x80)
-		printf(_(", bootable"));
+		printf(", bootable");
 	}
 	printf("\n");
 	return;
-- 
1.6.2.5



Index: util-linux-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/F-11/util-linux-ng.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- util-linux-ng.spec	1 Jun 2009 12:27:12 -0000	1.46
+++ util-linux-ng.spec	11 Sep 2009 12:27:08 -0000	1.47
@@ -2,7 +2,7 @@
 Summary: A collection of basic system utilities
 Name: util-linux-ng
 Version: 2.14.2
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv2 and GPLv2+ and BSD with advertising and Public Domain
 Group: System Environment/Base
 URL: ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng
@@ -120,6 +120,8 @@ Patch13: util-linux-ng-2.14-flock-segfau
 Patch14: util-linux-ng-2.14-renice-n.patch
 # 498984 - should man page for "mount" mention ext4?
 Patch15: util-linux-ng-2.14-mount-man-ext4.patch
+# 522718 - sfdisk -d /dev/xxx | sfdisk --force /dev/yyy fails when LANG is set
+Patch16: util-linux-ng-2.14-sfdisk-dump.patch
 
 %description
 The util-linux-ng package contains a large variety of low-level system
@@ -146,6 +148,7 @@ cp %{SOURCE8} %{SOURCE9} .
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
+%patch16 -p1
 
 %build
 unset LINGUAS || :
@@ -547,8 +550,11 @@ exit 0
 /sbin/losetup
 
 %changelog
+* Fri Sep 11 2009 Karel Zak <kzak at redhat.com> 2.14.2-10
+- fix #522718 - sfdisk -d /dev/xxx | sfdisk --force /dev/yyy fails when LANG is set 
+
 * Mon Jun  1 2009 Karel Zak <kzak at redhat.com> 2.14.2-9
-- #498984 - should man page for "mount" mention ext4?
+- fix #498984 - should man page for "mount" mention ext4?
 
 * Thu Apr  2 2009 Karel Zak <kzak at redhat.com> 2.14.2-8
 - fix #490769 - %post scriptlet failed (thanks to Dan Horak)