rpms/dvb-apps/devel dvb-apps-tuningfiles-snapshot.sh, NONE, 1.1 .cvsignore, 1.4, 1.5 dvb-apps.spec, 1.7, 1.8 sources, 1.4, 1.5 dvb-apps-fi-htv-scan, 1.1, NONE
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Sat Sep 23 18:16:03 UTC 2006
- Previous message: owners owners.list,1.1687,1.1688
- Next message: rpms/dvb-apps/FC-5 dvb-apps-tuningfiles-snapshot.sh, NONE, 1.1 .cvsignore, 1.3, 1.4 dvb-apps.spec, 1.6, 1.7 sources, 1.4, 1.5 dvb-apps-fi-htv-scan, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: scop
Update of /cvs/extras/rpms/dvb-apps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30377/devel
Modified Files:
.cvsignore dvb-apps.spec sources
Added Files:
dvb-apps-tuningfiles-snapshot.sh
Removed Files:
dvb-apps-fi-htv-scan
Log Message:
* Sat Sep 23 2006 Ville Skyttä <ville.skytta at iki.fi>
- Include updated set of initial tuning data files from upstream hg (#203328).
--- NEW FILE dvb-apps-tuningfiles-snapshot.sh ---
#!/bin/bash
set -e
tmp=$(mktemp -d)
trap cleanup EXIT
cleanup() {
set +e
[ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp"
}
unset CDPATH
pwd=$(pwd)
now=$(date +%Y%m%d)
cd "$tmp"
hg clone http://linuxtv.org/hg/dvb-apps
cd dvb-apps
tar jcf "$pwd"/dvb-apps-tuningfiles-$now.tar.bz2 util/scan/{atsc,dvb-?}
cd ..
cd - >/dev/null
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dvb-apps/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 18 May 2006 00:29:06 -0000 1.4
+++ .cvsignore 23 Sep 2006 18:16:03 -0000 1.5
@@ -1,2 +1,3 @@
linuxtv-dvb-apps-1.1.1.tar.bz2
COPYING
+dvb-apps-tuningfiles-20060923.tar.bz2
Index: dvb-apps.spec
===================================================================
RCS file: /cvs/extras/rpms/dvb-apps/devel/dvb-apps.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- dvb-apps.spec 29 Aug 2006 20:18:23 -0000 1.7
+++ dvb-apps.spec 23 Sep 2006 18:16:03 -0000 1.8
@@ -1,14 +1,16 @@
Name: dvb-apps
Version: 1.1.1
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Utility, demo and test applications using the Linux DVB API
Group: Applications/Multimedia
License: GPL
URL: http://www.linuxtv.org/wiki/index.php/LinuxTV_dvb-apps
Source0: http://www.linuxtv.org/downloads/linuxtv-dvb-apps-%{version}.tar.bz2
-Source1: %{name}-fi-htv-scan
+# Source1 created with Source99
+Source1: %{name}-tuningfiles-20060923.tar.bz2
Source2: http://www.gnu.org/licenses/COPYING
+Source99: %{name}-tuningfiles-snapshot.sh
Patch0: %{name}-optflags.patch
Patch1: %{name}-paths.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -21,20 +23,25 @@
%prep
-%setup -q -n linuxtv-%{name}-%{version}
+%setup -q -n linuxtv-%{name}-%{version} -a 1
%patch0 -p1
%patch1 -p1
cd util
-install -pm 644 %{SOURCE1} scan/dvb-c/fi-htv
install -pm 644 av7110_loadkeys/README ../README.av7110_loadkeys
install -pm 644 scan/README ../README.scandvb
install -pm 644 szap/README ../README.szap
install -pm 644 ttusb_dec_reset/README ../README.ttusb_dec_reset
-chmod 644 dvbnet/net_start.*
+chmod 644 dvbnet/net_start.* scan/{atsc,dvb-?}/*
+mv scan/dvb-t/fr-Alen?on scan/dvb-t/fr-Alençon
+mv scan/dvb-t/fr-Besan?on scan/dvb-t/fr-Besançon
+for f in scan/{atsc,dvb-?}/* ; do
+ file $f | grep -q CRLF && sed -i -e 's/\r//' $f
+ file $f | grep -q ISO-8859 && \
+ iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 && mv $f.utf8 $f
+done
cd ..
rm -rf include
install -pm 644 %{SOURCE2} COPYING
-sed -i -e 's/\r//' util/scan/atsc/us-NY-TWC-NYC
%build
@@ -55,10 +62,9 @@
install -pm 755 szap/?zap $RPM_BUILD_ROOT%{_bindir}
install -pm 755 szap/femon $RPM_BUILD_ROOT%{_bindir}
install -pm 755 ttusb_dec_reset/ttusb_dec_reset $RPM_BUILD_ROOT%{_bindir}
-install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
-cp -pR scan/dvb-? scan/atsc $RPM_BUILD_ROOT%{_datadir}/%{name}
-install -pm 644 av7110_loadkeys/*.rc5 $RPM_BUILD_ROOT%{_datadir}/%{name}
-install -pm 644 av7110_loadkeys/*.rcmm $RPM_BUILD_ROOT%{_datadir}/%{name}
+install -dm 755 $RPM_BUILD_ROOT%{_datadir}/dvb-apps
+cp -pR scan/dvb-? scan/atsc av7110_loadkeys/*.rc{5,mm} \
+ $RPM_BUILD_ROOT%{_datadir}/dvb-apps
cd ..
@@ -74,6 +80,9 @@
%changelog
+* Sat Sep 23 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.1.1-6
+- Include updated set of initial tuning data files from upstream hg (#203328).
+
* Tue Aug 29 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.1.1-5
- Rebuild.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dvb-apps/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 18 May 2006 00:29:06 -0000 1.4
+++ sources 23 Sep 2006 18:16:03 -0000 1.5
@@ -1,2 +1,3 @@
de958cdb8d00e74792dd69f3c945b037 linuxtv-dvb-apps-1.1.1.tar.bz2
eb723b61539feef013de476e68b5c50a COPYING
+88e513317ba2b8052fc96fe299fc22ce dvb-apps-tuningfiles-20060923.tar.bz2
--- dvb-apps-fi-htv-scan DELETED ---
- Previous message: owners owners.list,1.1687,1.1688
- Next message: rpms/dvb-apps/FC-5 dvb-apps-tuningfiles-snapshot.sh, NONE, 1.1 .cvsignore, 1.3, 1.4 dvb-apps.spec, 1.6, 1.7 sources, 1.4, 1.5 dvb-apps-fi-htv-scan, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list