rpms/dvb-apps/devel dvb-apps-1.1.1-no-build-test.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 dvb-apps.spec, 1.11, 1.12 sources, 1.6, 1.7

[Ville Skytta (scop)]

Author: scop

Update of /cvs/pkgs/rpms/dvb-apps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20244

Modified Files:
	.cvsignore dvb-apps.spec sources 
Added Files:
	dvb-apps-1.1.1-no-build-test.patch 
Log Message:
* Mon Aug  6 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.1-9
- Do not build test binaries we don't run or ship.
- Update tuning files to 20070806.
- Change License tag to GPLv2+.


dvb-apps-1.1.1-no-build-test.patch:

--- NEW FILE dvb-apps-1.1.1-no-build-test.patch ---
--- Makefile~	2004-02-04 20:41:55.000000000 +0200
+++ Makefile	2007-08-06 16:01:13.000000000 +0300
@@ -25,4 +25,4 @@
 %::
 #	$(MAKE) -C libdvb2 $(MAKECMDGOALS)
 	$(MAKE) -C util $(MAKECMDGOALS)
-	$(MAKE) -C test $(MAKECMDGOALS)
+#	$(MAKE) -C test $(MAKECMDGOALS)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dvb-apps/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	13 May 2007 20:02:19 -0000	1.6
+++ .cvsignore	6 Aug 2007 13:06:01 -0000	1.7
@@ -1,2 +1,2 @@
 linuxtv-dvb-apps-1.1.1.tar.bz2
-dvb-apps-tuningfiles-20070513.tar.bz2
+dvb-apps-tuningfiles-20070806.tar.bz2


Index: dvb-apps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dvb-apps/devel/dvb-apps.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- dvb-apps.spec	13 May 2007 20:05:56 -0000	1.11
+++ dvb-apps.spec	6 Aug 2007 13:06:01 -0000	1.12
@@ -1,17 +1,18 @@
 Name:           dvb-apps
 Version:        1.1.1
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Utility, demo and test applications using the Linux DVB API
 
 Group:          Applications/Multimedia
-License:        GPL
+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-20070513.tar.bz2
+Source1:        %{name}-tuningfiles-20070806.tar.bz2
 Source99:       %{name}-tuningfiles-snapshot.sh
 Patch0:         %{name}-optflags.patch
 Patch1:         %{name}-paths.patch
+Patch2:         %{name}-1.1.1-no-build-test.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libusb-devel
@@ -25,19 +26,13 @@
 %setup -q -n linuxtv-%{name}-%{version} -a 1
 %patch0 -p1
 %patch1 -p1
+%patch2
 cd util
 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.*
-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
 
@@ -78,6 +73,11 @@
 
 
 %changelog
+* Mon Aug  6 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.1-9
+- Do not build test binaries we don't run or ship.
+- Update tuning files to 20070806.
+- Change License tag to GPLv2+.
+
 * Sun May 13 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.1-8
 - Update tuning files to 20070513.
 - Drop non-upstream license file.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dvb-apps/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	13 May 2007 20:02:19 -0000	1.6
+++ sources	6 Aug 2007 13:06:01 -0000	1.7
@@ -1,2 +1,2 @@
 de958cdb8d00e74792dd69f3c945b037  linuxtv-dvb-apps-1.1.1.tar.bz2
-83445a26a70b1ce2d5ca0a16ed2f6f09  dvb-apps-tuningfiles-20070513.tar.bz2
+c4b33afc692a0ef078071579676f735b  dvb-apps-tuningfiles-20070806.tar.bz2