commit d95b6c242be76e9b9dab4374167dd9fe6e5e8849
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sun Oct 8 19:37:23 2017 +0100
Update to 2.24
.gitignore | 1 +
sources | 2 +-
yle-dl.spec | 49 ++++++++++++++++++++++++++++++-------------------
3 files changed, 32 insertions(+), 20 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7f9c363..bfd19d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ yle-dl-2.9.0.tar.gz
yle-dl-2.10.0.tar.gz
/yle-dl-2.10.2.tar.gz
/yle-dl-2.13.tar.gz
+/yle-dl-2.24.tar.gz
diff --git a/sources b/sources
index c6f3862..55c111d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b91c61798f2a7365c841267eeebcf9ea yle-dl-2.13.tar.gz
+f2f44aeab848871c0238629829aadd67 yle-dl-2.24.tar.gz
diff --git a/yle-dl.spec b/yle-dl.spec
index 77e3544..1a2d973 100644
--- a/yle-dl.spec
+++ b/yle-dl.spec
@@ -1,18 +1,25 @@
Name: yle-dl
-Version: 2.13
-Release: 3%{?dist}
-License: GPLv2
+Version: 2.24
+Release: 1%{?dist}
+License: GPLv3
Summary: Command-line tool to download videos from Finnish broadcasting company
-Group: Applications/Multimedia
-Url:
http://aajanki.github.io/yle-dl/
-Source0:
https://github.com/aajanki/%{name}/archive/%{version}/%{name}-%{version}....
+URL:
http://aajanki.github.io/yle-dl/
+Source0:
https://github.com/aajanki/%{name}/archive/%{version}/%{name}-%{version}....
+BuildRequires: python2-devel
+BuildRequires: python2-setuptools
BuildRequires: sed
-Requires: rtmpdump python-crypto php-cli php-bcmath php-xml php-mcrypt
-BuildArch: noarch
+Requires: rtmpdump
+Requires: python2-crypto
+Requires: python2-requests
+Requires: python-progress
+Requires: python2-lxml
+Requires: php-cli
+Requires: php-bcmath
+Requires: php-xml
+Requires: php-mcrypt
-#global commit 158c026271198696a7a329b3c2de3e2197de3e25
-#global shortcommit %(c=%{commit}; echo ${c:0:7})
+BuildArch: noarch
%description
yle-dl is a command-line program for downloading media files
@@ -27,25 +34,29 @@ boxee.
%prep
-%setup -q
+%autosetup
+sed -i -e 's@/usr/bin/env python2@/usr/bin/python2@g' yledl/yledl.py
%build
-sed -i 's|/usr/local/share/yle-dl/AdobeHDS.php|/usr/share/yle-dl/AdobeHDS.php|g'
%{_builddir}/%{name}-%{version}/yle-dl
+%py2_build
%install
-rm -rf %{buildroot}
-mkdir -p %{buildroot}/%{_docdir}
-mkdir -p %{buildroot}/%{_datadir}/%{name}
-make DESTDIR=%{buildroot} prefix=%{_usr} install
+%py2_install
+chmod a+x %{buildroot}%{python2_sitelib}/yledl/yledl.py
%files
-%defattr(-,root,root)
-%doc ChangeLog COPYING README.md README.fi
+%doc ChangeLog README.md README.fi
+%license COPYING
%{_bindir}/yle-dl
-%{_datadir}/%{name}
+%{python2_sitelib}/yledl/
+%{python2_sitelib}/yle_dl-%{version}-py2.7.egg-info/
%changelog
+* Sun Oct 08 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2.24-1
+- Update to 2.24
+- Clean up spec file
+
* Thu Aug 31 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 2.13-3
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild