Merge branch 'master' into el6

Conflicts:
	youtube-dl.spec

.gitignore

@@ -1,2 +1,6 @@
 /youtube-dl-2014.03.12.tar.gz
 /youtube-dl-2014.04.11.1.tar.gz
+/youtube-dl-2014.05.05.tar.gz
+/youtube-dl-2014.06.07.tar.gz
+/youtube-dl-2014.06.24.1.tar.gz
+/youtube-dl-2014.07.11.3.tar.gz

sources

@@ -1 +1 @@
-1567138e7c93a810a73e7abaa33997a6  youtube-dl-2014.04.11.1.tar.gz
+bf3d36ad1d9bc6fb20cf45a5f050221e  youtube-dl-2014.07.11.3.tar.gz

youtube-dl.spec

@@ -1,12 +1,12 @@
 Name:           youtube-dl
-Version:        2014.04.11.1
+Version:        2014.07.11.3
 Release:        1%{?dist}
 Summary:        A small command-line program to download online videos
 License:        Public Domain
 URL:            https://yt-dl.org
 Source0:        https://yt-dl.org/downloads/%{version}/%{name}-%{version}.tar.gz
 Source1:        %{name}.conf
-BuildRequires:  python
+BuildRequires:  python2
 # Tests failed because of no connection in Koji.
 # BuildRequires:  python-nose
 Requires:       python
@@ -37,6 +37,9 @@ install -pm644 %{S:1} %{buildroot}%{_sysconfdir}
 %{_sysconfdir}/bash_completion.d/%{name}
 
 %changelog
+* Sat Jul 12 2014 Christopher Meng <rpm@cicku.me> - 2014.07.11.3-1
+- Update to 2014.07.11.3
+
 * Fri Apr 11 2014 Christopher Meng <rpm@cicku.me> - 2014.04.11.1-1
 - Update to 2014.04.11.1