commit 61f3b8fd463f116118deccaaaf1129a9964a42a9 Author: Martin Gansser <martinkg(a)fedoraproject.org&gt; Date: Fri Jan 19 09:45:48 2018 +0100 Update to 2.1.0-1.20180118gitcdd6595 .gitignore | 1 + sources | 2 +- vdr-xineliboutput.spec | 36 ++++++++++++++++++------------------ 3 files changed, 20 insertions(+), 19 deletions(-) --- diff --git a/.gitignore b/.gitignore index 04e7f45..160adaa 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ vdr-xineliboutput-1.1.0-20150422.tgz /vdr-xineliboutput-1.1.0-71eefbe.tar.gz /vdr-xineliboutput-1.1.0-46f0f1d.tar.gz /vdr-xineliboutput-2.0.0-f397e7e.tar.gz +/vdr-xineliboutput-2.1.0-cdd6595.tar.gz diff --git a/sources b/sources index 5e3e2dc..97e4154 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -eeca05191e00fe79359215f497cf49b2 vdr-xineliboutput-2.0.0-f397e7e.tar.gz +399001fc883d1d7d62213413853bd2ca vdr-xineliboutput-2.1.0-cdd6595.tar.gz diff --git a/vdr-xineliboutput.spec b/vdr-xineliboutput.spec index 3f604b3..2579358 100644 --- a/vdr-xineliboutput.spec +++ b/vdr-xineliboutput.spec @@ -1,16 +1,16 @@ -%global xinever %(xine-config --version 2>/dev/null || echo ERROR) -%global xineplugindir %(xine-config --plugindir 2>/dev/null || echo ERROR) -%global xinepluginver 2.0.1 +%global xinever %(pkg-config --modversion libxine 2>/dev/null || echo ERROR) +%global xineplugindir %(pkg-config --variable=plugindir libxine 2>/dev/null || echo ERROR) +%global xinepluginver 2.1.0 %global pname xineliboutput -%global vdrver %(vdr-config --version 2>/dev/null || echo ERROR) -%global gitrev f397e7e -%global gitdate 20171207 +%global vdrver %(pkg-config --modversion vdr 2>/dev/null || echo ERROR) +%global gitrev cdd6595 +%global gitdate 20180118 # build bluray support (disabled for now) %global have_bluray 1 Name: vdr-%{pname} -Version: 2.0.0 -Release: 2.%{gitdate}git%{gitrev}%{?dist} +Version: 2.1.0 +Release: 1.%{gitdate}git%{gitrev}%{?dist} Summary: Plugins for watching VDR over Xine Group: Applications/Multimedia License: GPLv2+ @@ -19,8 +19,8 @@ URL: http://sourceforge.net/projects/xineliboutput # git clone git://git.code.sf.net/p/xineliboutput/git vdr-xineliboutput # cd vdr-xineliboutput # git rev-parse --short HEAD -# git archive --format=tar.gz --prefix=vdr-xineliboutput/ %{gitrev} \ -# -o vdr-xineliboutput-%{version}-%{gitrev}.tar.gz +# git archive --format=tar.gz --prefix=vdr-xineliboutput/ %%{gitrev} \ +# -o vdr-xineliboutput-%%{version}-%%{gitrev}.tar.gz Source0: %{name}-%{version}-%{gitrev}.tar.gz Source1: %{name}.conf Source2: allowed_hosts.conf @@ -109,10 +109,10 @@ install -pm 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/vdr/plugins/%{pname}/ %make_install install -pm 755 mpg2c %{buildroot}%{_bindir}/mpg2c -ln -s %{vdr_plugindir}/libxineliboutput-fbfe.so.%{xinepluginver}-git \ - %{buildroot}%{vdr_plugindir}/libxineliboutput-fbfe.so.%{xinepluginver} -ln -s %{vdr_plugindir}/libxineliboutput-sxfe.so.%{xinepluginver}-git \ - %{buildroot}%{vdr_plugindir}/libxineliboutput-sxfe.so.%{xinepluginver} +#ln -s %%{vdr_plugindir}/libxineliboutput-fbfe.so.%%{xinepluginver}-git \ +# %%{buildroot}%{vdr_plugindir}/libxineliboutput-fbfe.so.%%{xinepluginver} +#ln -s %%{vdr_plugindir}/libxineliboutput-sxfe.so.%%{xinepluginver}-git \ +# %%{buildroot}%%{vdr_plugindir}/libxineliboutput-sxfe.so.%%{xinepluginver} install -pm 644 black_720x576.mpg %{buildroot}%{_sysconfdir}/vdr/plugins/%{pname} install -pm 644 nosignal_720x576.mpg %{buildroot}%{_sysconfdir}/vdr/plugins/%{pname} install -pm 644 vdrlogo_720x576.mpg %{buildroot}%{_sysconfdir}/vdr/plugins/%{pname} @@ -144,13 +144,13 @@ find %{buildroot}%{xineplugindir} -name '*.so' -exec chmod +x '{}' ';' %{vdr_plugindir}/libvdr-%{pname}.so.%{vdr_apiversion} %{vdr_plugindir}/libxineliboutput-fbfe.so.%{xinepluginver} -%{vdr_plugindir}/libxineliboutput-fbfe.so.%{xinepluginver}-git +#%%{vdr_plugindir}/libxineliboutput-fbfe.so.%%{xinepluginver}-git %{vdr_plugindir}/libxineliboutput-sxfe.so.%{xinepluginver} -%{vdr_plugindir}/libxineliboutput-sxfe.so.%{xinepluginver}-git +#%%{vdr_plugindir}/libxineliboutput-sxfe.so.%%{xinepluginver}-git %changelog -* Thu Jan 18 2018 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 2.0.0-2.20171207gitf397e7e -- Rebuilt for ffmpeg-3.5 git +* Thu Jan 18 2018 Martin Gansser <martinkg(a)fedoraproject.org&gt; - 2.1.0-1.20180118gitcdd6595 +- Update to 2.1.0-1.20180118gitcdd6595 * Thu Dec 28 2017 Martin Gansser <martinkg(a)fedoraproject.org&gt; - 2.0.0-1.20171207gitf397e7e - Update to 2.0.0-1.20171207gitf397e7e