From 1e61fabde330d01ba5420fde2ae731db092f5877f2f15e1469a6aef38cb6cc6b Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Fri, 31 Aug 2007 14:07:34 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/zvbi?expand=0&rev=2

---
 zvbi-enable-dvb.diff | 10 -------
 zvbi-glibc27.diff    | 19 +++++++++++++
 zvbi.changes         |  6 +++++
 zvbi.spec            | 63 +++++++++++++++++++++-----------------------
 4 files changed, 55 insertions(+), 43 deletions(-)
 delete mode 100644 zvbi-enable-dvb.diff
 create mode 100644 zvbi-glibc27.diff

diff --git a/zvbi-enable-dvb.diff b/zvbi-enable-dvb.diff
deleted file mode 100644
index 0e1c9d4..0000000
--- a/zvbi-enable-dvb.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- vbi/src/io-dvb.c.dvb	2004-11-23 10:08:09.952858146 +0100
-+++ vbi/src/io-dvb.c	2004-11-23 10:08:18.826678289 +0100
-@@ -1,5 +1,5 @@
--#if 0
--#error untested
-+#if 1
-+// #error untested
- 
- /*
-  *  libzvbi -- dvb driver interface
diff --git a/zvbi-glibc27.diff b/zvbi-glibc27.diff
new file mode 100644
index 0000000..69b08d0
--- /dev/null
+++ b/zvbi-glibc27.diff
@@ -0,0 +1,19 @@
+---
+ src/chains.c |    6 ++++++
+ 1 file changed, 6 insertions(+)
+
+--- src/chains.c.orig
++++ src/chains.c
+@@ -168,6 +168,12 @@ static int is_vbi_device(const char *pat
+       return 0;
+ }
+ 
++/*
++ * Newer glibc defines an open() macro that checks the optional third
++ * argument, but calls the open() _function_ in the end, so undefining
++ * it here should be safe.
++ */
++#undef open
+ int open(const char *pathname, int flags, ...)
+ {
+    va_list args;
diff --git a/zvbi.changes b/zvbi.changes
index cde4a45..27d0275 100644
--- a/zvbi.changes
+++ b/zvbi.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Aug 31 10:57:39 CEST 2007 - mmarek@suse.cz
+
+- fixed build with new glibc
+- specfile cleanup
+
 -------------------------------------------------------------------
 Wed Jan 25 21:43:49 CET 2006 - mls@suse.de
 
diff --git a/zvbi.spec b/zvbi.spec
index c41cfba..ce29480 100644
--- a/zvbi.spec
+++ b/zvbi.spec
@@ -1,33 +1,33 @@
 #
 # spec file for package zvbi (Version 0.2.16)
 #
-# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
-# Please submit bugfixes or comments via http://www.suse.de/feedback/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
 # norootforbuild
 
-Name:         zvbi
-BuildRequires: doxygen gcc-c++ xorg-x11-devel
-URL:          http://zapping.sf.net/
-License:      GPL
-Group:        Development/Libraries/Other
-Autoreqprov:  on
-Version:      0.2.16
-Release:      4
-Summary:      VBI Decoding Library
-Source:       %{name}-%{version}.tar.bz2
-Patch1:       %{name}-gettext.diff
-Patch2:       %{name}-enable-dvb.diff
-BuildRoot:    %{_tmppath}/%{name}-%{version}-build
+Name:           zvbi
+BuildRequires:  doxygen gcc-c++ xorg-x11-devel
+URL:            http://zapping.sf.net/
+License:        GPL v2 or later
+Group:          Development/Libraries/Other
+Autoreqprov:    on
+Version:        0.2.16
+Release:        88
+Summary:        VBI Decoding Library
+Source:         %{name}-%{version}.tar.bz2
+Patch1:         zvbi-gettext.diff
+Patch2:         zvbi-glibc27.diff
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %package devel
-Group:        Development/Libraries/Other
-Summary:      VBI decoding library - devel package
-Requires:     zvbi = %{version}
-Requires:     glibc-devel
+Group:          Development/Libraries/Other
+Summary:        VBI decoding library - devel package
+Requires:       zvbi = %{version}
+Requires:       glibc-devel
 
 %description devel
 include files, static library, ...
@@ -61,11 +61,8 @@ Authors:
 
 %prep
 %setup -q
-#%setup -q -n vbi
-%if %suse_version > 810
 %patch1 -p1 -b .gettext
-%endif
-#%patch2 -p1 -b .dvb
+%patch2
 
 %build
 %{?suse_update_config -ft}
@@ -78,9 +75,11 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 make
 
 %install
-test "%{buildroot}" != "" -a "%{buildroot}" != "/" &&\
-	rm -rf "%{buildroot}"
 make DESTDIR="%{buildroot}" install
+%find_lang %name
+
+%clean
+rm -rf %buildroot
 
 %post
 %run_ldconfig
@@ -88,15 +87,14 @@ make DESTDIR="%{buildroot}" install
 %postun
 %run_ldconfig
 
-%files
+%files -f %name.lang
 %defattr(-,root,root)
 %{_bindir}/zvbi-chains
 %{_sbindir}/zvbid
 %{_libdir}/libzvbi*.so.*
 %{_mandir}/man1/zvbi-chains.1*
 %{_mandir}/man1/zvbid.1*
-/usr/share/locale/*/LC_MESSAGES/zvbi.mo
-%doc [A-LN-Z]*
+%doc AUTHORS BUGS COPYING ChangeLog NEWS README TODO
 
 %files devel
 %defattr(-,root,root)
@@ -106,11 +104,10 @@ make DESTDIR="%{buildroot}" install
 %{_libdir}/pkgconfig/zvbi-0.2.pc
 %doc doc/html
 
-%clean
-test "%{buildroot}" != "" -a "%{buildroot}" != "/" &&\
-	rm -rf "%{buildroot}"
-
-%changelog -n zvbi
+%changelog
+* Fri Aug 31 2007 - mmarek@suse.cz
+- fixed build with new glibc
+- specfile cleanup
 * Wed Jan 25 2006 - mls@suse.de
 - converted neededforbuild to BuildRequires
 * Mon Sep 26 2005 - mls@suse.de