rpms/dvb-apps/devel dvb-apps-1.1.1-optflags.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 dvb-apps.spec, 1.14, 1.15 sources, 1.9, 1.10 dvb-apps-optflags.patch, 1.2, NONE

[Ville Skyttä]

Author: scop

Update of /cvs/pkgs/rpms/dvb-apps/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10520

Modified Files:
	.cvsignore dvb-apps.spec sources 
Added Files:
	dvb-apps-1.1.1-optflags.patch 
Removed Files:
	dvb-apps-optflags.patch 
Log Message:
* Sat Aug 30 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.1-12
- Update tuning files to 20080830.
- Convert data files to UTF-8.
- Unfuzz optflags patch.


dvb-apps-1.1.1-optflags.patch:

--- NEW FILE dvb-apps-1.1.1-optflags.patch ---
diff -up linuxtv-dvb-apps-1.1.1/test/Makefile.orig linuxtv-dvb-apps-1.1.1/test/Makefile
--- linuxtv-dvb-apps-1.1.1/test/Makefile.orig	2004-01-17 18:59:46.000000000 +0200
+++ linuxtv-dvb-apps-1.1.1/test/Makefile	2008-08-30 09:17:05.000000000 +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 -up linuxtv-dvb-apps-1.1.1/util/av7110_loadkeys/Makefile.orig linuxtv-dvb-apps-1.1.1/util/av7110_loadkeys/Makefile
--- linuxtv-dvb-apps-1.1.1/util/av7110_loadkeys/Makefile.orig	2004-01-17 18:59:46.000000000 +0200
+++ linuxtv-dvb-apps-1.1.1/util/av7110_loadkeys/Makefile	2008-08-30 09:17:05.000000000 +0300
@@ -1,5 +1,5 @@
 CC = gcc
-CFLAGS = -g -Wall -O2
+CFLAGS = $(RPM_OPT_FLAGS) -Wall
 
 all: av7110_loadkeys evtest
 
diff -up linuxtv-dvb-apps-1.1.1/util/dvbdate/Makefile.orig linuxtv-dvb-apps-1.1.1/util/dvbdate/Makefile
--- linuxtv-dvb-apps-1.1.1/util/dvbdate/Makefile.orig	2004-01-17 18:59:46.000000000 +0200
+++ linuxtv-dvb-apps-1.1.1/util/dvbdate/Makefile	2008-08-30 09:17:05.000000000 +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 -up linuxtv-dvb-apps-1.1.1/util/dvbnet/Makefile.orig linuxtv-dvb-apps-1.1.1/util/dvbnet/Makefile
--- linuxtv-dvb-apps-1.1.1/util/dvbnet/Makefile.orig	2004-01-17 18:59:46.000000000 +0200
+++ linuxtv-dvb-apps-1.1.1/util/dvbnet/Makefile	2008-08-30 09:17:05.000000000 +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 -up linuxtv-dvb-apps-1.1.1/util/dvbtraffic/Makefile.orig linuxtv-dvb-apps-1.1.1/util/dvbtraffic/Makefile
--- linuxtv-dvb-apps-1.1.1/util/dvbtraffic/Makefile.orig	2004-01-19 19:10:16.000000000 +0200
+++ linuxtv-dvb-apps-1.1.1/util/dvbtraffic/Makefile	2008-08-30 09:17:05.000000000 +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 -up linuxtv-dvb-apps-1.1.1/util/lib/Makefile.orig linuxtv-dvb-apps-1.1.1/util/lib/Makefile
--- linuxtv-dvb-apps-1.1.1/util/lib/Makefile.orig	2004-01-17 18:59:46.000000000 +0200
+++ linuxtv-dvb-apps-1.1.1/util/lib/Makefile	2008-08-30 09:17:05.000000000 +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 -up linuxtv-dvb-apps-1.1.1/util/scan/Makefile.orig linuxtv-dvb-apps-1.1.1/util/scan/Makefile
--- linuxtv-dvb-apps-1.1.1/util/scan/Makefile.orig	2006-05-18 02:34:53.000000000 +0300
+++ linuxtv-dvb-apps-1.1.1/util/scan/Makefile	2008-08-30 09:17:05.000000000 +0300
@@ -1,6 +1,6 @@
 
 CC = gcc
