[youtube-dl/el6: 15/15] Merge branch 'master' into el6

[Christopher Meng]

commit f2e92658fae3534edf9c19d3665b18abbcd8f2aa
Merge: ed3d2bd be78407
Author: Christopher Meng <rpm at cicku.me>
Date:   Mon Sep 2 09:35:28 2013 +0800

    Merge branch 'master' into el6
    
    Conflicts:
    	sources
    	youtube-dl.spec

 .gitignore      |   12 ++++++++++++
 sources         |    4 +---
 youtube-dl.spec |   45 +++++++++++++--------------------------------
 3 files changed, 26 insertions(+), 35 deletions(-)
---
diff --cc youtube-dl.spec
index f51e512,0a3088a..33228bc
--- a/youtube-dl.spec
+++ b/youtube-dl.spec
@@@ -27,26 -24,16 +24,13 @@@ Small command-line program to download 
  make %{?_smp_mflags}
  
  %install
- rm -rf %{buildroot}
- make install DESTDIR="%{buildroot}" PREFIX="%{_prefix}" MANDIR="%{_mandir}"
- mkdir -p %{buildroot}%{_sysconfdir}
- install -p -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}
- 
- %clean
- rm -rf %{buildroot}
- 
- %files
- %doc CHANGELOG LICENSE
- make install DESTDIR="%{buildroot}" \
-     PREFIX="%{_prefix}" \
-     MANDIR="%{_mandir}" \
-     PYTHON="%{_bindir}/python"
+ 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
+ install -pm644 %{S:1} %{buildroot}%{_sysconfdir}
  
 -%check
 -#make test
 -
  %files
  %doc LICENSE
  %{_bindir}/%{name}
@@@ -55,18 -42,42 +39,15 @@@
  %{_sysconfdir}/bash_completion.d/%{name}
  
  %changelog
- * Sun Aug 18 2013 Christopher Meng <rpm at cicku.me> - 2013.08.17-1
+ * Mon Sep 02 2013 Christopher Meng <rpm at cicku.me> - 2013.08.30-1
  - Update to new release.
  
- * Sat Aug 03 2013 Christopher Meng <rpm at cicku.me> - 2013.08.02-1
- - Update to new release.
- 
- * Mon Jul 22 2013 Christopher Meng <rpm at cicku.me> - 2013.07.19-1
 -* Fri Aug 30 2013 Christopher Meng <rpm at cicku.me> - 2013.08.29-1
 -- Update to new release.
 -
 -* Tue Aug 27 2013 Christopher Meng <rpm at cicku.me> - 2013.08.27-1
 -- Update to new release.
 -
 -* Sat Aug 24 2013 Christopher Meng <rpm at cicku.me> - 2013.08.23-1
 -- Update to new release.
 -
+ * Sun Aug 18 2013 Christopher Meng <rpm at cicku.me> - 2013.08.17-1
  - Update to new release.
  
- * Tue Jul 16 2013 Christopher Meng <rpm at cicku.me> - 2013.07.12-1
 -* Tue Aug 13 2013 Christopher Meng <rpm at cicku.me> - 2013.08.09-1
 -- Update to new release.
 -
+ * Sat Aug 03 2013 Christopher Meng <rpm at cicku.me> - 2013.08.02-1
  - Update to new release.
  
 -* Mon Jul 22 2013 Christopher Meng <rpm at cicku.me> - 2013.07.25.2-1
 -- Update to new release.
 -
 -* Mon Jul 22 2013 Christopher Meng <rpm at cicku.me> - 2013.07.19-1
 -- Update to new release.
 -
 -* Thu Jul 18 2013 Christopher Meng <rpm at cicku.me> - 2013.07.17.1-1
 -- Update to new release.
 -
 -* Tue Jul 16 2013 Christopher Meng <rpm at cicku.me> - 2013.07.12-1
 -- Update to new release.
 -
 -* Thu Jul 11 2013 Christopher Meng <rpm at cicku.me> - 2013.07.10-1
 -- Update to new release.
 -
  * Tue Jul 02 2013 Christopher Meng <rpm at cicku.me> - 2013.07.02-1
  - Update to new release.
  - SPEC cleanup.