commit dvb for openSUSE:Factory

2015-02-05 Thread h_root
Hello community,

here is the log from the commit of package dvb for openSUSE:Factory checked in 
at 2015-02-05 11:01:12

Comparing /work/SRC/openSUSE:Factory/dvb (Old)
 and  /work/SRC/openSUSE:Factory/.dvb.new (New)


Package is dvb

Changes:

--- /work/SRC/openSUSE:Factory/dvb/dvb.changes  2015-01-09 20:50:45.0 
+0100
+++ /work/SRC/openSUSE:Factory/.dvb.new/dvb.changes 2015-02-05 
11:01:18.0 +0100
@@ -1,0 +2,14 @@
+Wed Jan 21 10:03:21 UTC 2015 - jdelv...@suse.com
+
+- dvb-opensuse-integration.patch: Instead of excluding files from
+  the package, don't build them in the first place, this is more
+  efficient.
+
+---
+Tue Jan 20 13:11:57 UTC 2015 - jdelv...@suse.com
+
+- Update to the latest upstream snapshot (20150120)
+  * Scan data files are no longer included so we don't have to
+delete them.
+
+---

Old:

  dvb-apps-1.1.1_20120913.tar.xz

New:

  dvb-apps-1.1.1_20150120.tar.xz
  dvb-opensuse-integration.patch



Other differences:
--
++ dvb.spec ++
--- /var/tmp/diff_new_pack.c40YYd/_old  2015-02-05 11:01:19.0 +0100
+++ /var/tmp/diff_new_pack.c40YYd/_new  2015-02-05 11:01:19.0 +0100
@@ -17,7 +17,7 @@
 
 
 %if !%{defined snapver}
-%define snapver  20120913
+%define snapver  20150120
 %endif
 
 Name:   dvb
@@ -44,6 +44,8 @@
 Patch4: dvb-femon-03-handle-EOPNOTSUPP.patch
 # PATCH-FIX-OPENSUSE: dvb-scan-dont-segfault.patch, upstream is basically 
dead, but still avoid insstant segfault in usage() function -- seife
 Patch5: dvb-scan-dont-segfault.patch
+# PATCH-FEATURE-OPENSUSE: dvb-opensuse-integration, openSUSE integration -- 
jdelvare
+Patch6: dvb-opensuse-integration.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 Requires:   dtv-scan-tables
 
@@ -70,6 +72,7 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 find -name .hg -type d | xargs rm -rfv
 find -name .cvsignore -type f | xargs rm -fv
 find -name '*.orig' -type f | xargs rm -fv
@@ -113,15 +116,9 @@
 ln -sf /etc/init.d/dvb $DESTDIR/usr/sbin/rcdvb
 install -m 755 %{SOURCE2} $DESTDIR/etc/init.d/dvb
 #
