From 8c4e2554c11688974b75790485b0b855de5356a3 Mon Sep 17 00:00:00 2001 From: Ankur Sinha (Ankur Sinha Gmail) Date: Dec 22 2016 02:51:20 +0000 Subject: Switch to py3 and python-mpd2 --- diff --git a/.gitignore b/.gitignore index b31e540..1eda07e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /mpDris2-0.4.tar.gz /mpdris2-048d3cb.tar.gz /mpdris2-a3af302.tar.gz +/mpdris2-3c3fe12.tar.gz diff --git a/mpdris2.spec b/mpdris2.spec index f8f2c6d..d301119 100644 --- a/mpdris2.spec +++ b/mpdris2.spec @@ -1,13 +1,11 @@ -%global commit0 a3af3028650812898e201a6f7718126ac43a57a6 +%global commit0 3c3fe123ce838a2ce5aea2b28ff0c418834a908f %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global tarname mpDris2 -%global checkoutdate 20160422 -# For F<20 -%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} +%global checkoutdate 20160917 Name: mpdris2 Version: 0.7 -Release: 2.%{checkoutdate}git%{shortcommit0}%{?dist} +Release: 3.%{checkoutdate}git%{shortcommit0}%{?dist} Summary: Provide MPRIS 2 support to mpd License: GPLv3+ @@ -16,8 +14,8 @@ Source0: https://github.com/eonpatapon/%{name}/archive/%{commit0}.tar.gz# BuildArch: noarch -BuildRequires: gettext intltool desktop-file-utils -Requires: dbus-python python-mpd pygobject2 +BuildRequires: gettext intltool desktop-file-utils python3-devel +Requires: python3-dbus python3-mpd2 python3-gobject %description mpDris2 provides MPRIS 2 support to mpd (Music Player Daemon). @@ -31,23 +29,27 @@ mpd server %build -./autogen.sh +env NOCONFIGURE=1 ./autogen.sh +export PYTHON=%{__python3} %configure --docdir=%{_pkgdocdir} make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT %make_install +# Remove so that we can use %license +rm -fv %{buildroot}%{_docdir}/%{name}/COPYING +sed -i '1 s:#!.*:#!%{__python3}:' %{buildroot}%{_bindir}/%{tarname} -desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %find_lang %{tarname} %files -f %{tarname}.lang %config(noreplace) %{_sysconfdir}/xdg/autostart/%{name}.desktop -%doc AUTHORS COPYING README +%doc AUTHORS README +%license COPYING %{_bindir}/%{tarname} %{_datadir}/applications/%{name}.desktop %{_datadir}/dbus-1/services/org.mpris.MediaPlayer2.mpd.service @@ -56,6 +58,10 @@ desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.desktop %changelog +* Wed Dec 21 2016 Ankur Sinha - 0.7-3.20160917git3c3fe12 +- Update to new upstream commit +- use Py3 - fixes #1404618 + * Fri Apr 22 2016 Ankur Sinha 0.7-2.20160422gita3af302 - Update to latest git commit to fix rhbz #1322498 diff --git a/sources b/sources index b422123..4090c60 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a89f39a815d449781ee3fdc55d59923c mpdris2-a3af302.tar.gz +SHA512 (mpdris2-3c3fe12.tar.gz) = cc55c4d420c91a19f7b3b17308dc98920d2371d909fa6aafea9c71a6d37636c1c228528a62fb7baae64e3549f7247ca35bfffb3f4800898c3f94f55eb29406e2