From 96c896acbe47dd09a8615f72dcd202cd23cbc3654f57c63b26b09788ab4e1926 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Tue, 7 Jun 2011 07:19:34 +0000 Subject: [PATCH] Accepting request 72817 from multimedia:apps Also fix spec file encoding OBS-URL: https://build.opensuse.org/request/show/72817 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/zvbi?expand=0&rev=13 --- fix-headers.patch | 36 ++++++++++++++++++++++++++++++++++++ zvbi.changes | 9 +++++++-- zvbi.spec | 10 ++++++---- 3 files changed, 49 insertions(+), 6 deletions(-) create mode 100644 fix-headers.patch diff --git a/fix-headers.patch b/fix-headers.patch new file mode 100644 index 0000000..d852f69 --- /dev/null +++ b/fix-headers.patch @@ -0,0 +1,36 @@ +Index: src/io-dvb.c +=================================================================== +--- src/io-dvb.c.orig ++++ src/io-dvb.c +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + + #ifndef HAVE_S64_U64 + /* Linux 2.6.x asm/types.h defines __s64 and __u64 only +Index: src/io-v4l.c +=================================================================== +--- src/io-v4l.c.orig ++++ src/io-v4l.c +@@ -43,6 +43,7 @@ static const char rcsid [] = + #include /* timeval */ + #include /* fd_set, uid_t */ + #include /* for (_)videodev.h */ ++#include + #include + + #include "videodev.h" +Index: contrib/ntsc-cc.c +=================================================================== +--- contrib/ntsc-cc.c.orig ++++ contrib/ntsc-cc.c +@@ -34,6 +34,7 @@ + #include + #include + #include ++#include + #include + #ifdef HAVE_GETOPT_LONG + # include diff --git a/zvbi.changes b/zvbi.changes index a62b422..b44e6cc 100644 --- a/zvbi.changes +++ b/zvbi.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jun 6 08:12:49 UTC 2011 - aj@suse.de + +- Add missing includes for + ------------------------------------------------------------------- Thu Sep 11 13:55:53 CEST 2008 - mmarek@suse.cz @@ -123,7 +128,7 @@ Thu Jun 19 21:52:46 CEST 2003 - ro@suse.de ------------------------------------------------------------------- Tue May 27 15:15:45 CEST 2003 - ro@suse.de -- add .la file to devel file list +- add .la file to devel file list ------------------------------------------------------------------- Mon Feb 17 12:59:53 CET 2003 - kraxel@suse.de @@ -153,7 +158,7 @@ Wed Nov 13 15:02:42 CET 2002 - kraxel@suse.de ------------------------------------------------------------------- Mon Nov 11 17:45:55 CET 2002 - ro@suse.de -- use x-devel-packages in neededforbuild +- use x-devel-packages in neededforbuild ------------------------------------------------------------------- Mon Jun 17 15:55:21 CEST 2002 - kraxel@suse.de diff --git a/zvbi.spec b/zvbi.spec index 7b1b702..f2e86ba 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -1,7 +1,7 @@ # # spec file for package zvbi (Version 0.2.33) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,6 +28,7 @@ Version: 0.2.33 Release: 1 Summary: Linux "VBI proxy" Source: %{name}-%{version}.tar.bz2 +Patch1: fix-headers.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -44,7 +45,7 @@ Authors: -------- Edgar Toernig Michael H. Schimek - Iñaki García Etxebarria + Iñaki García Etxebarria %package -n libzvbi0 License: LGPL v2.0 or later @@ -67,7 +68,7 @@ Authors: -------- Edgar Toernig Michael H. Schimek - Iñaki García Etxebarria + Iñaki García Etxebarria %package devel License: GPL v2 or later @@ -85,10 +86,11 @@ Authors: -------- Edgar Toernig Michael H. Schimek - Iñaki García Etxebarria + Iñaki García Etxebarria %prep %setup -q +%patch1 %build ACLOCAL="aclocal -I m4" autoreconf -fi