[youtube-dl/f17: 6/8] Merge branch 'master' into f17

[Christopher Meng]

commit a5baae7d29ae18b2a29483ad54d5fd45d0ffe2b6
Merge: dcc8ca3 c3bfaae
Author: Christopher Meng <rpm at cicku.me>
Date:   Mon Jun 17 12:03:20 2013 +0800

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

 .gitignore                          |    5 ++
 sources                             |    5 ++
 youtube-dl-2012.10.09-DESTDIR.patch |   24 --------
 youtube-dl.spec                     |  110 +++++++++++++++++++----------------
 4 files changed, 69 insertions(+), 75 deletions(-)
---
diff --cc .gitignore
index 6e510e2,2f6ddb9..56a9943
--- a/.gitignore
+++ b/.gitignore
@@@ -2,3 -2,5 +2,8 @@@
  /youtube-dl-2013.01.02.tar.gz
  /youtube-dl-2013.01.13.tar.gz
  /youtube-dl-2013.04.18.tar.gz
++<<<<<<< HEAD
++=======
+ /youtube-dl-2013.05.07.tar.gz
+ /youtube-dl-2013.05.23.tar.gz
++>>>>>>> master
diff --cc sources
index ef97508,bdb6273..aba7230
--- a/sources
+++ b/sources
@@@ -1,1 -1,2 +1,6 @@@
++<<<<<<< HEAD
 +f1ba09cfd9ca75df1b3bd721bd1e61f1  youtube-dl-2013.04.18.tar.gz
++=======
+ 139ffe39568318a5939edf05afbac4d0  youtube-dl-2013.05.14.tar.gz
+ 6cb4ee904456d102d4f3edb68272ca50  youtube-dl-2013.05.23.tar.gz
++>>>>>>> master
diff --cc youtube-dl.spec
index 609db54,75a61d8..94a0d8a
--- a/youtube-dl.spec
+++ b/youtube-dl.spec
@@@ -1,17 -1,13 +1,17 @@@
  Name:           youtube-dl
++<<<<<<< HEAD
 +Version:        2013.04.18
++=======
+ Version:        2013.05.23
++>>>>>>> master
  Release:        1%{?dist}
- Summary:        Small command-line program to download videos from YouTube
- Summary(pl):    Tekstowy program do pobierania filmów z youtube.com
- Group:          Applications/Multimedia
+ Summary:        A small command-line program to download videos from YouTube.com and other sites
  License:        Public Domain
- URL:            http://rg3.github.com/youtube-dl/
- Source0:        https://github.com/rg3/%{name}/tarball/%{version}/%{name}-%{version}.tar.gz
+ 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
- Requires:       python >= 2.6
  # Used in Makefile to generate youtube-dl
  BuildRequires:  zip
  # Used to generate manpage
@@@ -51,26 -38,38 +42,43 @@@ install -p -m 644 %{SOURCE1} %{buildroo
  %{_sysconfdir}/bash_completion.d/%{name}
  
  %changelog
++<<<<<<< HEAD
 +* Thu Apr 18 2013 Till Maas <opensource at till.name> - 2013.04.18-1
 +- Update to new release
++=======
+ * Mon Jun 17 2013 Christopher Meng <rpm at cicku.me> - 2013.05.23-1
+ - Update to new release and cleanup the spec.
+ 
+ * Tue May 14 2013 Christopher Meng <rpm at cicku.me> - 2013.05.14-1
+ - Update to new release.
+ 
+ * Wed May 08 2013 Christopher Meng <rpm at cicku.me> - 2013.05.07-1
+ - Update to new release.
+ 
+ * Thu Apr 18 2013 Till Maas <opensource at till.name> - 2013.04.18-1
+ - Update to new release.
+ 
+ * Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2013.01.13-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
++>>>>>>> master
  
  * Tue Jan 15 2013 Till Maas <opensource at till.name> - 2013.01.13-1
- - Update to new release
+ - Update to new release.
  
  * Sun Jan 06 2013 Matěj Cepl <mcepl at redhat.com> - 2013.01.02-1
- - Update to new release (fix #880270)
+ - Update to new release (fix #880270).
  
  * Tue Oct 23 2012 Till Maas <opensource at till.name> - 2012.10.09-1
- - Update to new release
- - Update BR: add pandoc
- - install make target
+ - Update to new release.
+ - Update BR: add pandoc.
+ - install make target.
  
  * Tue Oct 02 2012 Till Maas <opensource at till.name> - 2012.09.27-3
- - Add BR: python >= 2.6
+ - Add BR: python >= 2.6.
  
  * Tue Oct 02 2012 Till Maas <opensource at till.name> - 2012.09.27-2
- - Use noreplace for config file
- - Add BR: zip
+ - Use noreplace for config file.
+ - Add BR: zip.
  
  * Tue Oct  2 2012 Tim Landscheidt <tim at tim-landscheidt.de> - 2012.09.27-1
  - Bump Python requirement to 2.6.