From 8e9f1460c67d1e6430e602a4bfb69668f3a2f3bd Mon Sep 17 00:00:00 2001 From: Ville Skyttä Date: Jan 06 2016 16:20:53 +0000 Subject: Update to 2015-11-08-fe6079b60c6b, ship COPYING* as %license --- diff --git a/.gitignore b/.gitignore index c33713e..0681d9a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ # Lines starting with '#' are considered comments. # Ignore editor backupfiles *~ +*.tar.* diff --git a/dtv-scan-tables.spec b/dtv-scan-tables.spec index 2d9a72c..57905e8 100644 --- a/dtv-scan-tables.spec +++ b/dtv-scan-tables.spec @@ -1,13 +1,15 @@ +%global date 2015-11-08 +%global git fe6079b60c6b + Name: dtv-scan-tables Version: 1 -Release: 3.20140905git4aad313%{?dist} +Release: 3.%(echo %{date} | tr -d -)git%{git}%{?dist} Summary: Digital TV scan tables #2013-07-19: License discussed in: https://bugzilla.redhat.com/show_bug.cgi?id=986051#c4 License: Public Domain URL: http://git.linuxtv.org/cgit.cgi/dtv-scan-tables.git/ -Source0: http://linuxtv.org/downloads/dtv-scan-tables/%{name}-2014-09-05-4aad313.tar.bz2 -Patch0: add_install_target.patch +Source0: http://linuxtv.org/downloads/dtv-scan-tables/dtv-scan-tables-%{date}-%{git}.tar.bz2 BuildArch: noarch BuildRequires: v4l-utils >= 1.4.0 # FPC permission for Conflicts: @@ -20,8 +22,7 @@ This package contains digital TV scan tables that are used by TV applications to scan for channels. %package legacy -Summary: Digital TV scan tables at the legacy format. -License: Public Domain +Summary: Digital TV scan tables in the legacy DVBv3 format %description legacy This package contains digital TV scan tables that are used by TV applications @@ -31,27 +32,25 @@ dvb-apps. %prep %setup -T -c %{__tar} xf %{SOURCE0} --transform="s,/usr/share/dvb/,," -%patch0 -p1 %build make dvbv3 %install make DATADIR=%{buildroot}/%{_datadir} install install_v3 -%{__mkdir_p} %{buildroot}/%{_pkgdocdir} -cp COPYING* %{buildroot}/%{_pkgdocdir} %files legacy -%doc %{_pkgdocdir}/COPYING -%doc %{_pkgdocdir}/COPYING.LGPL +%license COPYING COPYING.LGPL %{_datadir}/dvbv3/ %files -%doc %{_pkgdocdir}/COPYING -%doc %{_pkgdocdir}/COPYING.LGPL -%{_datadir}/dvbv5 +%license COPYING COPYING.LGPL +%{_datadir}/dvbv5/ %changelog +* Wed Jan 6 2016 Ville Skyttä - 1-3.20151108gitfe6079b60c6b +- Update to 2015-11-08-fe6079b60c6b, ship COPYING* as %%license + * Wed Jun 17 2015 Fedora Release Engineering - 1-3.20140905git4aad313 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index b394c7d..7502246 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c6d896750369717f8651ee2a504748c7 dtv-scan-tables-2014-09-05-4aad313.tar.bz2 +65594a08f9413ba2375797ab503f64e1 dtv-scan-tables-2015-11-08-fe6079b60c6b.tar.bz2