rpms/dvb-apps/F-12 dvb-apps-1.1.1-czap-sscanf-557580.patch, NONE, 1.1 .cvsignore, 1.13, 1.14 dvb-apps.spec, 1.21, 1.22 sources, 1.13, 1.14

[Ville Skyttä]

Author: scop

Update of /cvs/pkgs/rpms/dvb-apps/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31747/F-12

Modified Files:
	.cvsignore dvb-apps.spec sources 
Added Files:
	dvb-apps-1.1.1-czap-sscanf-557580.patch 
Log Message:
* Thu Jan 21 2010 Ville Skyttä <ville.skytta at iki.fi> - 1.1.1-20
- Apply patch to fix czap config parsing when built w/gcc 4.4.2 (#557580).
- Update tuning files to 20100114.


dvb-apps-1.1.1-czap-sscanf-557580.patch:
 Makefile |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE dvb-apps-1.1.1-czap-sscanf-557580.patch ---
diff -up linuxtv-dvb-apps-1.1.1/util/szap/Makefile~ linuxtv-dvb-apps-1.1.1/util/szap/Makefile
--- linuxtv-dvb-apps-1.1.1/util/szap/Makefile~	2010-01-21 22:11:00.000000000 +0200
+++ linuxtv-dvb-apps-1.1.1/util/szap/Makefile	2010-01-21 22:37:04.000000000 +0200
@@ -22,6 +22,9 @@ all: $(OBJS) $(TARGETS)
 szap: szap.o ../lib/lnb.o
 	$(CC) $(LFLAGS) -o szap szap.o ../lib/lnb.o
 
+# http://thread.gmane.org/gmane.linux.drivers.video-input-infrastructure/14331
+czap.o: CFLAGS += -D_GNU_SOURCE
+
 .c.o:
 	$(CC) $(CFLAGS) -o $@ -c $<
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dvb-apps/F-12/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	20 Aug 2009 13:26:10 -0000	1.13
+++ .cvsignore	21 Jan 2010 21:17:56 -0000	1.14
@@ -1,2 +1,2 @@
 linuxtv-dvb-apps-1.1.1.tar.bz2
-dvb-apps-tuningfiles-20090820.tar.bz2
+dvb-apps-tuningfiles-20100121.tar.bz2


Index: dvb-apps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dvb-apps/F-12/dvb-apps.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- dvb-apps.spec	20 Aug 2009 13:26:10 -0000	1.21
+++ dvb-apps.spec	21 Jan 2010 21:17:56 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           dvb-apps
 Version:        1.1.1
-Release:        18%{?dist}
+Release:        20%{?dist}
 Summary:        Utility, demo and test applications using the Linux DVB API
 
 Group:          Applications/Multimedia
@@ -8,11 +8,12 @@ License:        GPLv2+
 URL:            http://www.linuxtv.org/wiki/index.php/LinuxTV_dvb-apps
 Source0:        http://www.linuxtv.org/downloads/linuxtv-dvb-apps-%{version}.tar.bz2
 # Source1 created with Source99
-Source1:        %{name}-tuningfiles-20090820.tar.bz2
+Source1:        %{name}-tuningfiles-20100121.tar.bz2
 Source99:       %{name}-tuningfiles-snapshot.sh
 Patch0:         %{name}-1.1.1-optflags.patch
 Patch1:         %{name}-paths.patch
 Patch2:         %{name}-1.1.1-no-build-test.patch
+Patch3:         %{name}-1.1.1-czap-sscanf-557580.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libusb-devel
@@ -27,6 +28,7 @@ BuildRequires:  kernel-headers >= 2.6.16
 %patch0 -p1
 %patch1 -p1
 %patch2
+%patch3 -p1
 
 cd util
 install -pm 644 av7110_loadkeys/README ../README.av7110_loadkeys
@@ -41,6 +43,8 @@ rm -rf include
 f=util/szap/channels.conf-dvbc-berlin
 iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
 
+sed -i -e 's/\r//g' util/scan/dvb-c/hu-Digikabel
+
 
 %build
 make CC="%{__cc}" # %{?_smp_mflags}
@@ -78,6 +82,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Jan 21 2010 Ville Skyttä <ville.skytta at iki.fi> - 1.1.1-20
+- Apply patch to fix czap config parsing when built w/gcc 4.4.2 (#557580).
+- Update tuning files to 20100114.
+
+* Thu Jan 14 2010 Ville Skyttä <ville.skytta at iki.fi> - 1.1.1-19
+- Update tuning files to 20100114.
+
 * Thu Aug 20 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.1.1-18
 - Update tuning files to 20090820.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dvb-apps/F-12/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	20 Aug 2009 13:26:10 -0000	1.13
+++ sources	21 Jan 2010 21:17:56 -0000	1.14
@@ -1,2 +1,2 @@
 de958cdb8d00e74792dd69f3c945b037  linuxtv-dvb-apps-1.1.1.tar.bz2
-81b363e38abcfa83b1414ef82e6fe74e  dvb-apps-tuningfiles-20090820.tar.bz2
+27beead1c4b812418accc7160921070b  dvb-apps-tuningfiles-20100121.tar.bz2