[youtube-dl/f18: 4/4] Merge branch 'master' into f18

[Christopher Meng]

commit 74474382b0561a8db28adb1aaf7bf6cc716a1e1e
Merge: dcc8ca3 181aea8
Author: Christopher Meng <rpm at cicku.me>
Date:   Thu May 9 18:09:11 2013 +0800

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

 .gitignore                          |    4 ++++
 sources                             |    4 ++++
 youtube-dl-2012.10.09-DESTDIR.patch |   24 ------------------------
 youtube-dl.spec                     |   28 +++++++++++++++++++---------
 4 files changed, 27 insertions(+), 33 deletions(-)
---
diff --cc .gitignore
index 6e510e2,c7198ea..39bd214
--- a/.gitignore
+++ b/.gitignore
@@@ -2,3 -2,4 +2,7 @@@
  /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
++>>>>>>> master
diff --cc sources
index ef97508,96f9c65..9c953fb
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +f1ba09cfd9ca75df1b3bd721bd1e61f1  youtube-dl-2013.04.18.tar.gz
++=======
+ f525dfa558c06b4360cc38aaadf0ae7a  youtube-dl-2013.05.07.tar.gz
++>>>>>>> master
diff --cc youtube-dl.spec
index 609db54,48a8313..1ffc1e8
--- a/youtube-dl.spec
+++ b/youtube-dl.spec
@@@ -1,12 -1,11 +1,15 @@@
  Name:           youtube-dl
++<<<<<<< HEAD
 +Version:        2013.04.18
++=======
+ Version:        2013.05.07
++>>>>>>> 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
  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)
@@@ -51,9 -45,15 +49,21 @@@ rm -rf $RPM_BUILD_ROO
  %{_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
++
++=======
+ * 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