rpms/dvb-apps/devel dvb-apps-fi-htv-scan, NONE, 1.1 dvb-apps-optflags.patch, NONE, 1.1 dvb-apps-paths.patch, NONE, 1.1 dvb-apps.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Sun Jul 17 16:16:44 UTC 2005
Author: scop
Update of /cvs/extras/rpms/dvb-apps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12526/devel
Modified Files:
.cvsignore sources
Added Files:
dvb-apps-fi-htv-scan dvb-apps-optflags.patch
dvb-apps-paths.patch dvb-apps.spec
Log Message:
auto-import dvb-apps-1.1.0-0.4 on branch devel from dvb-apps-1.1.0-0.4.src.rpm
Initial import.
--- NEW FILE dvb-apps-fi-htv-scan ---
# HTV (Finland / Helsinki)
# freq sr fec mod
C 283000000 5900000 NONE QAM128
dvb-apps-optflags.patch:
--- NEW FILE dvb-apps-optflags.patch ---
diff -Naru linuxtv-dvb-apps-1.1.0.orig/test/Makefile linuxtv-dvb-apps-1.1.0/test/Makefile
--- linuxtv-dvb-apps-1.1.0.orig/test/Makefile 2004-01-17 18:59:46.000000000 +0200
+++ linuxtv-dvb-apps-1.1.0/test/Makefile 2004-10-04 23:32:18.377000638 +0300
@@ -1,7 +1,7 @@
# Makefile for Linux DVB API Version 3 test programs
CC = gcc
-CFLAGS = -g -O2 -W -Wall -I../include
+CFLAGS = $(RPM_OPT_FLAGS) -W -Wall -I../include
TARGETS = \
diseqc \
diff -Naru linuxtv-dvb-apps-1.1.0.orig/util/av7110_loadkeys/Makefile linuxtv-dvb-apps-1.1.0/util/av7110_loadkeys/Makefile
--- linuxtv-dvb-apps-1.1.0.orig/util/av7110_loadkeys/Makefile 2004-01-17 18:59:46.000000000 +0200
+++ linuxtv-dvb-apps-1.1.0/util/av7110_loadkeys/Makefile 2004-10-04 23:32:10.787375858 +0300
@@ -1,5 +1,5 @@
CC = gcc
-CFLAGS = -g -Wall -O2
+CFLAGS = $(RPM_OPT_FLAGS) -Wall
all: av7110_loadkeys evtest
diff -Naru linuxtv-dvb-apps-1.1.0.orig/util/dvbdate/Makefile linuxtv-dvb-apps-1.1.0/util/dvbdate/Makefile
--- linuxtv-dvb-apps-1.1.0.orig/util/dvbdate/Makefile 2004-01-17 18:59:46.000000000 +0200
+++ linuxtv-dvb-apps-1.1.0/util/dvbdate/Makefile 2004-10-04 23:31:58.835116342 +0300
@@ -1,6 +1,6 @@
CC = gcc
-CFLAGS = -g -O2 -MD -Wall -I. -I../../include
+CFLAGS = $(RPM_OPT_FLAGS) -MD -Wall -I. -I../../include
LFLAGS =
OBJS = dvbdate.o
diff -Naru linuxtv-dvb-apps-1.1.0.orig/util/dvbnet/Makefile linuxtv-dvb-apps-1.1.0/util/dvbnet/Makefile
--- linuxtv-dvb-apps-1.1.0.orig/util/dvbnet/Makefile 2004-01-17 18:59:46.000000000 +0200
+++ linuxtv-dvb-apps-1.1.0/util/dvbnet/Makefile 2004-10-04 23:31:48.830247341 +0300
@@ -1,6 +1,6 @@
CC = gcc
-CFLAGS = -g -O2 -MD -Wall -I. -I../../include
+CFLAGS = $(RPM_OPT_FLAGS) -MD -Wall -I. -I../../include
LFLAGS =
OBJS = dvbnet.o
diff -Naru linuxtv-dvb-apps-1.1.0.orig/util/dvbtraffic/Makefile linuxtv-dvb-apps-1.1.0/util/dvbtraffic/Makefile
--- linuxtv-dvb-apps-1.1.0.orig/util/dvbtraffic/Makefile 2004-01-19 19:10:16.000000000 +0200
+++ linuxtv-dvb-apps-1.1.0/util/dvbtraffic/Makefile 2004-10-04 23:31:37.418818469 +0300
@@ -1,6 +1,6 @@
dvbtraffic: dvbtraffic.c
- gcc -MD -g -O2 -Wall -I../../include $< -o $@
+ $(CC) -MD -Wall $(RPM_OPT_FLAGS) -I../../include $< -o $@
clean:
rm -f *.o *.d dvbtraffic
diff -Naru linuxtv-dvb-apps-1.1.0.orig/util/lib/Makefile linuxtv-dvb-apps-1.1.0/util/lib/Makefile
--- linuxtv-dvb-apps-1.1.0.orig/util/lib/Makefile 2004-01-17 18:59:46.000000000 +0200
+++ linuxtv-dvb-apps-1.1.0/util/lib/Makefile 2004-10-04 23:31:08.152976759 +0300
@@ -1,6 +1,6 @@
CC = gcc
-CFLAGS = -MD -g -Wall -O2 -I../../include -I.
+CFLAGS = -MD -Wall $(RPM_OPT_FLAGS) -I../../include -I.
LFLAGS = -g -Wall
OBJS = lnb.o
diff -Naru linuxtv-dvb-apps-1.1.0.orig/util/scan/Makefile linuxtv-dvb-apps-1.1.0/util/scan/Makefile
--- linuxtv-dvb-apps-1.1.0.orig/util/scan/Makefile 2004-01-17 18:59:46.000000000 +0200
+++ linuxtv-dvb-apps-1.1.0/util/scan/Makefile 2004-10-04 23:30:50.443518484 +0300
@@ -1,6 +1,6 @@
CC = gcc
-CFLAGS = -MD -g -Wall -O2 -I../../include -I../lib
+CFLAGS = -MD -Wall $(RPM_OPT_FLAGS) -I../../include -I../lib
LFLAGS = -g -Wall
OBJS = diseqc.o dump-zap.o dump-vdr.o scan.o ../lib/lnb.o
diff -Naru linuxtv-dvb-apps-1.1.0.orig/util/szap/Makefile linuxtv-dvb-apps-1.1.0/util/szap/Makefile
--- linuxtv-dvb-apps-1.1.0.orig/util/szap/Makefile 2004-01-17 18:59:46.000000000 +0200
+++ linuxtv-dvb-apps-1.1.0/util/szap/Makefile 2004-10-04 23:32:41.668711208 +0300
@@ -1,6 +1,6 @@
CC = gcc
-CFLAGS = -MD -Wall -g -O2 -I../../include -I../lib
-LFLAGS = -Wall -g -O2
+CFLAGS = -MD -Wall $(RPM_OPT_FLAGS) -I../../include -I../lib
+LFLAGS = -Wall $(RPM_OPT_FLAGS)
RM = rm -f
TARGETS = szap tzap czap femon
diff -Naru linuxtv-dvb-apps-1.1.0.orig/util/ttusb_dec_reset/Makefile linuxtv-dvb-apps-1.1.0/util/ttusb_dec_reset/Makefile
--- linuxtv-dvb-apps-1.1.0.orig/util/ttusb_dec_reset/Makefile 2004-01-22 00:13:45.000000000 +0200
+++ linuxtv-dvb-apps-1.1.0/util/ttusb_dec_reset/Makefile 2004-10-04 23:30:34.373547057 +0300
@@ -1,6 +1,6 @@
CC = gcc
RM = rm -f
-CFLAGS = -g -Wall -O2
+CFLAGS = -Wall $(RPM_OPT_FLAGS)
LFLAGS = -g -Wall
LDFLAGS = -lusb
dvb-apps-paths.patch:
--- NEW FILE dvb-apps-paths.patch ---
diff -NarU1 linuxtv-dvb-apps-1.1.0.orig/util/av7110_loadkeys/README linuxtv-dvb-apps-1.1.0/util/av7110_loadkeys/README
--- linuxtv-dvb-apps-1.1.0.orig/util/av7110_loadkeys/README 2004-01-17 18:59:46.000000000 +0200
+++ linuxtv-dvb-apps-1.1.0/util/av7110_loadkeys/README 2004-10-05 00:12:40.031659603 +0300
@@ -7,3 +7,3 @@
- # ./av7110_loadkeys [-i|--invert] [-a|--address <num>] keymapname.(rc5|rcmm) > /proc/av7110_ir
+ # av7110_loadkeys [-i|--invert] [-a|--address <num>] keymapname.(rc5|rcmm) > /proc/av7110_ir
@@ -17,6 +17,6 @@
Listen to *any* IR transmitter with uses the RC5 protocol:
-# ./av7110_loadkeys hauppauge.rc5 > /proc/av7110_ir
+# av7110_loadkeys /usr/share/dvb-apps/hauppauge.rc5 > /proc/av7110_ir
Listen to RC5 transmitter with address 2:
-# ./av7110_loadkeys -a 2 hauppauge.rc5 > /proc/av7110_ir
+# av7110_loadkeys -a 2 /usr/share/dvb-apps/hauppauge.rc5 > /proc/av7110_ir
@@ -25,5 +25,5 @@
-Now you can test your hardware setup using evtest
+Now you can test your hardware setup using av7110_evtest
- # ./evtest /dev/input/eventX
+ # av7110_evtest /dev/input/eventX
diff -NarU1 linuxtv-dvb-apps-1.1.0.orig/util/dvbnet/net_start.pl linuxtv-dvb-apps-1.1.0/util/dvbnet/net_start.pl
--- linuxtv-dvb-apps-1.1.0.orig/util/dvbnet/net_start.pl 2004-01-17 18:59:46.000000000 +0200
+++ linuxtv-dvb-apps-1.1.0/util/dvbnet/net_start.pl 2004-10-05 00:12:32.412917780 +0300
@@ -14,3 +14,3 @@
- $DEV_NAME = `./dvbnet -a $ADAPTER -n $NETDEV -p $PID | grep created`;
+ $DEV_NAME = `dvbnet -a $ADAPTER -n $NETDEV -p $PID | grep created`;
chop($DEV_NAME);
diff -NarU1 linuxtv-dvb-apps-1.1.0.orig/util/dvbnet/net_start.sh linuxtv-dvb-apps-1.1.0/util/dvbnet/net_start.sh
--- linuxtv-dvb-apps-1.1.0.orig/util/dvbnet/net_start.sh 2004-01-17 18:59:46.000000000 +0200
+++ linuxtv-dvb-apps-1.1.0/util/dvbnet/net_start.sh 2004-10-05 00:13:40.047815421 +0300
@@ -6,3 +6,3 @@
-./dvbnet -p $PID
+dvbnet -p $PID
diff -NarU1 linuxtv-dvb-apps-1.1.0.orig/util/scan/README linuxtv-dvb-apps-1.1.0/util/scan/README
--- linuxtv-dvb-apps-1.1.0.orig/util/scan/README 2004-01-17 18:59:46.000000000 +0200
+++ linuxtv-dvb-apps-1.1.0/util/scan/README 2004-10-05 00:12:40.032659359 +0300
@@ -9,8 +9,9 @@
-Basic usage: ./scan dvb-s/Astra-19.2E | tee mychannels.conf
+Basic usage:
+scandvb /usr/share/dvb-apps/dvb-s/Astra-19.2E | tee mychannels.conf
If you want it to check a specific frequency, tune to that frequency
-(e.g. using szap/tzap/czap) and then use './scan -c'.
+(e.g. using szap/tzap/czap) and then use 'scandvb -c'.
-For more scan options see ./scan -h.
+For more scandvb options see 'scandvb -h'.
diff -NarU1 linuxtv-dvb-apps-1.1.0.orig/util/szap/README linuxtv-dvb-apps-1.1.0/util/szap/README
--- linuxtv-dvb-apps-1.1.0.orig/util/szap/README 2004-01-25 21:23:39.000000000 +0200
+++ linuxtv-dvb-apps-1.1.0/util/szap/README 2004-10-05 00:12:40.033659116 +0300
@@ -7,3 +7,3 @@
-$ ./szap -c channels.conf-dvbs-astra n24
+$ szap -c /usr/share/doc/dvb-apps-*/channels.conf-dvbs-astra n24
@@ -11,3 +11,3 @@
-$ ./czap -c channels.conf-dvbc-berlin Arte
+$ czap -c /usr/share/doc/dvb-apps-*/channels.conf-dvbc-berlin Arte
@@ -15,3 +15,3 @@
-$ ./czap -c channels.conf-dvbt-berlin phoenix
+$ tzap -c /usr/share/doc/dvb-apps-*/channels.conf-dvbt-berlin phoenix
@@ -21,3 +21,3 @@
-$ ./czap -c channels.conf-dvbt-berlin phoenix -r
+$ czap -c /usr/share/doc/dvb-apps-*/channels.conf-dvbt-berlin phoenix -r
[keep it running in one console]
--- NEW FILE dvb-apps.spec ---
Name: dvb-apps
Version: 1.1.0
Release: 0.4
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
Patch0: %{name}-optflags.patch
Patch1: %{name}-paths.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libusb-devel
BuildRequires: glibc-kernheaders >= 2.4-9.1.94
%description
%{summary}.
%prep
%setup -q -n linuxtv-%{name}-%{version}
%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.*
cd ..
rm -rf include
%build
make CC="%{__cc}" # %{?_smp_mflags}
make %{?_smp_mflags} CC="%{__cc}" -C util/ttusb_dec_reset
%install
rm -rf $RPM_BUILD_ROOT
cd util
install -dm 755 $RPM_BUILD_ROOT%{_bindir}
install -pm 755 av7110_loadkeys/av7110_loadkeys $RPM_BUILD_ROOT%{_bindir}
install -pm 755 av7110_loadkeys/evtest $RPM_BUILD_ROOT%{_bindir}/av7110_evtest
install -pm 755 dvbdate/dvbdate $RPM_BUILD_ROOT%{_bindir}
install -pm 755 dvbnet/dvbnet $RPM_BUILD_ROOT%{_bindir}
install -pm 755 dvbtraffic/dvbtraffic $RPM_BUILD_ROOT%{_bindir}
install -pm 755 scan/scan $RPM_BUILD_ROOT%{_bindir}/scandvb
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-? $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}
cd ..
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc README* TODO util/dvbnet/net_start.* util/szap/channels.conf-dvb*
%{_bindir}/*
%{_datadir}/dvb-apps/
%changelog
* Thu Jun 30 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.1.0-0.4
- Update URL.
* Sun May 29 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.1.0-0.3
- Rebuild for FC4.
* Wed Apr 20 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.1.0-0.2
- Switch to recent glibc-kernheaders which includes userspace DVB headers.
* Sun Dec 26 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:1.1.0-0.1
- Remove unnecessary Epochs.
* Mon Oct 4 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:1.1.0-0.scop.1
- First build, loosely based on Mandrake's 1.1.0-4mdk.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dvb-apps/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 17 Jul 2005 16:15:46 -0000 1.1
+++ .cvsignore 17 Jul 2005 16:16:42 -0000 1.2
@@ -0,0 +1 @@
+linuxtv-dvb-apps-1.1.0.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dvb-apps/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 17 Jul 2005 16:15:46 -0000 1.1
+++ sources 17 Jul 2005 16:16:42 -0000 1.2
@@ -0,0 +1 @@
+987d0ac31aec23bfecaf9d224b563016 linuxtv-dvb-apps-1.1.0.tar.bz2
More information about the fedora-extras-commits
mailing list