[cdrkit] fixed FTBFS with gcc5, added cdrkit-1.1.11-werror_gcc5.patch

[Frantisek Kluknavsky]

commit 430adff64e50d914f1ea99b68e96a47cf1a02477
Author: Frantisek Kluknavsky <fkluknav at redhat.com>
Date:   Wed Feb 25 14:22:49 2015 +0100

    fixed FTBFS with gcc5, added cdrkit-1.1.11-werror_gcc5.patch

 cdrkit-1.1.11-werror_gcc5.patch | 22 ++++++++++++++++++++++
 cdrkit.spec                     |  9 +++++++--
 2 files changed, 29 insertions(+), 2 deletions(-)
---
diff --git a/cdrkit-1.1.11-werror_gcc5.patch b/cdrkit-1.1.11-werror_gcc5.patch
new file mode 100644
index 0000000..f98bd36
--- /dev/null
+++ b/cdrkit-1.1.11-werror_gcc5.patch
@@ -0,0 +1,22 @@
+diff -up wrk/genisoimage/exclude.c.wrk wrk/genisoimage/exclude.c
+--- wrk/genisoimage/exclude.c.wrk	2015-02-25 13:16:28.054237196 +0100
++++ wrk/genisoimage/exclude.c	2015-02-25 13:33:06.761312002 +0100
+@@ -39,7 +39,7 @@ exclude(char *fn)
+ {
+ 	register int	i;
+ 
+-	for (i = 0; excl[i] && i < MAXEXCL; i++)
++	for (i = 0; i < MAXEXCL && excl[i]; i++)
+ 		;
+ 
+ 	if (i == MAXEXCL) {
+@@ -69,7 +69,7 @@ is_excluded(char *fn)
+ 	/*
+ 	 * very dumb search method ...
+ 	 */
+-	for (i = 0; excl[i] && i < MAXEXCL; i++) {
++	for (i = 0; i < MAXEXCL && excl[i]; i++) {
+ 		if (strcmp(excl[i], fn) == 0) {
+ 			return (1);	/* found -> excluded filenmae */
+ 		}
+diff -up wrk/icedax/toc.c.wrk wrk/icedax/toc.c
diff --git a/cdrkit.spec b/cdrkit.spec
index 8300a16..77572a5 100644
--- a/cdrkit.spec
+++ b/cdrkit.spec
@@ -1,7 +1,7 @@
 Summary: A collection of CD/DVD utilities
 Name: cdrkit
 Version: 1.1.11
-Release: 26%{?dist}
+Release: 27%{?dist}
 License: GPLv2
 Group: Applications/System
 URL: http://cdrkit.org/
@@ -24,6 +24,7 @@ Patch15: cdrkit-1.1.11-utf8.patch
 Patch16: cdrkit-1.1.11-cmakewarn.patch
 Patch17: cdrkit-1.1.11-memset.patch
 Patch19: cdrkit-1.1.11-ppc64le_elfheader.patch
+Patch20: cdrkit-1.1.11-werror_gcc5.patch
 
 BuildRequires: cmake libcap-devel zlib-devel perl file-devel bzip2-devel
 
@@ -134,6 +135,7 @@ SCSI devices.
 %patch16 -p1 -b .cmakewarn
 %patch17 -p1 -b .edcspeed
 %patch19 -p1 -b .elfheader
+%patch20 -p1 -b .werror_gcc5
 
 # we do not want bundled paranoia library
 rm -rf libparanoia
@@ -145,7 +147,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"
+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"
 export CXXFLAGS="$CFLAGS"
 export FFLAGS="$CFLAGS"
 %cmake CMAKE_VERBOSE=1 \
@@ -298,6 +300,9 @@ fi
 %{_includedir}/usal
 
 %changelog
+* Wed Feb 25 2015 Frantisek Kluknavsky <fkluknav at redhat.com> - 1.1.11-27
+- fixed FTBFS with gcc5, added cdrkit-1.1.11-werror_gcc5.patch
+
 * Fri Nov 07 2014 Frantisek Kluknavsky <fkluknav at redhat.com> - 1.1.11-26
 - reverted back to cdda-paranoia, cdio has now incompatible GPLv3+ license