-CFLAGS = -MD -g -Wall -O2 -I../../include
+CFLAGS = -MD -Wall $(RPM_OPT_FLAGS) -I../../include
 LFLAGS = -g -Wall
 
 OBJS = diseqc.o dump-zap.o dump-vdr.o scan.o lnb.o section.o atsc_psip_section.o
diff -up linuxtv-dvb-apps-1.1.1/util/szap/Makefile.orig linuxtv-dvb-apps-1.1.1/util/szap/Makefile
--- linuxtv-dvb-apps-1.1.1/util/szap/Makefile.orig	2006-05-18 02:31:54.000000000 +0300
+++ linuxtv-dvb-apps-1.1.1/util/szap/Makefile	2008-08-30 09:17:05.000000000 +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 azap femon
diff -up linuxtv-dvb-apps-1.1.1/util/ttusb_dec_reset/Makefile.orig linuxtv-dvb-apps-1.1.1/util/ttusb_dec_reset/Makefile
--- linuxtv-dvb-apps-1.1.1/util/ttusb_dec_reset/Makefile.orig	2004-01-22 00:13:45.000000000 +0200
+++ linuxtv-dvb-apps-1.1.1/util/ttusb_dec_reset/Makefile	2008-08-30 09:17:05.000000000 +0300
@@ -1,6 +1,6 @@
 CC	= gcc
 RM	= rm -f
-CFLAGS	= -g -Wall -O2
+CFLAGS	= -Wall $(RPM_OPT_FLAGS)
 LFLAGS	= -g -Wall
 LDFLAGS = -lusb
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dvb-apps/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	14 Feb 2008 19:31:20 -0000	1.9
+++ .cvsignore	30 Aug 2008 06:28:10 -0000	1.10
@@ -1,2 +1,2 @@
 linuxtv-dvb-apps-1.1.1.tar.bz2
-dvb-apps-tuningfiles-20080214.tar.bz2
+dvb-apps-tuningfiles-20080830.tar.bz2


Index: dvb-apps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dvb-apps/devel/dvb-apps.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- dvb-apps.spec	14 Feb 2008 19:09:22 -0000	1.14
+++ dvb-apps.spec	30 Aug 2008 06:28:10 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           dvb-apps
 Version:        1.1.1
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Utility, demo and test applications using the Linux DVB API
 
 Group:          Applications/Multimedia
@@ -8,9 +8,9 @@
 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-20080214.tar.bz2
+Source1:        %{name}-tuningfiles-20080830.tar.bz2
 Source99:       %{name}-tuningfiles-snapshot.sh
-Patch0:         %{name}-optflags.patch
+Patch0:         %{name}-1.1.1-optflags.patch
 Patch1:         %{name}-paths.patch
 Patch2:         %{name}-1.1.1-no-build-test.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -27,6 +27,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2
+
 cd util
 install -pm 644 av7110_loadkeys/README ../README.av7110_loadkeys
 install -pm 644 scan/README ../README.scandvb
@@ -34,8 +35,12 @@
 install -pm 644 ttusb_dec_reset/README ../README.ttusb_dec_reset
 chmod 644 dvbnet/net_start.*
 cd ..
+
 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
+
 
 %build
 make CC="%{__cc}" # %{?_smp_mflags}
@@ -73,6 +78,11 @@
 
 
 %changelog
+* Sat Aug 30 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.1-12
+- Update tuning files to 20080830.
+- Convert data files to UTF-8.
+- Unfuzz optflags patch.
+
 * Thu Feb 14 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.1-11
 - Update tuning files to 20080214.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dvb-apps/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	14 Feb 2008 19:31:20 -0000	1.9
+++ sources	30 Aug 2008 06:28:10 -0000	1.10
@@ -1,2 +1,2 @@
 de958cdb8d00e74792dd69f3c945b037  linuxtv-dvb-apps-1.1.1.tar.bz2
-4f8d29b57082b6c0a9051a2c8f6c134b  dvb-apps-tuningfiles-20080214.tar.bz2
+643227e07efaaed400fbf7b0a475c114  dvb-apps-tuningfiles-20080830.tar.bz2


--- dvb-apps-optflags.patch DELETED ---