Merge branch 'master' into el6

.gitignore

@@ -26,3 +26,7 @@
 /youtube-dl-2013.09.20.1.tar.gz
 /youtube-dl-2013.09.24.2.tar.gz
 /youtube-dl-2013.09.29.tar.gz
+/youtube-dl-2013.10.07.tar.gz
+/youtube-dl-2013.10.09.tar.gz
+/youtube-dl-2013.10.17.tar.gz
+/youtube-dl-2013.10.18.2.tar.gz

sources

@@ -1 +1 @@
-7f5a8b7a411e833e9a0d8759140e1949  youtube-dl-2013.09.29.tar.gz
+dd86912d1bf1a7a550df06e59c436063  youtube-dl-2013.10.18.2.tar.gz

youtube-dl.spec

@@ -1,16 +1,14 @@
 Name:           youtube-dl
-Version:        2013.09.29
+Version:        2013.10.18.2
 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
-# Used to generate manpage
-BuildRequires:  pandoc
 BuildRequires:  python
 # Tests failed because of no connection in Koji.
-#BuildRequires:  python-nose
+# BuildRequires:  python-nose
 Requires:       python
 BuildArch:      noarch
 
@@ -39,6 +37,18 @@ install -pm644 %{S:1} %{buildroot}%{_sysconfdir}
 %{_sysconfdir}/bash_completion.d/%{name}
 
 %changelog
+* Sun Oct 20 2013 Christopher Meng <rpm@cicku.me> - 2013.10.18.2-1
+- Update to new release(BZ#1020787).
+
+* Thu Oct 17 2013 Christopher Meng <rpm@cicku.me> - 2013.10.17-1
+- Update to new release(BZ#1019694).
+
+* Thu Oct 10 2013 Christopher Meng <rpm@cicku.me> - 2013.10.09-1
+- Update to new release(BZ#1017630).
+
+* Mon Oct 07 2013 Christopher Meng <rpm@cicku.me> - 2013.10.07-1
+- Update to new release(BZ#1014266).
+
 * Mon Sep 30 2013 Christopher Meng <rpm@cicku.me> - 2013.09.29-1
 - Update to new release(BZ#1013394).