clean up two colliding patches

OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=75

util-linux-2.17.1-losetup-honor-documented-c-option

@@ -1,26 +0,0 @@
-From: Jeff Mahoney <jeffm@suse.com>
-Subject: losetup: Honor documented -c option
-References: bnc#583677
-
- losetup -h lists -c | --set-capacity as valid options, but doesn't
- actually accept -c.
-
- This patch fixes support for -c.
-
-Signed-off-by: Jeff Mahoney <jeffm@suse.com>
-Acked-by: Jeff Mahoney <jeffm@suse.com>
----
- mount/lomount.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/mount/lomount.c
-+++ b/mount/lomount.c
-@@ -1065,7 +1065,7 @@ main(int argc, char **argv) {
- 	if ((p = strrchr(progname, '/')) != NULL)
- 		progname = p+1;
- 
--	while ((c = getopt_long(argc, argv, "ade:E:fhj:k:o:p:rsvH:",
-+	while ((c = getopt_long(argc, argv, "ade:E:fhj:k:o:p:rsvH:c",
- 				longopts, NULL)) != -1) {
- 		switch (c) {
- 		case 'a':

util-linux-2.17.1-mount_losetup_crypto.patch

@@ -313,7 +313,7 @@ Index: util-linux-2.19-rc1/mount/lomount.c
  		progname = p+1;
  
 -	while ((c = getopt_long(argc, argv, "acde:E:fhj:o:p:rsv",
-+	while ((c = getopt_long(argc, argv, "ade:E:fhj:k:o:p:rsvH:",
++	while ((c = getopt_long(argc, argv, "acde:E:fhj:k:o:p:rsvH:",
  				longopts, NULL)) != -1) {
  		switch (c) {
  		case 'a':

util-linux.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Apr 14 16:27:27 UTC 2011 - puzel@novell.com
+
+- merge util-linux-2.17.1-losetup-honor-documented-c-option and
+  util-linux-2.17.1-mount_losetup_crypto.patch)
+
 -------------------------------------------------------------------
 Mon Feb 21 16:28:38 UTC 2011 - puzel@novell.com
 

util-linux.spec

@@ -80,7 +80,6 @@ Source51:       blkid.conf
 Patch1:         util-linux-2.12r-fdisk_remove_bogus_warnings.patch
 # crypto patch
 Patch3:         util-linux-2.17.1-mount_losetup_crypto.patch
-Patch4:         util-linux-2.17.1-losetup-honor-documented-c-option
 Patch5:         umount-by-imgname.patch
 ##
 ## adjtimex
@@ -182,7 +181,6 @@ Files to develop applications using the libmount library.
 %setup -q -a 9 -b 11 -b 12 -b 13 -n %{name}-%{version}
 %patch1 -p1
 %patch3 -p1
-%patch4 -p1
 %patch5 -p1
 
 #