rpms/util-linux-ng/devel util-linux-ng-2.13-swapon-swsuspend.patch, 1.2, 1.3 util-linux-ng.spec, 1.21, 1.22

[Karel Zak (kzak)]

Author: kzak

Update of /cvs/pkgs/rpms/util-linux-ng/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17995

Modified Files:
	util-linux-ng-2.13-swapon-swsuspend.patch util-linux-ng.spec 
Log Message:
* Tue Apr 15 2008 Karel Zak <kzak at redhat.com> 2.13.1-7
- fix 244383 - libblkid uses TYPE="swsuspend" for S1SUSPEND/S2SUSPEND


util-linux-ng-2.13-swapon-swsuspend.patch:

Index: util-linux-ng-2.13-swapon-swsuspend.patch
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/util-linux-ng-2.13-swapon-swsuspend.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- util-linux-ng-2.13-swapon-swsuspend.patch	2 Apr 2008 14:12:59 -0000	1.2
+++ util-linux-ng-2.13-swapon-swsuspend.patch	15 Apr 2008 21:26:19 -0000	1.3
@@ -27,7 +27,7 @@
 +swap_is_suspend(const char *device) {
 +	const char *type = fsprobe_get_fstype_by_devname(device);
 +
-+	return (type && strcmp(type, "suspend") == 0) ? 1 : 0;
++	return (type && strcmp(type, "swsuspend") == 0) ? 1 : 0;
 +}
 +
 +/* calls mkswap */


Index: util-linux-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/util-linux-ng.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- util-linux-ng.spec	2 Apr 2008 14:12:59 -0000	1.21
+++ util-linux-ng.spec	15 Apr 2008 21:26:19 -0000	1.22
@@ -2,7 +2,7 @@
 Summary: A collection of basic system utilities
 Name: util-linux-ng
 Version: 2.13.1
-Release: 6%{?dist}
+Release: 7%{?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
@@ -524,6 +524,9 @@
 /sbin/losetup
 
 %changelog
+* Tue Apr 15 2008 Karel Zak <kzak at redhat.com> 2.13.1-7
+- fix 244383 - libblkid uses TYPE="swsuspend" for S1SUSPEND/S2SUSPEND
+
 * Wed Apr  2 2008 Karel Zak <kzak at redhat.com> 2.13.1-6
 - fix 439984 - backport mkswap -U