FTBFS: <sys/sysmacros.h> included where "major" and "minor" macros are in use

(cdrkit-1.1.11-sysmacros.patch added)
https://bugzilla.redhat.com/show_bug.cgi?id=1263599 - man page clarified
  (cdrkit-1.1.11-manpagefix.patch modified)

cdrkit-1.1.11-manpagefix.patch

@@ -1,7 +1,17 @@
-diff -up cdrkit-1.1.11/genisoimage/genisoimage.1.orig cdrkit-1.1.11/genisoimage/genisoimage.1
+diff -up wrk/genisoimage/genisoimage.1.wrk wrk/genisoimage/genisoimage.1
---- cdrkit-1.1.11/genisoimage/genisoimage.1.orig	2011-01-21 14:26:20.709816708 +0100
+--- wrk/genisoimage/genisoimage.1.wrk	2017-01-04 15:58:13.697936687 +0100
-+++ cdrkit-1.1.11/genisoimage/genisoimage.1	2011-01-24 08:49:24.283964211 +0100
++++ wrk/genisoimage/genisoimage.1	2017-01-04 16:08:22.411801026 +0100
-@@ -180,6 +180,8 @@ in the
+@@ -115,7 +115,8 @@ is the path of the directory tree to be
+ Multiple paths can be specified, and
+ .B genisoimage
+ will merge the files found in all of the specified path components to
+-form the filesystem image.
++form the filesystem image. If an error is encountered while handling directory tree, 
++only error messages are produced and the process is aborted - incomplete image is not created.
+ .PP
+ If the option
+ .B \-graft\-points
+@@ -180,6 +181,8 @@ in the
  file.
  .TP
  .BI \-A " application_id"
@@ -10,7 +20,7 @@ diff -up cdrkit-1.1.11/genisoimage/genisoimage.1.orig cdrkit-1.1.11/genisoimage/
  Specifies a text string that will be written into the volume header.
  This should describe the application that will be on the disc.  There
  is space for 128 characters.  Equivalent to
-@@ -365,6 +367,8 @@ the Sun disk label will overlay the firs
+@@ -365,6 +368,8 @@ the Sun disk label will overlay the firs
  boot image.
  .TP
  .BI \-b " eltorito_boot_image"
@@ -19,7 +29,7 @@ diff -up cdrkit-1.1.11/genisoimage/genisoimage.1.orig cdrkit-1.1.11/genisoimage/
  Specifies the path and filename of the boot image to be used when making
  an El Torito bootable CD for x86 PCs. The pathname must be relative to
  the source path specified to
-@@ -427,6 +431,8 @@ See the
+@@ -427,6 +432,8 @@ See the
  section for a description of this table.
  .TP
  .BI \-C " last_sess_start,next_sess_start"
@@ -28,7 +38,7 @@ diff -up cdrkit-1.1.11/genisoimage/genisoimage.1.orig cdrkit-1.1.11/genisoimage/
  This option is needed to create a CD Extra or the image of a second
  session or a higher-level session for a multisession disc.
  .B \-C
-@@ -452,6 +458,8 @@ session on a CD Extra. This is a multise
+@@ -452,6 +459,8 @@ session on a CD Extra. This is a multise
  in the first session and an ISO9660 filesystem in the second session.
  .TP
  .BI \-c " boot_catalog"
@@ -37,7 +47,7 @@ diff -up cdrkit-1.1.11/genisoimage/genisoimage.1.orig cdrkit-1.1.11/genisoimage/
  Specifies the path and filename of the boot catalog, which is required
  for an El Torito bootable CD. The pathname must be relative to the source
  path specified to
-@@ -488,6 +496,12 @@ For the parameter 
+@@ -488,6 +497,12 @@ For the parameter
  see the description of
  .BR \-M .
  .TP
@@ -50,7 +60,7 @@ diff -up cdrkit-1.1.11/genisoimage/genisoimage.1.orig cdrkit-1.1.11/genisoimage/
  .BI \-copyright " file"
  Specifies copyright information, typically a filename on the disc.
  There is space for 37 characters.  Equivalent to
-@@ -497,12 +511,16 @@ in the
+@@ -497,12 +512,16 @@ in the
  file.
  .TP
  .B \-d
@@ -67,7 +77,7 @@ diff -up cdrkit-1.1.11/genisoimage/genisoimage.1.orig cdrkit-1.1.11/genisoimage/
  Do not use deep directory relocation, and instead just pack them in the
  way we see them.
  .br
-@@ -510,6 +528,9 @@ If ISO9660:1999 has not been selected,
+@@ -510,6 +529,9 @@ If ISO9660:1999 has not been selected,
  this violates the ISO9660 standard, but it happens to work on many systems.
  Use with caution.
  .TP
@@ -77,7 +87,7 @@ diff -up cdrkit-1.1.11/genisoimage/genisoimage.1.orig cdrkit-1.1.11/genisoimage/
  .BI \-dir\-mode " mode"
  Overrides the mode of directories used to create the image to
  .IR mode ,
