From 414ee24d1ac74782a370eeaf717ff3bdeaf19e01 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Aug 16 2015 08:30:19 +0000 Subject: Mark license files as %license where available - added epgd-tool-fedora.diff so mariadb is taken --- diff --git a/.gitignore b/.gitignore index 22eb468..6079f4e 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /vdr-epg-daemon-006a005a9c74de08b93c7216c797194ddaaf2043.tar.bz2 /vdr-epg-daemon-7927905c337e38cbc5a8cef3a32b905e9e976e6a.tar.bz2 /vdr-epg-daemon-8887f01870fec2332c1f8eef919cf86fb439c2f3.tar.bz2 +/epgd-tool-fedora.diff diff --git a/sources b/sources index ad22443..4766b16 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bd1bb1058867d3a46cbf8f6524a2028c vdr-epg-daemon-8887f01870fec2332c1f8eef919cf86fb439c2f3.tar.bz2 +de5810c5fc98a0fbbf9b9f5809fd0f9a epgd-tool-fedora.diff diff --git a/vdr-epg-daemon.spec b/vdr-epg-daemon.spec index ff9847e..859df0f 100644 --- a/vdr-epg-daemon.spec +++ b/vdr-epg-daemon.spec @@ -7,7 +7,7 @@ Name: vdr-epg-daemon Version: 0.2.2 -Release: 4.%{gitdate}git%{shortcommit}%{?dist} +Release: 5.%{gitdate}git%{shortcommit}%{?dist} Summary: A daemon to download EPG data from internet and manage it in a mysql database Group: Applications/Multimedia @@ -16,6 +16,8 @@ URL: http://projects.vdr-developer.org/projects/vdr-epg-daemon Source0: http://projects.vdr-developer.org/git/vdr-epg-daemon.git/snapshot/vdr-epg-daemon-%{commit}.tar.bz2 # fix Optimization flags are not honored. Patch0: vdr-epg-daemon-makefile.patch +# http://projects.vdr-developer.org/issues/2191 +Patch1: epgd-tool-fedora.diff BuildRequires: libcurl-devel BuildRequires: libxslt-devel @@ -35,7 +37,7 @@ Requires: mariadb-server Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units -Requires: vdr +Requires: vdr %description @@ -53,6 +55,7 @@ working environment. %prep %setup -qn vdr-epg-daemon-%{commit} %patch0 -p0 +%patch1 -p1 iconv -f iso-8859-1 -t utf-8 README > README.utf8 ; mv README.utf8 README ## Optimization flags in 'Make.config' file @@ -107,7 +110,8 @@ install -Dpm 644 contrib/epgd.service %{buildroot}/%{_unitdir}/epgd.service %systemd_postun_with_restart epgd.service %files -%doc COPYING HISTORY* README epglv/README* contrib/README.fedora +%doc HISTORY* README epglv/README* contrib/README.fedora +%license COPYING %{_bindir}/epg* %dir %{_sysconfdir}/epgd %config(noreplace) %{_sysconfdir}/epgd/* @@ -117,6 +121,10 @@ install -Dpm 644 contrib/epgd.service %{buildroot}/%{_unitdir}/epgd.service %{_libdir}/mysql/plugin/mysqlepglv.so %changelog +* Sun Aug 16 2015 Martin Gansser - 0.2.2-5.20150810git8887f01 +- Mark license files as %%license where available +- added epgd-tool-fedora.diff so mariadb is taken + * Sat Aug 15 2015 Martin Gansser - 0.2.2-4.20150810git8887f01 - rebuild for new git release