-# noone really uses this so far AFAIK
-rm -r %{buildroot}%{_libdir}/*.a
-# dvbscan is incomplete and defunct
-rm %{buildroot}%{_bindir}/dvbscan
 # scan is too generic a name, rename to dvbscan/atscscan to avoid conflicts
 mv %{buildroot}%{_bindir}/scan %{buildroot}%{_bindir}/dvbscan
 ln %{buildroot}%{_bindir}/dvbscan %{buildroot}%{_bindir}/atscscan
-# dvb scan data are provided by dtv-scan-tables
-rm -r %{buildroot}%{_datadir}/dvb/{atsc,dvb-c,dvb-s,dvb-t}
 #
 %fdupes $RPM_BUILD_ROOT
 

++ dvb-apps-1.1.1_20120913.tar.xz - dvb-apps-1.1.1_20150120.tar.xz ++
 14716 lines of diff (skipped)

++ dvb-opensuse-integration.patch ++
From: Jean Delvare jdelv...@suse.de
Subject: dvb: openSUSE integration

Skip some components:
* We don't want to ship static libraries so don't build them.
* We don't ship testing applications so don't build them.
* dvbscan is incomplete and defunct, don't build it.
---
 Make.rules|2 +-
 Makefile  |1 -
 util/Makefile |1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

--- dvb-apps.orig/Make.rules2015-01-21 10:54:26.663742900 +0100
+++ dvb-apps/Make.rules 2015-01-21 10:56:15.340131744 +0100
@@ -9,7 +9,7 @@ ifneq ($(lib_name),)
 CFLAGS_LIB ?= -fPIC
 CFLAGS += $(CFLAGS_LIB)
 
-libraries = $(lib_name).so $(lib_name).a
+libraries = $(lib_name).so
 
 .PHONY: library
 
--- dvb-apps.orig/Makefile  2015-01-21 10:56:00.486805230 +0100
+++ dvb-apps/Makefile   2015-01-21 10:56:09.140995471 +0100
@@ -10,7 +10,6 @@ DVB_API_MINOR := $(word 3, $(shell grep
 
 all clean install:
$(MAKE) -C lib $@
-   $(MAKE) -C test $@
$(MAKE) -C util $@
 
 update:
--- dvb-apps.orig/util/Makefile 2015-01-20 14:44:32.007767792 +0100
+++ dvb-apps/util/Makefile  2015-01-21 10:54:21.530630075 +0100
@@ -10,7 +10,6 @@ all clean install:
$(MAKE) -C dvbdate $@
$(MAKE) -C dvbnet $@
$(MAKE) -C dvbtraffic $@
-   $(MAKE) -C dvbscan $@
$(MAKE) -C femon $@
$(MAKE) -C scan $@
$(MAKE) -C szap $@
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit dvb for openSUSE:Factory

2015-01-09 Thread h_root
Hello community,

here is the log from the commit of package dvb for openSUSE:Factory checked in 
at 2015-01-09 20:50:37

Comparing /work/SRC/openSUSE:Factory/dvb (Old)
 and  /work/SRC/openSUSE:Factory/.dvb.new (New)


Package is dvb

Changes:

--- /work/SRC/openSUSE:Factory/dvb/dvb.changes  2013-12-16 15:47:39.0 
+0100
+++ /work/SRC/openSUSE:Factory/.dvb.new/dvb.changes 2015-01-09 
20:50:45.0 +0100
@@ -1,0 +2,6 @@
+Thu Jan  1 23:04:48 UTC 2015 - seife+...@b1-systems.com
+
+- add dvb-scan-dont-segfault.patch to avoid dvbscan segfault in
+  usage message if called without any parameter
+
+---

New:

  dvb-scan-dont-segfault.patch



Other differences:
--
++ dvb.spec ++
--- /var/tmp/diff_new_pack.zsojKE/_old  2015-01-09 20:50:46.0 +0100
+++ /var/tmp/diff_new_pack.zsojKE/_new  2015-01-09 20:50:46.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package dvb
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -42,6 +42,8 @@
 Patch2: dvb-femon-01-status-is-common.patch
 Patch3: dvb-femon-02-SNR-in-dB.patch
 Patch4: dvb-femon-03-handle-EOPNOTSUPP.patch
+# PATCH-FIX-OPENSUSE: dvb-scan-dont-segfault.patch, upstream is basically 
dead, but still avoid insstant segfault in usage() function -- seife
+Patch5: dvb-scan-dont-segfault.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 Requires:   dtv-scan-tables
 
@@ -67,6 +69,7 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 find -name .hg -type d | xargs rm -rfv
 find -name .cvsignore -type f | xargs rm -fv
 find -name '*.orig' -type f | xargs rm -fv

++ dvb-scan-dont-segfault.patch ++
dvbscan without parameters segfaults in the usage() message.
Just a cosmetic issue, but still worth fixing :-)
Because upstream is basically dead and uses an arcane version control,
this patch is not yet upstream.

Author: Stefan Seyfried seife+...@b1-systems.com
Date: 2015-01-01

Index: b/util/scan/scan.c
===
--- a/util/scan/scan.c
+++ b/util/scan/scan.c
@@ -2580,7 +2580,7 @@ bad_usage(char *pname, int problem)
break;
case 2:
show_existing_tuning_data_files();
-   fprintf (stderr, usage, pname);
+   fprintf (stderr, usage, pname, output_charset);
}
 }
 
@@ -2594,11 +2594,6 @@ int main (int argc, char **argv)
const char *initial = NULL;
char *charset;
 
-   if (argc = 1) {
-   bad_usage(argv[0], 2);
-   return -1;
-   }
-
/*
 * Get the environment charset, and use it as the default
 * output charset. In thesis, using nl_langinfo should be
@@ -2619,6 +2614,11 @@ int main (int argc, char **argv)
} else
output_charset = nl_langinfo(CODESET);
 
+   if (argc = 1) {
+   bad_usage(argv[0], 2);
+   return -1;
+   }
+
/* start with default lnb type */
lnb_type = *lnb_enum(0);
while ((opt = getopt(argc, argv, 
5cnpa:f:d:s:o:x:e:t:i:l:vquPA:UC:D:)) != -1) {
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit dvb for openSUSE:Factory

2013-12-16 Thread h_root
Hello community,

here is the log from the commit of package dvb for openSUSE:Factory checked in 
at 2013-12-16 15:47:39

Comparing /work/SRC/openSUSE:Factory/dvb (Old)
 and  /work/SRC/openSUSE:Factory/.dvb.new (New)


Package is dvb

Changes:

--- /work/SRC/openSUSE:Factory/dvb/dvb.changes  2013-01-29 06:43:58.0 
+0100
+++ /work/SRC/openSUSE:Factory/.dvb.new/dvb.changes 2013-12-16 
15:47:39.0 +0100
@@ -1,0 +2,39 @@
+Tue Dec 10 09:28:52 CET 2013 - jdelv...@suse.com
+
+- Remove dvb-ttpci-01.fw-2622 as license is unknown.
+- Install COPYING* as %doc.
+
+---
+Fri Oct 18 09:10:47 CEST 2013 - jdelv...@suse.com
+
+- License clarification: the main dvb package also contains
+  LGPL-2.1+ code.
+
+---
+Thu Oct 17 13:53:56 UTC 2013 - jdelv...@suse.com
+
+- Rename scan to dvbscan/atscscan, to avoid collisions.
+
+---
+Tue Oct  1 12:21:41 UTC 2013 - jdelv...@suse.com
+
+- Make the dvb-devel package description somewhat more verbose, to
+  make rpmlint happy.
+
+---
+Tue Oct  1 12:12:10 UTC 2013 - jdelv...@suse.com
+
+- dvb-femon-01-status-is-common.patch: femon: Share common code
+  (bnc#843473).
+- dvb-femon-02-SNR-in-dB.patch: femon: Display SNR in dB
+  (bnc#843473).
+- dvb-femon-03-handle-EOPNOTSUPP.patch: femon: Handle -EOPNOTSUPP
+  (bnc#843474).
+
+---
+Tue Oct  1 09:59:55 UTC 2013 - jdelv...@suse.com
+
+- New subpackage dvb-devel, containing header files needed to build
+  third-party DVB applications (bnc#832195).
+
+---

Old:

  dvb-ttpci-01.fw-2622

New:

  dvb-femon-01-status-is-common.patch
  dvb-femon-02-SNR-in-dB.patch
  dvb-femon-03-handle-EOPNOTSUPP.patch



Other differences:
--
++ dvb.spec ++
--- /var/tmp/diff_new_pack.o7FkUc/_old  2013-12-16 15:47:40.0 +0100
+++ /var/tmp/diff_new_pack.o7FkUc/_new  2013-12-16 15:47:40.0 +0100
@@ -27,38 +27,46 @@
 BuildRequires:  libv4l-devel = 0.8.4
 %endif
 BuildRequires:  xz
-%define firmwaredir /lib/firmware
 Url:http://linuxtv.org/
 PreReq: %fillup_prereq %insserv_prereq
 Version:1.1.1%{?snapver:_%snapver}
 Release:0
 Summary:Tools for Digital (DVB) TV Cards
-License:GPL-2.0+
+License:GPL-2.0+ and LGPL-2.1+
 Group:  Hardware/TV
 Source: dvb-apps-%{version}.tar.xz
 Source2:rcdvb
 Source3:sysconfig.dvb
-Source4:http://linuxtv.org/downloads/firmware/dvb-ttpci-01.fw-2622
-#Source4:  
http://212.227.36.83/linuxtv/downloads/firmware/dvb-ttpci-01.fw-261d
 Patch:  dvb-apps-dvbnet.diff
 Patch1: dvb-includes.diff
+Patch2: dvb-femon-01-status-is-common.patch
+Patch3: dvb-femon-02-SNR-in-dB.patch
+Patch4: dvb-femon-03-handle-EOPNOTSUPP.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
-# This package provides the firmware for some cards supported by the
-# dvb-ttpci.ko module. Add the modalias dependencies for this module:
-# Modules: dvb-ttpci.ko
-Supplements:modalias(pci:v1131d7146sv110Asdbc*sc*i*)
-Supplements:
modalias(pci:v1131d7146sv13C2sd000[0123468AE]bc*sc*i*)
-Supplements:modalias(pci:v1131d7146sv13C2sd1002bc*sc*i*)
-# Generated with: extract-modaliases -i dvb-ttpci kernel-default.rpm
 Requires:   dtv-scan-tables
 
 %description
 DVB tools and transponder files useful for DVB TV Cards
 
+%package -n dvb-devel
+Summary:Development files for DVB-related libraries
+License:LGPL-2.1+
+Group:  Development/Libraries/C and C++
+Requires:   dvb = %{version}
+Requires:   glibc-devel
+
+%description -n dvb-devel
+Files needed for the development of DVB TV applications and tools.
+Header files are included for the following libraries: libdvbapi,
+libdvbcfg, libdvben50221, libdvbsec, libesg and libucsi.
+
 %prep
 %setup -q -n dvb-apps-%{version}
 %patch
 %patch1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
 find -name .hg -type d | xargs rm -rfv
 find -name .cvsignore -type f | xargs rm -fv
 find -name '*.orig' -type f | xargs rm -fv
@@ -80,7 +88,7 @@
 #
 ## docu
 install -d -m 755 $DESTDIR%{_docdir}/dvb
-install -m 644 README $DESTDIR%{_docdir}/dvb
+install -m 644 README COPYING* $DESTDIR%{_docdir}/dvb
 #
 ##
 make \
@@ -102,20 +110,13 @@
 ln -sf /etc/init.d/dvb $DESTDIR/usr/sbin/rcdvb
 install -m 755 %{SOURCE2} $DESTDIR/etc/init.d/dvb
 #
-## firmware
-install -d 

commit dvb for openSUSE:Factory

2013-01-28 Thread h_root
Hello community,

here is the log from the commit of package dvb for openSUSE:Factory checked in 
at 2013-01-29 06:43:56

Comparing /work/SRC/openSUSE:Factory/dvb (Old)
 and  /work/SRC/openSUSE:Factory/.dvb.new (New)


Package is dvb, Maintainer is d...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/dvb/dvb.changes  2012-12-03 09:32:41.0 
+0100
+++ /work/SRC/openSUSE:Factory/.dvb.new/dvb.changes 2013-01-29 
06:43:58.0 +0100
@@ -1,0 +2,6 @@
+Sun Jan 20 10:02:54 UTC 2013 - jsl...@suse.com
+
+- add Require for dtv-scan-tables (this is where scan data currently are)
+- some rpmlint fixes
+
+---



Other differences:
--
++ dvb.spec ++
--- /var/tmp/diff_new_pack.AsVYIs/_old  2013-01-29 06:43:59.0 +0100
+++ /var/tmp/diff_new_pack.AsVYIs/_new  2013-01-29 06:43:59.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package dvb
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -50,6 +50,7 @@
 Supplements:
modalias(pci:v1131d7146sv13C2sd000[0123468AE]bc*sc*i*)
 Supplements:modalias(pci:v1131d7146sv13C2sd1002bc*sc*i*)
 # Generated with: extract-modaliases -i dvb-ttpci kernel-default.rpm
+Requires:   dtv-scan-tables
 
 %description
 DVB tools and transponder files useful for DVB TV Cards
@@ -115,13 +116,19 @@
 rm -r %{buildroot}%{_includedir} %{buildroot}%{_libdir}/*.a
 # dvbscan is incomplete and defunct
 rm %{buildroot}%{_bindir}/dvbscan
+# dvb scan data are provided by dtv-scan-tables
+rm -r %{buildroot}%{_datadir}/dvb/{atsc,dvb-c,dvb-s,dvb-t}
 #
 %fdupes $RPM_BUILD_ROOT
 
+%preun
+%stop_on_removal dvb
+
 %post
 %{fillup_and_insserv dvb}
 
 %postun
+%restart_on_update dvb
 %insserv_cleanup
 
 %files



++ rcdvb ++
--- /var/tmp/diff_new_pack.AsVYIs/_old  2013-01-29 06:43:59.0 +0100
+++ /var/tmp/diff_new_pack.AsVYIs/_new  2013-01-29 06:43:59.0 +0100
@@ -16,8 +16,8 @@
 #
 ### BEGIN INIT INFO
 # Provides: dvb
-# Required-Start:
-# Required-Stop:
+# Required-Start: $remote_fs
+# Required-Stop:  $null
 # Default-Start:  3 5
 # Default-Stop:   0 1 2 6
 # Short-Description: (re)loads drivers for DVB cards.

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit dvb for openSUSE:Factory

2012-12-03 Thread h_root
Hello community,

here is the log from the commit of package dvb for openSUSE:Factory checked in 
at 2012-12-03 09:32:38

Comparing /work/SRC/openSUSE:Factory/dvb (Old)
 and  /work/SRC/openSUSE:Factory/.dvb.new (New)


Package is dvb, Maintainer is d...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/dvb/dvb.changes  2012-06-01 07:20:00.0 
+0200
+++ /work/SRC/openSUSE:Factory/.dvb.new/dvb.changes 2012-12-03 
09:32:41.0 +0100
@@ -1,0 +2,7 @@
+Fri Nov 30 19:03:51 UTC 2012 - jsl...@suse.com
+
+- update to 1.1.1_20120913
+  * ar, br, cz, hu scan data updated
+- remove cz-Kojal scanfile. It's superseded by the new cz data.
+
+---

Old:

  cz-kojal.patch
  dvb-apps-1.1.1_20120410.tar.bz2

New:

  dvb-apps-1.1.1_20120913.tar.xz



Other differences:
--
++ dvb.spec ++
--- /var/tmp/diff_new_pack.25y7Qx/_old  2012-12-03 09:32:42.0 +0100
+++ /var/tmp/diff_new_pack.25y7Qx/_new  2012-12-03 09:32:42.0 +0100
@@ -17,31 +17,31 @@
 
 
 %if !%{defined snapver}
-%define snapver  20120410
+%define snapver  20120913
 %endif
 
 Name:   dvb
-BuildRequires:  libusb-devel
 BuildRequires:  fdupes
+BuildRequires:  libusb-devel
 %if 0%{?suse_version} = 1210
 BuildRequires:  libv4l-devel = 0.8.4
 %endif
+BuildRequires:  xz
 %define firmwaredir /lib/firmware
-License:GPL-2.0+
-Group:  Hardware/TV
 Url:http://linuxtv.org/
 PreReq: %fillup_prereq %insserv_prereq
 Version:1.1.1%{?snapver:_%snapver}
-Release:1
+Release:0
 Summary:Tools for Digital (DVB) TV Cards
-Source: dvb-apps-%{version}.tar.bz2
+License:GPL-2.0+
+Group:  Hardware/TV
+Source: dvb-apps-%{version}.tar.xz
 Source2:rcdvb
 Source3:sysconfig.dvb
 Source4:http://linuxtv.org/downloads/firmware/dvb-ttpci-01.fw-2622
 #Source4:  
http://212.227.36.83/linuxtv/downloads/firmware/dvb-ttpci-01.fw-261d
 Patch:  dvb-apps-dvbnet.diff
 Patch1: dvb-includes.diff
-Patch2: cz-kojal.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 # This package provides the firmware for some cards supported by the
 # dvb-ttpci.ko module. Add the modalias dependencies for this module:
@@ -58,7 +58,6 @@
 %setup -q -n dvb-apps-%{version}
 %patch
 %patch1
-%patch2 -p1
 find -name .hg -type d | xargs rm -rfv
 find -name .cvsignore -type f | xargs rm -fv
 find -name '*.orig' -type f | xargs rm -fv


-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit dvb for openSUSE:Factory

2012-05-31 Thread h_root
Hello community,

here is the log from the commit of package dvb for openSUSE:Factory checked in 
at 2012-06-01 07:19:58

Comparing /work/SRC/openSUSE:Factory/dvb (Old)
 and  /work/SRC/openSUSE:Factory/.dvb.new (New)


Package is dvb, Maintainer is d...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/dvb/dvb.changes  2012-04-02 10:29:03.0 
+0200
+++ /work/SRC/openSUSE:Factory/.dvb.new/dvb.changes 2012-06-01 
07:20:00.0 +0200
@@ -1,0 +2,6 @@
+Thu May 31 09:58:04 UTC 2012 - lnus...@suse.de
+
+- update to 1.1.1_20120410
+  * updated scan files and some bug fixes
+
+---

Old:

  channels-fr-Gironde.patch
  dvb-README.SuSE
  dvb-apps-1.1.1_20100509.tar.bz2
  dvb-apps-v4l-2.6.38.patch

New:

  dvb-apps-1.1.1_20120410.tar.bz2



Other differences:
--
++ dvb.spec ++
--- /var/tmp/diff_new_pack.WqTrUV/_old  2012-06-01 07:20:01.0 +0200
+++ /var/tmp/diff_new_pack.WqTrUV/_new  2012-06-01 07:20:01.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package dvb
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 %if !%{defined snapver}
-%define snapver  20100509
+%define snapver  20120410
 %endif
 
 Name:   dvb
@@ -29,12 +29,12 @@
 %define firmwaredir /lib/firmware
 License:GPL-2.0+
 Group:  Hardware/TV
+Url:http://linuxtv.org/
 PreReq: %fillup_prereq %insserv_prereq
 Version:1.1.1%{?snapver:_%snapver}
 Release:1
 Summary:Tools for Digital (DVB) TV Cards
 Source: dvb-apps-%{version}.tar.bz2
-Source1:dvb-README.SuSE
 Source2:rcdvb
 Source3:sysconfig.dvb
 Source4:http://linuxtv.org/downloads/firmware/dvb-ttpci-01.fw-2622
@@ -42,8 +42,6 @@
 Patch:  dvb-apps-dvbnet.diff
 Patch1: dvb-includes.diff
 Patch2: cz-kojal.patch
-Patch3: dvb-apps-v4l-2.6.38.patch
-Patch4: channels-fr-Gironde.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 # This package provides the firmware for some cards supported by the
 # dvb-ttpci.ko module. Add the modalias dependencies for this module:
@@ -54,19 +52,13 @@
 # Generated with: extract-modaliases -i dvb-ttpci kernel-default.rpm
 
 %description
-This package contains tools to be used with the driver for DVB cards.
-You can find further information in
-/usr/share/doc/packages/dvb/README.SuSE.
+DVB tools and transponder files useful for DVB TV Cards
 
 %prep
 %setup -q -n dvb-apps-%{version}
 %patch
 %patch1
 %patch2 -p1
-%if 0%{?suse_version} = 1210
-%patch3
-%endif
-%patch4 -p1
 find -name .hg -type d | xargs rm -rfv
 find -name .cvsignore -type f | xargs rm -fv
 find -name '*.orig' -type f | xargs rm -fv
@@ -89,7 +81,6 @@
 ## docu
 install -d -m 755 $DESTDIR%{_docdir}/dvb
 install -m 644 README $DESTDIR%{_docdir}/dvb
-install -m 644 %{SOURCE1} $DESTDIR%{_docdir}/dvb/README.SuSE
 #
 ##
 make \

++ dvb-apps-1.1.1_20100509.tar.bz2 - dvb-apps-1.1.1_20120410.tar.bz2 ++
 12857 lines of diff (skipped)


++ sysconfig.dvb ++
--- /var/tmp/diff_new_pack.WqTrUV/_old  2012-06-01 07:20:02.0 +0200
+++ /var/tmp/diff_new_pack.WqTrUV/_new  2012-06-01 07:20:02.0 +0200
@@ -16,8 +16,6 @@
 # frontend modules. Set to no to not load dvb modules.
 #
 # Note: this is usually only needed if you want vdr to reload
-# certain modules when VDR_RELOADDVB is set. For any other purpose
-# use YaST2 or the hwup method as described in
-# /usr/share/doc/packages/dvb/README.SuSE to load modules.
+# certain modules when VDR_RELOADDVB is set.
 #
 DVB_LOAD_MODULES=

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit dvb for openSUSE:Factory

2012-04-02 Thread h_root
Hello community,

here is the log from the commit of package dvb for openSUSE:Factory checked in 
at 2012-04-02 10:29:00

Comparing /work/SRC/openSUSE:Factory/dvb (Old)
 and  /work/SRC/openSUSE:Factory/.dvb.new (New)


Package is dvb, Maintainer is d...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/dvb/dvb.changes  2011-09-26 10:30:13.0 
+0200
+++ /work/SRC/openSUSE:Factory/.dvb.new/dvb.changes 2012-04-02 
10:29:03.0 +0200
@@ -1,0 +2,6 @@
+Sat Mar 24 15:37:18 CET 2012 - jdelv...@suse.de
+
+- channels-fr-Gironde.patch Fix frequency tables for cities in
+  Gironde, France.
+
+---

New:

  channels-fr-Gironde.patch



Other differences:
--
++ dvb.spec ++
--- /var/tmp/diff_new_pack.EYdpxK/_old  2012-04-02 10:29:05.0 +0200
+++ /var/tmp/diff_new_pack.EYdpxK/_new  2012-04-02 10:29:05.0 +0200
@@ -43,6 +43,7 @@
 Patch1: dvb-includes.diff
 Patch2: cz-kojal.patch
 Patch3: dvb-apps-v4l-2.6.38.patch
+Patch4: channels-fr-Gironde.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 # This package provides the firmware for some cards supported by the
 # dvb-ttpci.ko module. Add the modalias dependencies for this module:
@@ -65,6 +66,7 @@
 %if 0%{?suse_version} = 1210
 %patch3
 %endif
+%patch4 -p1
 find -name .hg -type d | xargs rm -rfv
 find -name .cvsignore -type f | xargs rm -fv
 find -name '*.orig' -type f | xargs rm -fv

++ channels-fr-Gironde.patch ++
Fix frequency tables for cities in Gironde, France:
* The two transmitters in Bordeaux are using the same channels now,
  so we can use a single file.
* The transmitter in Arcachon uses the same channels too.
---
 util/scan/dvb-t/fr-Arcachon  |   18 --
 util/scan/dvb-t/fr-Bordeaux  |   20 +---
 util/scan/dvb-t/fr-Bordeaux-Bouliac  |   25 -
 util/scan/dvb-t/fr-Bordeaux-Cauderan |   25 -
 4 files changed, 17 insertions(+), 71 deletions(-)

--- dvb-apps-1.1.1_20100509.orig/util/scan/dvb-t/fr-Arcachon
+++ dvb-apps-1.1.1_20100509/util/scan/dvb-t/fr-Arcachon
@@ -1,25 +1,15 @@
-# Arcachon - France (DVB-T transmitter of Arcachon ( Agglomération ) )
-# Arcachon - France (signal DVB-T transmis depuis l'émetteur de Agglomération )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-...@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre n_es...@yahoo.fr
+# Arcachon - France (DVB-T transmitter of La Teste / Lege Piraillan)
 #
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
- Arcachon - Agglomération 
 #R1
 T 49000 8MHz AUTO NONE QAM64 8k AUTO NONE
 #R2
 T 60200 8MHz AUTO NONE QAM64 8k AUTO NONE
 #R3
-T 67400 8MHz AUTO NONE QAM64 8k AUTO NONE
+T 78600 8MHz AUTO NONE QAM64 8k AUTO NONE
 #R4
-T 55400 8MHz AUTO NONE QAM64 8k AUTO NONE
+T 61800 8MHz AUTO NONE QAM64 8k AUTO NONE
 #R5
-T 57800 8MHz AUTO NONE QAM64 8k AUTO NONE
+T 76200 8MHz AUTO NONE QAM64 8k AUTO NONE
 #R6
 T 54600 8MHz AUTO NONE QAM64 8k AUTO NONE
--- dvb-apps-1.1.1_20100509.orig/util/scan/dvb-t/fr-Bordeaux
+++ dvb-apps-1.1.1_20100509/util/scan/dvb-t/fr-Bordeaux
@@ -1,9 +1,15 @@
 # Bordeaux - France (DVB-T transmitter of Bouliac or Cauderan)
+#
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 48200 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 49000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 51400 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 54600 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 56200 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 77800 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 65800 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+#R1
+T 49000 8MHz AUTO NONE QAM64 8k AUTO NONE
+#R2
+T 60200 8MHz AUTO NONE QAM64 8k AUTO NONE
+#R3
+T 78600 8MHz AUTO NONE QAM64 8k AUTO NONE
+#R4
+T 61800 8MHz AUTO NONE QAM64 8k AUTO NONE
+#R5
+T 76200 8MHz AUTO NONE QAM64 8k AUTO NONE
+#R6
+T 54600 8MHz AUTO NONE QAM64 8k AUTO NONE
--- dvb-apps-1.1.1_20100509.orig/util/scan/dvb-t/fr-Bordeaux-Bouliac
+++ /dev/null
@@ -1,25 +0,0 @@
-# Bordeaux - France (DVB-T transmitter of Bordeaux ( BordeauxEst ) )
-# Bordeaux - France (signal DVB-T transmis depuis l'émetteur de BordeauxEst )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des 

commit dvb for openSUSE:Factory

2011-12-06 Thread h_root
Hello community,

here is the log from the commit of package dvb for openSUSE:Factory checked in 
at 2011-12-06 18:07:20

Comparing /work/SRC/openSUSE:Factory/dvb (Old)
 and  /work/SRC/openSUSE:Factory/.dvb.new (New)


Package is dvb, Maintainer is d...@suse.com

Changes:




Other differences:
--
++ dvb.spec ++
--- /var/tmp/diff_new_pack.FEc4iF/_old  2011-12-06 18:11:26.0 +0100
+++ /var/tmp/diff_new_pack.FEc4iF/_new  2011-12-06 18:11:26.0 +0100
@@ -27,7 +27,7 @@
 BuildRequires:  libv4l-devel = 0.8.4
 %endif
 %define firmwaredir /lib/firmware
-License:GPLv2+
+License:GPL-2.0+
 Group:  Hardware/TV
 PreReq: %fillup_prereq %insserv_prereq
 Version:1.1.1%{?snapver:_%snapver}


-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit dvb for openSUSE:Factory

2011-07-13 Thread h_root

Hello community,

here is the log from the commit of package dvb for openSUSE:Factory
checked in at Wed Jul 13 10:15:36 CEST 2011.




--- dvb/dvb.changes 2010-05-12 12:46:50.0 +0200
+++ /mounts/work_src_done/STABLE/dvb/dvb.changes2011-07-07 
11:42:10.0 +0200
@@ -1,0 +2,5 @@
+Thu Jul  7 09:40:08 UTC 2011 - idon...@novell.com
+
+- Add dvb-apps-v4l-2.6.38.patch: use the new v4l interface 
+
+---

calling whatdependson for head-i586


New:

  dvb-apps-v4l-2.6.38.patch



Other differences:
--
++ dvb.spec ++
--- /var/tmp/diff_new_pack.Zx9ELC/_old  2011-07-13 10:01:05.0 +0200
+++ /var/tmp/diff_new_pack.Zx9ELC/_new  2011-07-13 10:01:05.0 +0200
@@ -1,7 +1,7 @@
 #
-# spec file for package dvb (Version 1.1.1MACRO)
+# spec file for package dvb
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -24,6 +24,9 @@
 Name:   dvb
 BuildRequires:  libusb-devel
 BuildRequires:  fdupes
+%if 0%{?suse_version} = 1210
+BuildRequires:  libv4l-devel = 0.8.4
+%endif
 %define firmwaredir /lib/firmware
 License:GPLv2+
 Group:  Hardware/TV
@@ -41,6 +44,7 @@
 Patch:  dvb-apps-dvbnet.diff
 Patch1: dvb-includes.diff
 Patch2: cz-kojal.patch
+Patch3: dvb-apps-v4l-2.6.38.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 # This package provides the firmware for some cards supported by the
 # dvb-ttpci.ko module. Add the modalias dependencies for this module:
@@ -71,6 +75,9 @@
 %patch
 %patch1
 %patch2 -p1
+%if 0%{?suse_version} = 1210
+%patch3
+%endif
 find -name .hg -type d | xargs rm -rfv
 find -name .cvsignore -type f | xargs rm -fv
 find -name '*.orig' -type f | xargs rm -fv

++ dvb-apps-v4l-2.6.38.patch ++
--- test/video.c2010-05-09 08:03:42.0 +0200
+++ test/video.c2011-07-07 11:39:38.600089407 +0200
@@ -22,7 +22,7 @@
 #include string.h
 
 #include linux/fb.h
-#include linux/videodev.h
+#include libv4l1-videodev.h
 
 #define VIDEO_DEV /dev/video0
 #define FB_DEV /dev/fb0






Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org