-@@ -535,7 +556,14 @@ another directory
+@@ -535,7 +557,14 @@ another directory
  needs to include all needed files (filenames must be all caps) for a
  compliant DVD-Video filesystem.
  .TP
@@ -92,7 +102,7 @@ diff -up cdrkit-1.1.11/genisoimage/genisoimage.1.orig cdrkit-1.1.11/genisoimage/
  Follow symbolic links when generating the filesystem.  When this option is not
  in use, symbolic links will be entered using Rock Ridge if enabled, otherwise
  they will be ignored.
-@@ -740,6 +768,8 @@ See the
+@@ -740,6 +769,8 @@ See the
  section below for more details.
  .TP
  .B \-l
@@ -101,7 +111,7 @@ diff -up cdrkit-1.1.11/genisoimage/genisoimage.1.orig cdrkit-1.1.11/genisoimage/
  Allow full 31-character filenames.  Normally the ISO9660 filename will be in an
  8.3 format which is compatible with MS-DOS, even though the ISO9660 standard
  allows filenames of up to 31 characters.  If you use this option, the disc may
-@@ -870,6 +900,8 @@ with
+@@ -870,6 +901,8 @@ with
  .BR \-C .
  .TP
  .B \-N
@@ -110,7 +120,7 @@ diff -up cdrkit-1.1.11/genisoimage/genisoimage.1.orig cdrkit-1.1.11/genisoimage/
  Omit version numbers from ISO9660 filenames.
  .br
  This violates the ISO9660 standard, but no one really uses the
-@@ -967,6 +999,8 @@ in the
+@@ -967,6 +1000,8 @@ in the
  file.
  .TP
  .BI \-p " preparer_id"
@@ -119,7 +129,7 @@ diff -up cdrkit-1.1.11/genisoimage/genisoimage.1.orig cdrkit-1.1.11/genisoimage/
  Specifies a text string that will be written into the volume header.
  This should describe the preparer of the CD-ROM, usually with a mailing
  address and phone number.  There is space for 128 characters.
-@@ -1008,10 +1042,14 @@ This makes
+@@ -1008,10 +1043,14 @@ This makes
  even less verbose.  No progress output will be provided.
  .TP
  .B \-R
@@ -134,7 +144,7 @@ diff -up cdrkit-1.1.11/genisoimage/genisoimage.1.orig cdrkit-1.1.11/genisoimage/
  This is like the \-R option, but file ownership and modes are set to
  more useful values.  The uid and gid are set to zero, because they are
  usually only useful on the author's system, and not useful to the
-@@ -1092,6 +1130,11 @@ intentionally. Accessing several older v
+@@ -1092,6 +1131,11 @@ intentionally. Accessing several older v
  support by the operating system to choose which sessions are to be
  mounted.
  .TP
@@ -146,7 +156,7 @@ diff -up cdrkit-1.1.11/genisoimage/genisoimage.1.orig cdrkit-1.1.11/genisoimage/
  .BI \-sort " sort_file"
  Sort file locations on the media. Sorting is controlled by a file that
  contains pairs of filenames and sorting offset weighting.
-@@ -1213,6 +1256,8 @@ in the
+@@ -1213,6 +1257,8 @@ in the
  file.
  .TP
  .B \-T
@@ -155,7 +165,7 @@ diff -up cdrkit-1.1.11/genisoimage/genisoimage.1.orig cdrkit-1.1.11/genisoimage/
  Generate a file
  .I TRANS.TBL
  in each directory on the CD-ROM, which can be used
-@@ -1262,6 +1307,8 @@ to
+@@ -1262,6 +1308,8 @@ to
  This option is the default on VMS. 
  .TP
  .B \-U
@@ -164,7 +174,7 @@ diff -up cdrkit-1.1.11/genisoimage/genisoimage.1.orig cdrkit-1.1.11/genisoimage/
  Allows "untranslated" filenames, completely violating the ISO9660 standards
  described above.  Enables the following flags:
  .B \-d \-l \-N \-allow\-leading\-dots \-relaxed\-filenames
-@@ -1333,6 +1380,8 @@ must be specified before
+@@ -1333,6 +1381,8 @@ must be specified before
  on each command line.
  .TP
  .B \-v
@@ -173,7 +183,7 @@ diff -up cdrkit-1.1.11/genisoimage/genisoimage.1.orig cdrkit-1.1.11/genisoimage/
  Verbose execution. If given twice on the command line, extra debug information
  will be printed.
  .TP
-@@ -1341,7 +1390,15 @@ Identical to
+@@ -1341,7 +1391,15 @@ Identical to
  .B \-m
  .IR glob .
  .TP

cdrkit-1.1.11-sysmacros.patch

