From 71b5113d8b5590e627d14ab943c7e755a7d6a43b61114e9a46d03f5c33c51637 Mon Sep 17 00:00:00 2001 From: Petr Uzel Date: Thu, 14 Apr 2011 16:48:17 +0000 Subject: [PATCH] clean up two colliding patches OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=75 --- ...x-2.17.1-losetup-honor-documented-c-option | 26 ------------------- util-linux-2.17.1-mount_losetup_crypto.patch | 2 +- util-linux.changes | 6 +++++ util-linux.spec | 2 -- 4 files changed, 7 insertions(+), 29 deletions(-) delete mode 100644 util-linux-2.17.1-losetup-honor-documented-c-option diff --git a/util-linux-2.17.1-losetup-honor-documented-c-option b/util-linux-2.17.1-losetup-honor-documented-c-option deleted file mode 100644 index 6a3bb68..0000000 --- a/util-linux-2.17.1-losetup-honor-documented-c-option +++ /dev/null @@ -1,26 +0,0 @@ -From: Jeff Mahoney -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 -Acked-by: Jeff Mahoney ---- - 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': diff --git a/util-linux-2.17.1-mount_losetup_crypto.patch b/util-linux-2.17.1-mount_losetup_crypto.patch index c12e577..cd37eac 100644 --- a/util-linux-2.17.1-mount_losetup_crypto.patch +++ b/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': diff --git a/util-linux.changes b/util-linux.changes index 88e4ac1..ac3d0fd 100644 --- a/util-linux.changes +++ b/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 diff --git a/util-linux.spec b/util-linux.spec index 7a77494..7b87206 100644 --- a/util-linux.spec +++ b/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 #