diff --git a/.gitignore b/.gitignore index d8acb87..92bda7c 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /vdr-plugin-epg2vdr-87802bc33f366fc852121d48a0f8be609cbe65f4.tar.bz2 /vdr-plugin-epg2vdr-ec38f0c4337706291ac6dd7fdd711dfce9ece60f.tar.bz2 /vdr-plugin-epg2vdr-b2fe603e100092c84c6b7b9c8c1914573ab511cc.tar.bz2 +/vdr-plugin-epg2vdr-0.3.47.tar.bz2 diff --git a/sources b/sources index 702af3b..2d64d47 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c4203afbceec5de9cf6e721fa2922f4d vdr-plugin-epg2vdr-b2fe603e100092c84c6b7b9c8c1914573ab511cc.tar.bz2 +aa8bd08360d357691d8671063842c589 vdr-plugin-epg2vdr-0.3.47.tar.bz2 diff --git a/vdr-epg2vdr-makefile.patch b/vdr-epg2vdr-makefile.patch deleted file mode 100644 index c8fad8b..0000000 --- a/vdr-epg2vdr-makefile.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -Naur vdr-plugin-epg2vdr-324f3928b068255f0c4bf6ed0a575485f5ead1c4/Makefile.pre-1.7.35 vdr-plugin-epg2vdr-324f3928b068255f0c4bf6ed0a575485f5ead1c4.new/Makefile.pre-1.7.35 ---- vdr-plugin-epg2vdr-324f3928b068255f0c4bf6ed0a575485f5ead1c4/Makefile.pre-1.7.35 2014-03-22 17:30:38.000000000 +0100 -+++ vdr-plugin-epg2vdr-324f3928b068255f0c4bf6ed0a575485f5ead1c4.new/Makefile.pre-1.7.35 2014-05-01 14:03:28.829117545 +0200 -@@ -35,7 +35,7 @@ - - ### Libraries - --LIBS = -lmysqlclient -+LIBS = $(shell mysql_config --libs) - - ### Allow user defined options to overwrite defaults: - -diff -Naur vdr-plugin-epg2vdr-324f3928b068255f0c4bf6ed0a575485f5ead1c4/Makefile.since-1.7.35 vdr-plugin-epg2vdr-324f3928b068255f0c4bf6ed0a575485f5ead1c4.new/Makefile.since-1.7.35 ---- vdr-plugin-epg2vdr-324f3928b068255f0c4bf6ed0a575485f5ead1c4/Makefile.since-1.7.35 2014-03-22 17:30:38.000000000 +0100 -+++ vdr-plugin-epg2vdr-324f3928b068255f0c4bf6ed0a575485f5ead1c4.new/Makefile.since-1.7.35 2014-05-01 14:04:54.242088490 +0200 -@@ -34,7 +34,8 @@ - - #DEFINES += -D_IMG_LINK - --LIBS = -lmysqlclient_r -luuid -+LIBS = -luuid -+LIBS += $(shell mysql_config --libs) - EPG2VDR_DATA_DIR = "/var/cache/vdr" - - ifdef EPG2VDR_DATA_DIR diff --git a/vdr-epg2vdr.spec b/vdr-epg2vdr.spec index 7ad8499..8e79727 100644 --- a/vdr-epg2vdr.spec +++ b/vdr-epg2vdr.spec @@ -1,19 +1,12 @@ -%global commit b2fe603e100092c84c6b7b9c8c1914573ab511cc -%global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global gitdate 20150203 - Name: vdr-epg2vdr -Version: 0.1.13 -Release: 7.%{gitdate}git%{shortcommit}%{?dist} +Version: 0.3.47 +Release: 1%{?dist} Summary: A plugin to retrieve EPG data from a mysql database into VDR Group: Applications/Multimedia License: GPL+ -# how to get the tarball -# go to http://projects.vdr-developer.org/git/vdr-plugin-tvscraper.git/commit/ -# click the link behind commit, then select the download links below. URL: http://projects.vdr-developer.org/git/vdr-plugin-epg2vdr.git -Source0: http://projects.vdr-developer.org/git/vdr-plugin-epg2vdr.git/snapshot/vdr-plugin-epg2vdr-%{commit}.tar.bz2 +Source0: https://projects.vdr-developer.org/git/vdr-plugin-epg2vdr.git/snapshot/vdr-plugin-epg2vdr-%{version}.tar.bz2 BuildRequires: sqlite-devel BuildRequires: openssl-devel @@ -33,7 +26,7 @@ was loaded from a mysql database. %prep -%setup -qn vdr-plugin-epg2vdr-%{commit} +%setup -qn vdr-plugin-epg2vdr-%{version} iconv -f iso-8859-1 -t utf-8 README > README.utf8 ; mv README.utf8 README export CFLAGS="%{optflags}" export CXXFLAGS="%{optflags}" @@ -51,11 +44,12 @@ chmod 0755 %{buildroot}/%{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %files -f %{name}.lang %license COPYING %doc HISTORY* README* +%config(noreplace) %{vdr_configdir}/plugins/epg2vdr/epg.dat %{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %changelog -* Fri Feb 05 2016 Fedora Release Engineering - 0.1.13-7.20150203gitb2fe603 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild +* Sun Mar 27 2016 Martin Gansser - 0.3.47-1 +- Update to 0.3.47 * Thu Nov 12 2015 Martin Gansser - 0.1.13-6.20151112gitb2fe603 - rebuild for new git release