@@ -0,0 +1,60 @@
+diff -up wrk/genisoimage/rock.c.wrk wrk/genisoimage/rock.c
+--- wrk/genisoimage/rock.c.wrk	2017-01-04 14:25:54.879670532 +0100
++++ wrk/genisoimage/rock.c	2017-01-04 15:11:38.061228649 +0100
+@@ -39,6 +39,11 @@
+ #include <device.h>
+ #include <schily.h>
+ 
++/* "major" and "minor" macros will be moved to sysmacros.h
++ * silence the warning
++ * added by cdrkit-1.1.11-sysmacros.patch */
++#include <sys/sysmacros.h>
++
+ #define	SU_VERSION 1
+ 
+ #define	SL_ROOT    8
+diff -up wrk/genisoimage/tree.c.wrk wrk/genisoimage/tree.c
+--- wrk/genisoimage/tree.c.wrk	2017-01-04 14:21:47.472189363 +0100
++++ wrk/genisoimage/tree.c	2017-01-04 15:13:32.989466729 +0100
+@@ -50,6 +50,11 @@
+ #include <schily.h>
+ #include <libgen.h>
+ 
++/* "major" and "minor" macros will be moved to sysmacros.h
++ * silence the warning
++ * added by cdrkit-1.1.11-sysmacros.patch */
++#include <sys/sysmacros.h>
++
+ extern int allow_limited_size;
+ 
+ #ifdef VMS
+diff -up wrk/icedax/interface.c.wrk wrk/icedax/interface.c
+--- wrk/icedax/interface.c.wrk	2017-01-04 14:46:54.298203958 +0100
++++ wrk/icedax/interface.c	2017-01-04 15:14:06.333535804 +0100
+@@ -55,6 +55,11 @@
+ #include <sys/ioctl.h>
+ #include <statdefs.h>
+ 
++/* "major" and "minor" macros will be moved to sysmacros.h
++ * silence the warning
++ * added by cdrkit-1.1.11-sysmacros.patch */
++#include <sys/sysmacros.h>
++
+ 
+ #include "mycdrom.h"
+ #include "lowlevel.h"
+diff -up wrk/icedax/ioctl.c.wrk wrk/icedax/ioctl.c
+--- wrk/icedax/ioctl.c.wrk	2017-01-04 14:49:45.834583930 +0100
++++ wrk/icedax/ioctl.c	2017-01-04 15:15:10.268668248 +0100
+@@ -36,6 +36,11 @@
+ #include <schily.h>
+ #include <device.h>
+ 
++/* "major" and "minor" macros will be moved to sysmacros.h
++ * silence the warning
++ * added by cdrkit-1.1.11-sysmacros.patch */
++#include <sys/sysmacros.h>
++
+ #include <usal/scsitransp.h>
+ 
+ #include "mycdrom.h"

cdrkit.spec

@@ -1,7 +1,7 @@
 Summary: A collection of CD/DVD utilities
 Name: cdrkit
 Version: 1.1.11
-Release: 31%{?dist}
+Release: 32%{?dist}
 License: GPLv2
 Group: Applications/System
 URL: http://cdrkit.org/
@@ -26,6 +26,7 @@ Patch17: cdrkit-1.1.11-memset.patch
 Patch19: cdrkit-1.1.11-ppc64le_elfheader.patch
 Patch20: cdrkit-1.1.11-werror_gcc5.patch
 Patch21: cdrkit-1.1.11-devname.patch
+Patch22: cdrkit-1.1.11-sysmacros.patch
 
 BuildRequires: cmake libcap-devel zlib-devel perl perl-generators file-devel bzip2-devel
 
@@ -138,6 +139,7 @@ SCSI devices.
 %patch19 -p1 -b .elfheader
 %patch20 -p1 -b .werror_gcc5
 %patch21 -p1 -b .devname
+%patch22 -p1 -b .sysmacros
 
 # we do not want bundled paranoia library
 rm -rf libparanoia
@@ -149,7 +151,7 @@ find doc -type f -print0 | xargs -0 chmod a-x
 %build
 mkdir fedora
 cd fedora
-export CFLAGS="$RPM_OPT_FLAGS -Wall -Werror -Wno-unused-function -Wno-unused-variable -Wno-unused-but-set-variable -Wno-array-bounds -fno-strict-aliasing -Wno-logical-not-parentheses -Wno-error=misleading-indentation"
+export CFLAGS="$RPM_OPT_FLAGS -Wall -Werror -Wno-unused-function -Wno-unused-variable -Wno-unused-but-set-variable -Wno-array-bounds -fno-strict-aliasing -Wno-logical-not-parentheses -Wno-error=misleading-indentation  -Wno-misleading-indentation"
 export CXXFLAGS="$CFLAGS"
 export FFLAGS="$CFLAGS"
 %cmake CMAKE_VERBOSE=1 \
@@ -302,6 +304,12 @@ fi
 %{_includedir}/usal
 
 %changelog
+* Wed Jan 04 2017 Frantisek Kluknavsky <fkluknav@redhat.com> - 1.1.11-32
+- FTBFS: <sys/sysmacros.h> included where "major" and "minor" macros are in use
+  (cdrkit-1.1.11-sysmacros.patch added)
+- https://bugzilla.redhat.com/show_bug.cgi?id=1263599 - man page clarified
+  (cdrkit-1.1.11-manpagefix.patch modified)
+
 * Tue Feb 16 2016 Frantisek Kluknavsky <fkluknav@redhat.com> - 1.1.11-31
 - FTBFS: added -Wno-error=misleading-indentation