rpms/util-linux-ng/devel util-linux-ng-2.14-sfdisk-dump.patch, NONE, 1.1 util-linux-ng-2.16-blkid-swsuspend.patch, NONE, 1.1 util-linux-ng.spec, 1.58, 1.59

[kzak]

Author: kzak

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

Modified Files:
	util-linux-ng.spec 
Added Files:
	util-linux-ng-2.14-sfdisk-dump.patch 
	util-linux-ng-2.16-blkid-swsuspend.patch 
Log Message:
* Mon Sep 14 2009 Karel Zak <kzak at redhat.com> 2.16-9
- fix #522718 - sfdisk -d /dev/xxx | sfdisk --force /dev/yyy fails when LANG is set
- fix typo in swsuspend detection


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


util-linux-ng-2.16-blkid-swsuspend.patch:
 swap.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE util-linux-ng-2.16-blkid-swsuspend.patch ---
>From 71cd5d8a775d98e93f7583210a5b53c52b4ec34f Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak at redhat.com>
Date: Mon, 14 Sep 2009 10:24:07 +0200
Subject: [PATCH] libblkid: fix typo (swsupend -> swsuspend)

Signed-off-by: Karel Zak <kzak at redhat.com>
---
 shlibs/blkid/src/probers/swap.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/shlibs/blkid/src/probers/swap.c b/shlibs/blkid/src/probers/swap.c
index 86eb94c..c289488 100644
--- a/shlibs/blkid/src/probers/swap.c
+++ b/shlibs/blkid/src/probers/swap.c
@@ -118,7 +118,7 @@ const struct blkid_idinfo swap_idinfo =
 
 const struct blkid_idinfo swsuspend_idinfo =
 {
-	.name		= "swsupend",
+	.name		= "swsuspend",
 	.usage		= BLKID_USAGE_OTHER,
 	.probefunc	= probe_swsuspend,
 	.magics		=
-- 
1.6.2.5



Index: util-linux-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/util-linux-ng.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- util-linux-ng.spec	26 Aug 2009 16:05:05 -0000	1.58
+++ util-linux-ng.spec	14 Sep 2009 08:40:51 -0000	1.59
@@ -2,7 +2,7 @@
 Summary: A collection of basic system utilities
 Name: util-linux-ng
 Version: 2.16
-Release: 8%{?dist}
+Release: 9%{?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
@@ -110,6 +110,10 @@ Patch8: util-linux-ng-2.15-ipcs-32bit.pa
 Patch9: util-linux-ng-2.16-libblkid-ext2.patch
 # 518572 -  blkid requires ext2.ko to be decompressed on installation media 
 Patch10: util-linux-ng-2.16-libblkid-compression.patch
+# 522718 - sfdisk -d /dev/xxx | sfdisk --force /dev/yyy fails when LANG is set
+Patch11: util-linux-ng-2.14-sfdisk-dump.patch
+# Swsuspend does not work
+Patch12: util-linux-ng-2.16-blkid-swsuspend.patch
 
 %description
 The util-linux-ng package contains a large variety of low-level system
@@ -206,6 +210,8 @@ cp %{SOURCE8} %{SOURCE9} .
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
+%patch12 -p1
 
 %build
 unset LINGUAS || :
@@ -716,6 +722,10 @@ fi
 
 
 %changelog
+* Mon Sep 14 2009 Karel Zak <kzak at redhat.com> 2.16-9
+- fix #522718 - sfdisk -d /dev/xxx | sfdisk --force /dev/yyy fails when LANG is set
+- fix typo in swsuspend detection
+
 * Wed Aug 26 2009 Tomas Mraz <tmraz at redhat.com> - 2.16-8
 - rebuilt with new audit