rpms/dvb-apps/F-12 dvb-apps-1.1.1-dvbnet-h-597604.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 dvb-apps.spec, 1.24, 1.25 sources, 1.15, 1.16
Ville Skyttä
scop at fedoraproject.org
Sat Jun 5 09:49:54 UTC 2010
Author: scop
Update of /cvs/pkgs/rpms/dvb-apps/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv5851/F-12
Modified Files:
.cvsignore dvb-apps.spec sources
Added Files:
dvb-apps-1.1.1-dvbnet-h-597604.patch
Log Message:
* Sat Jun 5 2010 Ville Skyttä <ville.skytta at iki.fi> - 1.1.1-22
- Patch to fix dvbnet -h crash (#597604).
- Update tuning files to 20100605.
dvb-apps-1.1.1-dvbnet-h-597604.patch:
dvbnet.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE dvb-apps-1.1.1-dvbnet-h-597604.patch ---
# HG changeset patch
# User Ville Skyttä <ville.skytta at iki.fi>
# Date 1275729484 -10800
# Node ID acb8124295190a9ee1de02a45ffdc6059eae0e63
# Parent 5631d8b9250c3c9e6f35542851e3fe0460f0315e
Fix dvbnet -h crash when invoked without a path to dvbnet.
diff -r 5631d8b9250c -r acb812429519 util/dvbnet/dvbnet.c
--- a/util/dvbnet/dvbnet.c Tue Jun 01 16:25:03 2010 +0200
+++ b/util/dvbnet/dvbnet.c Sat Jun 05 12:18:04 2010 +0300
@@ -178,8 +178,8 @@
exit(OK);
case 'h':
default:
- s = strrchr(argv[0], '/') + 1;
- usage((s) ? s : argv[0]);
+ s = strrchr(argv[0], '/');
+ usage((s) ? s + 1 : argv[0]);
exit(FAIL);
}
}
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dvb-apps/F-12/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore 16 Mar 2010 22:03:20 -0000 1.15
+++ .cvsignore 5 Jun 2010 09:49:53 -0000 1.16
@@ -1,2 +1,2 @@
linuxtv-dvb-apps-1.1.1.tar.bz2
-dvb-apps-tuningfiles-20100316.tar.bz2
+dvb-apps-tuningfiles-20100605.tar.bz2
Index: dvb-apps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dvb-apps/F-12/dvb-apps.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- dvb-apps.spec 16 Mar 2010 22:03:21 -0000 1.24
+++ dvb-apps.spec 5 Jun 2010 09:49:53 -0000 1.25
@@ -1,6 +1,6 @@
Name: dvb-apps
Version: 1.1.1
-Release: 21%{?dist}
+Release: 22%{?dist}
Summary: Utility, demo and test applications using the Linux DVB API
Group: Applications/Multimedia
@@ -8,7 +8,7 @@ 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-20100316.tar.bz2
+Source1: %{name}-tuningfiles-20100605.tar.bz2
Source99: %{name}-tuningfiles-snapshot.sh
Patch0: %{name}-1.1.1-optflags.patch
Patch1: %{name}-paths.patch
@@ -16,6 +16,8 @@ Patch2: %{name}-1.1.1-no-build-t
Patch3: %{name}-1.1.1-czap-sscanf-557580.patch
# http://linuxtv.org/hg/dvb-apps/rev/53ca8b7c9d31
Patch4: %{name}-1.1.1-tzap-auto-574112.patch
+# http://www.linuxtv.org/pipermail/linux-dvb/2010-June/032676.html
+Patch5: %{name}-1.1.1-dvbnet-h-597604.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libusb-devel
@@ -32,6 +34,7 @@ BuildRequires: kernel-headers >= 2.6.16
%patch2
%patch3 -p1
%patch4 -p1
+%patch5 -p1
cd util
install -pm 644 av7110_loadkeys/README ../README.av7110_loadkeys
@@ -46,7 +49,7 @@ 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
+sed -i -e 's/\r//g' util/scan/dvb-c/hu-Digikabel util/scan/dvb-t/uk-Aberdare
%build
@@ -85,6 +88,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Jun 5 2010 Ville Skyttä <ville.skytta at iki.fi> - 1.1.1-22
+- Patch to fix dvbnet -h crash (#597604).
+- Update tuning files to 20100605.
+
* Tue Mar 16 2010 Ville Skyttä <ville.skytta at iki.fi> - 1.1.1-21
- Apply upstream patch to add tzap AUTO param support (#574112, AUDU Jerome).
- Update tuning files to 20100316.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dvb-apps/F-12/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources 16 Mar 2010 22:03:21 -0000 1.15
+++ sources 5 Jun 2010 09:49:53 -0000 1.16
@@ -1,2 +1,2 @@
de958cdb8d00e74792dd69f3c945b037 linuxtv-dvb-apps-1.1.1.tar.bz2
-e1b28cc8a6db77e0c7b6c0290cccef08 dvb-apps-tuningfiles-20100316.tar.bz2
+2b9872664c9d2344360e69ccc239cc86 dvb-apps-tuningfiles-20100605.tar.bz2
More information about the scm-commits
mailing list