Merge branch 'master' into el6

Conflicts:
	.gitignore
	sources
	youtube-dl.spec

.gitignore

@@ -3,4 +3,10 @@
 /youtube-dl-2013.01.13.tar.gz
 /youtube-dl-2013.04.18.tar.gz
 /youtube-dl-2013.05.07.tar.gz
+<<<<<<< HEAD
 /youtube-dl-2013.05.14.tar.gz
+=======
+/youtube-dl-2013.05.23.tar.gz
+/youtube-dl-2013.06.31.tar.gz
+/youtube-dl-2013.07.02.tar.gz
+>>>>>>> master

sources

@@ -1,3 +1,2 @@
-139ffe39568318a5939edf05afbac4d0  youtube-dl-2013.05.14.tar.gz
-6cb4ee904456d102d4f3edb68272ca50  youtube-dl-2013.05.23.tar.gz
 83638449553afa6bedce40edc254d182  youtube-dl-2013.06.31.tar.gz
+89f7959dec2a7e669887b509bb101358  youtube-dl-2013.07.02.tar.gz

youtube-dl.spec

@@ -1,30 +1,30 @@
 Name:           youtube-dl
-Version:        2013.06.31
+Version:        2013.07.02
 Release:        1%{?dist}
-Summary:        A small command-line program to download videos from YouTube.com and other sites
+Summary:        A small command-line program to download online videos
 License:        Public Domain
 URL:            http://youtube-dl.org
 Source0:        http://youtube-dl.org/downloads/%{version}/%{name}-%{version}.tar.gz
 Source1:        %{name}.conf
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 # Used in Makefile to generate youtube-dl
 BuildRequires:  zip
 # Used to generate manpage
 BuildRequires:  pandoc
 BuildRequires:  python
+#Tests
+#BuildRequires:  python-nose
 Requires:       python
 
 %description
-Small command-line program to download videos from YouTube.
+Small command-line program to download videos from YouTube and other sites.
 
 %prep
-%setup -cqTn %{name}-%{version}
-gzip -dc %{SOURCE0} | tar --strip-components=1 -xvvf -
+%setup -qn %{name}
 
 %build
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
@@ -37,12 +37,28 @@ 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}
+
+%check
+#make test
+
+%files
+%doc LICENSE
 %{_bindir}/%{name}
 %{_mandir}/man1/%{name}.1*
 %config(noreplace) %{_sysconfdir}/%{name}.conf
 %{_sysconfdir}/bash_completion.d/%{name}
 
 %changelog
+* Tue Jul 02 2013 Christopher Meng <rpm@cicku.me> - 2013.07.02-1
+- Update to new release.
+- SPEC cleanup.
+
 * Wed Jun 26 2013 Christopher Meng <rpm@cicku.me> - 2013.06.31-1
 - Update to new release.