Update to 0.2.35

sources

@@ -1 +1 @@
-1741a6045c3eedfb611d645f2da69ac8  zvbi-0.2.33.tar.bz2
+95e53eb208c65ba6667fd4341455fa27  zvbi-0.2.35.tar.bz2

zvbi-0.2.33-libpng15.patch

@@ -1,17 +0,0 @@
-diff -up zvbi-0.2.33/src/exp-gfx.c~ zvbi-0.2.33/src/exp-gfx.c
---- zvbi-0.2.33/src/exp-gfx.c~	2008-02-24 15:17:47.000000000 +0100
-+++ zvbi-0.2.33/src/exp-gfx.c	2011-12-06 13:40:25.218139962 +0100
-@@ -1672,11 +1672,11 @@ write_png			(gfx_instance *		gfx,
- 	char title[80];
- 	unsigned int i;
- 
--	if (setjmp (png_ptr->jmpbuf))
-+	if (png_jmpbuf (png_ptr))
- 		return FALSE;
- 
- 	png_set_write_fn (png_ptr,
--			  (voidp) gfx,
-+			  gfx,
- 			  write_data,
- 			  flush_data);
- 

zvbi-0.2.33-stat.patch

@@ -1,33 +0,0 @@
-diff -Nrbu zvbi-0.2.33/contrib/ntsc-cc.c zvbi-0.2.33-OK/contrib/ntsc-cc.c
---- zvbi-0.2.33/contrib/ntsc-cc.c	2007-11-27 20:39:34.000000000 +0300
-+++ zvbi-0.2.33-OK/contrib/ntsc-cc.c	2010-02-21 17:57:17.000000000 +0300
-@@ -32,6 +32,7 @@
- #include <fcntl.h>
- #include <errno.h>
- #include <locale.h>
-+#include <sys/stat.h>
- #include <sys/ioctl.h>
- #include <sys/types.h>
- #include <sys/time.h>
-diff -Nrbu zvbi-0.2.33/src/io-dvb.c zvbi-0.2.33-OK/src/io-dvb.c
---- zvbi-0.2.33/src/io-dvb.c	2008-02-24 17:18:21.000000000 +0300
-+++ zvbi-0.2.33-OK/src/io-dvb.c	2010-02-21 17:57:32.000000000 +0300
-@@ -27,6 +27,7 @@
- 
- #include <unistd.h>		/* read() */
- #include <errno.h>
-+#include <sys/stat.h>
- #include <sys/select.h>
- #include <sys/ioctl.h>
- 
-diff -Nrbu zvbi-0.2.33/src/io-v4l.c zvbi-0.2.33-OK/src/io-v4l.c
---- zvbi-0.2.33/src/io-v4l.c	2008-02-24 17:17:28.000000000 +0300
-+++ zvbi-0.2.33-OK/src/io-v4l.c	2010-02-21 17:57:47.000000000 +0300
-@@ -40,6 +40,7 @@
- #include <errno.h>
- #include <unistd.h>		/* read(), dup2(), getuid() */
- #include <assert.h>
-+#include <sys/stat.h>
- #include <sys/time.h>		/* timeval */
- #include <sys/types.h>		/* fd_set, uid_t */
- #include <sys/ioctl.h>		/* for (_)videodev.h */

zvbi.spec

@@ -2,8 +2,8 @@
 %define             catalogue %{_sysconfdir}/X11/fontpath.d
 
 Name:               zvbi
-Version:            0.2.33
-Release:            20%{?dist}
+Version:            0.2.35
+Release:            1%{?dist}
 Summary:            Raw VBI, Teletext and Closed Caption decoding library
 Group:              System Environment/Libraries
 # See NEWS for a full breakdown of licensing.
@@ -12,8 +12,7 @@ URL:                http://zapping.sourceforge.net/ZVBI/index.html
 Source0:            http://downloads.sourceforge.net/zapping/%{name}-%{version}.tar.bz2
 Patch0:             %{name}-0.2.24-tvfonts.patch
 Patch1:             %{name}-0.2.25-openfix.patch
-Patch2:		    %{name}-0.2.33-stat.patch
-Patch3:             %{name}-0.2.33-libpng15.patch
+
 BuildRequires:      doxygen
 BuildRequires:      fontconfig
 BuildRequires:      gettext >= 0.16.1
@@ -52,7 +51,6 @@ Summary:            Fonts from zvbi converted to X11
 Group:              User Interface/X
 Requires(post):     fontconfig
 Requires(postun):   fontconfig
-# Don't use chkfontpath for F8+, it's legacy.
 BuildArch:	    noarch
 Obsoletes:          xawtv-tv-fonts < 3.95
 Provides:           xawtv-tv-fonts >= 3.95
@@ -65,10 +63,8 @@ Fonts from zvbi converted for use with X11
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
-#Fix character encodings
+# Fix character encodings
 iconv -f iso8859-1 README -t utf8 > README.conv && /bin/mv -f README.conv README
 
 # systemd service file
@@ -94,7 +90,7 @@ EOF
 %configure --disable-rpath --enable-v4l --enable-dvb --enable-proxy
 make %{?_smp_mflags}
 
-#Generate fonts, fonts.alias and fonts.dir
+# Generate fonts, fonts.alias and fonts.dir
 pushd contrib
 ./x11font
 for font in *.bdf
@@ -112,21 +108,14 @@ popd
 mkdir -p %{buildroot}%{fontdir}
 make install DESTDIR=%{buildroot}
 
-#Find locales
 %find_lang %{name}
 
-#Install init script
-#mkdir -p %{buildroot}%{_initrddir}
-#install -pm0755 daemon/zvbid.init %{buildroot}%{_sysconfdir}/rc.d/init.d/zvbid
 mkdir -p %{buildroot}%{_unitdir}
 install -m644 zvbid.service %{buildroot}%{_unitdir}
 rm -rf %{buildroot}%{_initrddir}
 
-#Install fonts
 install -pm0644 contrib/*.pcf.gz %{buildroot}%{fontdir}
 install -pm0644 contrib/fonts.* %{buildroot}%{fontdir}
-
-#%%ghost the fonts.cache-1 and fonts.dir
 touch %{buildroot}%{fontdir}/fonts.cache-1
 
 mkdir -p %{buildroot}%{catalogue}
@@ -160,7 +149,6 @@ fi
 %files -f %{name}.lang
 %{_bindir}/%{name}*
 %{_sbindir}/zvbid
-#%{_initrddir}/zvbid
 %{_unitdir}/zvbid.service
 %{_libdir}/*.so.*
 %{_mandir}/man1/*
@@ -185,6 +173,9 @@ fi
 
 
 %changelog
+* Sun Feb 14 2016 Dmitry Butskoy <Dmitry@Butskoy.name> - 0.2.35-1
+- Update to 0.2.35
+
 * Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.33-20
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild