X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=youtube-dl.spec;h=3e2af2072bbbb3eb06768a26e5c02bf4d5043eff;hb=c62704efb4e17d298f14d35dfde8b94e2697dac1;hp=ecb9f01d30c119d2bbdfb1d03501b2eb4e2fcbef;hpb=873019f960e282e88cf6d512b95297625c7f6dcb;p=packages%2Fyoutube-dl.git

diff --git a/youtube-dl.spec b/youtube-dl.spec
index ecb9f01..3e2af20 100644
--- a/youtube-dl.spec
+++ b/youtube-dl.spec
@@ -1,5 +1,9 @@
+#
+# Conditional build:
+%bcond_without	python3	# CPython 3.x module
+
 # full version number as seen on youtube-dl website
-%define	verlong	2018.09.08
+%define	verlong	2019.04.01
 
 # transform version so we don't have to bump epoch after four digit upgrades:
 # 2013.01.17.1 becomes 20130117_1
@@ -16,7 +20,7 @@ Epoch:		2
 License:	Public Domain
 Group:		Applications/System
 Source0:	http://youtube-dl.org/downloads/%{verlong}/%{name}-%{verlong}.tar.gz
-# Source0-md5:	bdae6cdb4111b3c1767164937a27d933
+# Source0-md5:	f12a3cb37cd4acb73fcb4096fa6c87b3
 Source1:	%{name}.conf
 # should be downloaded from:
 # https://github.com/rg3/youtube-dl/pull/10291.diff
@@ -24,19 +28,20 @@ Source1:	%{name}.conf
 # git log -p --reverse pr/10291~3..pr/10291
 Patch0:		10291.diff
 URL:		http://youtube-dl.org/
+BuildRequires:	python-modules >= 1:2.6
 BuildRequires:	python-setuptools
+%if %{with python3}
+BuildRequires:	python3-modules >= 1:3.2
+BuildRequires:	python3-setuptools
+%endif
 BuildRequires:	rpm-pythonprov
-BuildRequires:	rpmbuild(macros) >= 1.713
-Requires:	python-pyxattr >= 0.5.0
+BuildRequires:	rpmbuild(macros) >= 1.720
 Requires:	python-setuptools
+Requires:	python-%{name} = %{epoch}:%{version}-%{release}
 Suggests:	ffmpeg
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		bash_compdir	%{_datadir}/bash-completion/completions
-%define		fish_compdir	%{_datadir}/fish/completions
-%define		zsh_compdir	%{_datadir}/zsh/site-functions
-
 %description
 youtube-dl is a small command-line program to download videos from
 YouTube.com.
@@ -70,6 +75,30 @@ Fish completion for youtube-dl command.
 %description -n fish-completion-%{name} -l pl.UTF-8
 Dopełnianie parametrów w fish dla polecenia youtube-dl.
 
+%package -n python-%{name}
+Summary:	Python 2 video extraction utility for YouTube
+Summary(pl.UTF-8):	Narzędzie do wydobywania filmów z YouTube dla Pythona 2
+Group:		Libraries/Python
+Requires:	python-pyxattr >= 0.5.0
+
+%description -n python-%{name}
+Python 2 video extraction utility for YouTube.
+
+%description -n python-%{name} -l pl.UTF-8
+Narzędzie do wydobywania filmów z YouTube dla Pythona 2.
+
+%package -n python3-%{name}
+Summary:	Python 3 video extraction utility for YouTube
+Summary(pl.UTF-8):	Narzędzie do wydobywania filmów z YouTube dla Pythona 3
+Group:		Libraries/Python
+Requires:	python3-pyxattr >= 0.5.0
+
+%description -n python3-%{name}
+Python 3 video extraction utility for YouTube.
+
+%description -n python3-%{name} -l pl.UTF-8
+Narzędzie do wydobywania filmów z YouTube dla Pythona 3.
+
 %package -n zsh-completion-%{name}
 Summary:	Zsh completion for youtube-dl command
 Summary(pl.UTF-8):	Dopełnianie parametrów w zsh dla polecenia youtube-dl
@@ -85,14 +114,23 @@ Dopełnianie parametrów w zsh dla polecenia youtube-dl.
 
 %prep
 %setup -qc
-mv %{name} .tmp; mv .tmp/* .
+%{__mv} %{name} .tmp; %{__mv} .tmp/* .
 %patch0 -p1
 
 %build
 %py_build
 
+%if %{with python3}
+%py3_build
+%endif
+
 %install
 rm -rf $RPM_BUILD_ROOT
+
+%if %{with python3}
+%py3_install
+%endif
+
 %py_install
 %py_postclean
 
@@ -116,8 +154,6 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/youtube-dl.conf
 %attr(755,root,root) %{_bindir}/youtube-dl
 %{_mandir}/man1/youtube-dl.1*
-%{py_sitescriptdir}/youtube_dl
-%{py_sitescriptdir}/youtube_dl-*-py*.egg-info
 
 %files -n bash-completion-%{name}
 %defattr(644,root,root,755)
@@ -127,6 +163,18 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{fish_compdir}/%{name}.fish
 
+%files -n python-%{name}
+%defattr(644,root,root,755)
+%{py_sitescriptdir}/youtube_dl
+%{py_sitescriptdir}/youtube_dl-*-py*.egg-info
+
+%if %{with python3}
+%files -n python3-%{name}
+%defattr(644,root,root,755)
+%{py3_sitescriptdir}/youtube_dl
+%{py3_sitescriptdir}/youtube_dl-*-py*.egg-info
+%endif
+
 %files -n zsh-completion-%{name}
 %defattr(644,root,root,755)
 %{zsh_compdir}/_youtube-dl