Hello community, here is the log from the commit of package vdr for openSUSE:Factory checked in at 2015-10-06 13:25:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vdr (Old) and /work/SRC/openSUSE:Factory/.vdr.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vdr" Changes: -------- --- /work/SRC/openSUSE:Factory/vdr/vdr.changes 2015-06-08 08:31:12.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.vdr.new/vdr.changes 2015-10-06 13:25:26.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Sep 28 07:34:04 UTC 2015 - [email protected] + +- add patch vdr-2.2.0-use-ncurses5.diff and apply if ncurses6 is + used (fixes build on Factory) + +------------------------------------------------------------------- New: ---- vdr-2.2.0-use-ncurses5.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vdr.spec ++++++ --- /var/tmp/diff_new_pack.lD7AfM/_old 2015-10-06 13:25:27.000000000 +0200 +++ /var/tmp/diff_new_pack.lD7AfM/_new 2015-10-06 13:25:27.000000000 +0200 @@ -61,6 +61,7 @@ Patch4: vdr-2.2.0-dynamite.patch Patch5: vdr-2.0.4-MainMenuHooks-v1_0_1.patch Patch6: vdr-2.0.6-wareagle-fix.patch +Patch7: vdr-2.2.0-use-ncurses5.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: vdr-devel @@ -108,6 +109,16 @@ %patch5 -p1 %patch6 -p1 # +## hack to apply patch7 either in rpmbuild if ncurses6 or during "quilt setup" +case "`rpm -q ncurses-devel`" in + ncurses-devel-6*) NCURSES6=true ;; + *) NCURSES6=false ;; +esac +if $NCURSES6 || [ "$TEXTDOMAIN" = quilt ]; then +%patch7 -p1 +fi +# +# cat > Make.config <<EOF ### The C compiler options: CFLAGS = $RPM_OPT_FLAGS -fPIC -Wall ++++++ vdr-2.2.0-use-ncurses5.diff ++++++ Index: b/PLUGINS/src/skincurses/skincurses.c =================================================================== --- a/PLUGINS/src/skincurses/skincurses.c +++ b/PLUGINS/src/skincurses/skincurses.c @@ -6,7 +6,7 @@ * $Id: skincurses.c 3.3 2015/02/17 13:13:17 kls Exp $ */ -#include <ncurses.h> +#include <ncurses5/ncurses.h> #include <vdr/osd.h> #include <vdr/plugin.h> #include <vdr/skins.h>
