Hello community, here is the log from the commit of package zvbi checked in at Fri Aug 31 16:07:33 CEST 2007. -------- --- zvbi/zvbi.changes 2006-01-25 21:43:49.000000000 +0100 +++ /mounts/work_src_done/STABLE/zvbi/zvbi.changes 2007-08-31 11:08:04.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Aug 31 10:57:39 CEST 2007 - mmarek@suse.cz + +- fixed build with new glibc +- specfile cleanup + +------------------------------------------------------------------- Old: ---- zvbi-enable-dvb.diff New: ---- zvbi-glibc27.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zvbi.spec ++++++ --- /var/tmp/diff_new_pack.tp7428/_old 2007-08-31 16:07:22.000000000 +0200 +++ /var/tmp/diff_new_pack.tp7428/_new 2007-08-31 16:07:22.000000000 +0200 @@ -1,11 +1,11 @@ # # 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 @@ -13,15 +13,15 @@ Name: zvbi BuildRequires: doxygen gcc-c++ xorg-x11-devel URL: http://zapping.sf.net/ -License: GPL +License: GPL v2 or later Group: Development/Libraries/Other Autoreqprov: on Version: 0.2.16 -Release: 4 +Release: 88 Summary: VBI Decoding Library Source: %{name}-%{version}.tar.bz2 -Patch1: %{name}-gettext.diff -Patch2: %{name}-enable-dvb.diff +Patch1: zvbi-gettext.diff +Patch2: zvbi-glibc27.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %package devel Group: Development/Libraries/Other @@ -61,11 +61,8 @@ %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 @@ 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 @@ %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 @@ %{_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 ++++++ zvbi-glibc27.diff ++++++ --- 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; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org