File s390-tools-sles11sp2-dasdfmt-percentage-conflict.patch of Package s390-tools

Index: s390-tools-1.15.0/dasdfmt/dasdfmt.8
===================================================================
--- s390-tools-1.15.0.orig/dasdfmt/dasdfmt.8
+++ s390-tools-1.15.0/dasdfmt/dasdfmt.8
@@ -3,7 +3,7 @@
 dasdfmt \- formatting of DASD (ECKD) disk drives.
 
 .SH SYNOPSIS
-\fBdasdfmt\fR [-h] [-t] [-v] [-y] [-p] [-P] [-m \fIstep\fR]
+\fBdasdfmt\fR [-h] [-t] [-v] [-y] [-p] [-Q] [-m \fIstep\fR]
 .br
         [-b \fIblksize\fR] [-l \fIvolser\fR] [-d \fIlayout\fR] [-P maxpar]
 .br
@@ -86,7 +86,7 @@ Do not use this option if you are using
 running in background or redirecting the output to a file.
 
 .TP
-\fB-P\fR or \fB--percentage\fR
+\fB-Q\fR or \fB--percentage\fR
 Print one line for each formatted cylinder showing the number of the
 cylinder and percentage of formatting process.
 Intended to be used by higher level interfaces.
Index: s390-tools-1.15.0/dasdfmt/dasdfmt.c
===================================================================
--- s390-tools-1.15.0.orig/dasdfmt/dasdfmt.c
+++ s390-tools-1.15.0/dasdfmt/dasdfmt.c
@@ -44,7 +44,7 @@ print_version (void)
  */
 static void exit_usage(int exitcode)
 {
-	printf("Usage: %s [-htvypPLVFk]\n"
+	printf("Usage: %s [-htvypQLVFk]\n"
 	       "	       [-l <volser>      | --label=<volser>]\n"
 	       "               [-b <blocksize>   | --blocksize=<blocksize>]\n"
 	       "               [-d <disk layout> | --disk_layout=<disk layout>]\n"
@@ -54,7 +54,7 @@ static void exit_usage(int exitcode)
 	       "       -V or --version  means print version\n"
 	       "       -L or --no_label means don't write disk label\n"
 	       "       -p or --progressbar means show a progress bar\n"
-	       "       -P or --percentage means show a progress in percent\n"
+	       "       -Q or --percentage means show a progress in percent\n"
 	       "       -m x or --hashmarks=x means show a hashmark every x "
 	       "cylinders\n"
 	       "       -v means verbose mode\n"
@@ -971,7 +971,7 @@ int main(int argc,char *argv[])
 			}
 			break;
 
-		case 'P':
+		case 'Q':
 			if (!(info.print_hashmarks || info.print_progressbar))
 				info.print_percentage = 1;
 			break;
Index: s390-tools-1.15.0/dasdfmt/dasdfmt.h
===================================================================
--- s390-tools-1.15.0.orig/dasdfmt/dasdfmt.h
+++ s390-tools-1.15.0/dasdfmt/dasdfmt.h
@@ -212,7 +212,7 @@ typedef struct format_data_t {
 	if (*endptr) ERRMSG_EXIT(EXIT_MISUSE,"%s: " str " "    \
 	"is in invalid format\n",prog_name);}
 
-#define dasdfmt_getopt_string "b:n:l:f:d:m:hpLtyvVFkYP:"
+#define dasdfmt_getopt_string "b:n:l:f:d:m:hpQLtyvVFkYP:"
 
 static struct option dasdfmt_getopt_long_options[]=
 {
@@ -223,7 +223,7 @@ static struct option dasdfmt_getopt_long
         { "force",       0, 0, 'F'},
         { "progressbar", 0, 0, 'p'},
         { "hashmarks",   1, 0, 'm'},
-	{ "percentage",  0, 0, 'P'},
+	{ "percentage",  0, 0, 'Q'},
         { "label",       1, 0, 'l'},
         { "devno",       1, 0, 'n'},
         { "device",      1, 0, 'f'},