From 700d5e020c73f59f26c45d98d5d017f281505c35 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sun, 26 Apr 2015 17:18:06 +0000 Subject: [PATCH] Fix for f22 --- libdvbpsi-backport-werror_on_debug.patch | 28 ++++++++++++++++++++++++ libdvbpsi.spec | 11 ++++++++-- 2 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 libdvbpsi-backport-werror_on_debug.patch diff --git a/libdvbpsi-backport-werror_on_debug.patch b/libdvbpsi-backport-werror_on_debug.patch new file mode 100644 index 0000000..74c6655 --- /dev/null +++ b/libdvbpsi-backport-werror_on_debug.patch @@ -0,0 +1,28 @@ +commit 09f9fad68e34975f8a90de564f3f12820947f22e +Author: Jean-Paul Saman +Date: Mon Sep 8 12:27:07 2014 +0200 + + configure.ac: specify -Werror on debug builds only. + +diff --git a/configure.ac b/configure.ac +index 66e5fec..2585a8f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -22,7 +22,7 @@ dnl store CFLAGS from user + CFLAGS_save="${CFLAGS}" + + dnl add features to CFLAGS +-CFLAGS_dist="-Wall -Werror --std=gnu99 -D_GNU_SOURCE" ++CFLAGS_dist="-Wall -std=gnu99 -D_GNU_SOURCE" + CFLAGS_dist="${CFLAGS_dist} -Wpointer-arith -Wcast-align -Wstrict-prototypes -Wshadow -Waggregate-return -Wmissing-prototypes -Wnested-externs -Wsign-compare" + + dnl check the operating system +@@ -52,7 +52,7 @@ AC_ARG_ENABLE(debug, + esac],[debug=false]) + if test "$debug" = "true" + then +- CFLAGS_dist="${CFLAGS_dist} -ggdb3" ++ CFLAGS_dist="${CFLAGS_dist} -Werror -ggdb3" + fi + + dnl --enable-gcc-sanitize diff --git a/libdvbpsi.spec b/libdvbpsi.spec index f11dd22..54d182d 100644 --- a/libdvbpsi.spec +++ b/libdvbpsi.spec @@ -1,14 +1,17 @@ #global pre _pre3 +%global _default_patch_fuzz 3 Summary: Library for MPEG TS and DVB PSI tables decoding and generation Name: libdvbpsi Version: 1.2.0 -Release: 1%{?pre}%{?dist} +Release: 2%{?pre}%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.videolan.org/developers/libdvbpsi.html Source0: http://download.videolan.org/pub/libdvbpsi/%{version}/%{name}-%{version}%{?pre}.tar.bz2 +Patch0: libdvbpsi-backport-werror_on_debug.patch BuildRequires: graphviz doxygen +BuildRequires: libtool %package devel Summary: Development package for %{name} @@ -28,7 +31,8 @@ This package contains development files for %{name} %prep %setup -q -n %{name}-%{version}%{?pre} - +%patch0 -p1 +autoreconf -vif %build @@ -57,6 +61,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la %changelog +* Sun Apr 26 2015 Nicolas Chauvet - 1.2.0-2 +- Backport patch to disable Werror - fix f22 + * Sat Nov 15 2014 Nicolas Chauvet - 1.2.0-1 - Update to 1.2.0