Merge branch 'master' into el6

Conflicts:
	sources
	youtube-dl.spec

.gitignore

@@ -7,3 +7,15 @@
 /youtube-dl-2013.05.23.tar.gz
 /youtube-dl-2013.06.31.tar.gz
 /youtube-dl-2013.07.02.tar.gz
+/youtube-dl-2013.07.10.tar.gz
+/youtube-dl-2013.07.12.tar.gz
+/youtube-dl-2013.07.17.1.tar.gz
+/youtube-dl-2013.07.19.tar.gz
+/youtube-dl-2013.07.25.2.tar.gz
+/youtube-dl-2013.08.02.tar.gz
+/youtube-dl-2013.08.09.tar.gz
+/youtube-dl-2013.08.17.tar.gz
+/youtube-dl-2013.08.23.tar.gz
+/youtube-dl-2013.08.27.tar.gz
+/youtube-dl-2013.08.29.tar.gz
+/youtube-dl-2013.08.30.tar.gz

sources

@@ -1,3 +1 @@
-e426467eee65cb6224e1ca37433296d1  youtube-dl-2013.07.19.tar.gz
+f9e5574fe3b645892a7d814797b8a607  youtube-dl-2013.08.30.tar.gz
-db09e5672c674ccadd3c9afed77189d9  youtube-dl-2013.07.25.2.tar.gz
-772d2bbf3e9bcfc3da05d956cf6d8705  youtube-dl-2013.08.02.tar.gz

youtube-dl.spec

@@ -1,21 +1,18 @@
 Name:           youtube-dl
-Version:        2013.08.17
+Version:        2013.08.30
 Release:        1%{?dist}
 Summary:        A small command-line program to download online videos
 License:        Public Domain
-URL:            http://youtube-dl.org
+URL:            https://yt-dl.org
-Source0:        http://youtube-dl.org/downloads/%{version}/%{name}-%{version}.tar.gz
+Source0:        https://yt-dl.org/downloads/%{version}/%{name}-%{version}.tar.gz
 Source1:        %{name}.conf
-
-BuildArch:      noarch
-# Used in Makefile to generate youtube-dl
-BuildRequires:  zip
 # Used to generate manpage
 BuildRequires:  pandoc
 BuildRequires:  python
-#Tests
+# Tests failed because of no connection in Koji.
 #BuildRequires:  python-nose
 Requires:       python
+BuildArch:      noarch
 
 %description
 Small command-line program to download videos from YouTube and other sites.
@@ -27,25 +24,12 @@ Small command-line program to download videos from YouTube and other sites.
 make %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot}
+make install DESTDIR=%{buildroot} \
-make install DESTDIR="%{buildroot}" PREFIX="%{_prefix}" MANDIR="%{_mandir}"
+             PREFIX=%{_prefix} \
-mkdir -p %{buildroot}%{_sysconfdir}
+             MANDIR=%{_mandir} \
-install -p -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}
+             PYTHON=%{_bindir}/python
-
-%clean
-rm -rf %{buildroot}
-
-%files
-%doc CHANGELOG LICENSE
-make install DESTDIR="%{buildroot}" \
-    PREFIX="%{_prefix}" \
-    MANDIR="%{_mandir}" \
-    PYTHON="%{_bindir}/python"
 mkdir -p %{buildroot}%{_sysconfdir}
-install -p -m644 %{S:1} %{buildroot}%{_sysconfdir}
+install -pm644 %{S:1} %{buildroot}%{_sysconfdir}
-
-%check
-#make test
 
 %files
 %doc LICENSE
@@ -55,16 +39,13 @@ install -p -m644 %{S:1} %{buildroot}%{_sysconfdir}
 %{_sysconfdir}/bash_completion.d/%{name}
 
 %changelog
-* Sun Aug 18 2013 Christopher Meng <rpm@cicku.me> - 2013.08.17-1
+* Mon Sep 02 2013 Christopher Meng <rpm@cicku.me> - 2013.08.30-1
 - Update to new release.
 
-* Sat Aug 03 2013 Christopher Meng <rpm@cicku.me> - 2013.08.02-1
+* Sun Aug 18 2013 Christopher Meng <rpm@cicku.me> - 2013.08.17-1
-- Update to new release.
-
-* Mon Jul 22 2013 Christopher Meng <rpm@cicku.me> - 2013.07.19-1
 - Update to new release.
 
-* Tue Jul 16 2013 Christopher Meng <rpm@cicku.me> - 2013.07.12-1
+* Sat Aug 03 2013 Christopher Meng <rpm@cicku.me> - 2013.08.02-1
 - Update to new release.
 
 * Tue Jul 02 2013 Christopher Meng <rpm@cicku.me> - 2013.07.02-1