[youtube-dl] Update to new release

[Till Maas]

commit 21451537bb3fe3c5460624e7603540c39a18d098
Author: Till Maas <opensource at till.name>
Date:   Thu Oct 25 21:09:10 2012 +0200

    Update to new release
    
    - Update BR: add pandoc
    - install make target

 .gitignore                          |    2 +-
 sources                             |    2 +-
 youtube-dl-2012.10.09-DESTDIR.patch |   24 ++++++++++++++++++++++++
 youtube-dl.spec                     |   24 ++++++++++++++++++------
 4 files changed, 44 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4e2abf6..ed84891 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/youtube-dl-2012.09.27.tar.gz
+/youtube-dl-2012.10.09.tar.gz
diff --git a/sources b/sources
index f3ec2c3..97959d6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-961f185aef9e38ec8f8403720bddfb8e  youtube-dl-2012.09.27.tar.gz
+4c1d09c7ff08d6755e39e248e945d84f  youtube-dl-2012.10.09.tar.gz
diff --git a/youtube-dl-2012.10.09-DESTDIR.patch b/youtube-dl-2012.10.09-DESTDIR.patch
new file mode 100644
index 0000000..cb26def
--- /dev/null
+++ b/youtube-dl-2012.10.09-DESTDIR.patch
@@ -0,0 +1,24 @@
+diff -up youtube-dl-2012.10.09/Makefile.DESTDIR youtube-dl-2012.10.09/Makefile
+--- youtube-dl-2012.10.09/Makefile.DESTDIR	2012-10-09 15:53:20.000000000 +0200
++++ youtube-dl-2012.10.09/Makefile	2012-10-25 20:52:01.950205187 +0200
+@@ -5,10 +5,17 @@ clean:
+ 	rm -f youtube-dl youtube-dl.exe youtube-dl.1 LATEST_VERSION
+ 
+ PREFIX=/usr/local
++BINDIR=$(PREFIX)/bin
++MANDIR=$(PREFIX)/man
++SYSCONFDIR=/etc
++
+ install: youtube-dl youtube-dl.1 youtube-dl.bash-completion
+-	install -m 755 --owner root --group root youtube-dl $(PREFIX)/bin/
+-	install -m 644 --owner root --group root youtube-dl.1 $(PREFIX)/man/man1
+-	install -m 644 --owner root --group root youtube-dl.bash-completion /etc/bash_completion.d/youtube-dl
++	install -d $(DESTDIR)$(BINDIR)
++	install -m 755 youtube-dl $(DESTDIR)$(BINDIR)
++	install -d $(DESTDIR)$(MANDIR)/man1
++	install -m 644 youtube-dl.1 $(DESTDIR)$(MANDIR)/man1
++	install -d $(DESTDIR)$(SYSCONFDIR)/bash_completion.d
++	install -m 644 youtube-dl.bash-completion $(DESTDIR)$(SYSCONFDIR)/bash_completion.d/youtube-dl
+ 
+ .PHONY: all clean install README.md youtube-dl.bash-completion
+ # TODO un-phony README.md and youtube-dl.bash_completion by reading from .in files and generating from them
diff --git a/youtube-dl.spec b/youtube-dl.spec
index 1b861e3..bb5240a 100644
--- a/youtube-dl.spec
+++ b/youtube-dl.spec
@@ -1,6 +1,6 @@
 Name:           youtube-dl
-Version:        2012.09.27
-Release:        3%{?dist}
+Version:        2012.10.09
+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
@@ -8,11 +8,15 @@ License:        Public Domain
 URL:            http://rg3.github.com/youtube-dl/
 Source0:        https://github.com/rg3/%{name}/tarball/%{version}/%{name}-%{version}.tar.gz
 Source1:        %{name}.conf
+Patch0:         youtube-dl-2012.10.09-DESTDIR.patch
+
 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
+BuildRequires:  pandoc
 BuildRequires:  python >= 2.6
 
 %description
@@ -27,14 +31,16 @@ youtube.com.
 gzip -dc %{SOURCE0} | tar --strip-components=1 -xvvf -
 rm youtube-dl{,.exe}
 
+%patch0 -p1 -b .DESTDIR
+
+
 %build
 make
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} $RPM_BUILD_ROOT%{_sysconfdir}
-install -p -m 755 youtube-dl $RPM_BUILD_ROOT%{_bindir}
-install -p -m 644 README.md $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+make install DESTDIR="$RPM_BUILD_ROOT" PREFIX="%{_prefix}" MANDIR="%{_mandir}"
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
 install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}
 
 %clean
@@ -43,10 +49,16 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %{_bindir}/%{name}
+%{_mandir}/man1/%{name}.1*
 %config(noreplace) %{_sysconfdir}/%{name}.conf
-%doc %{_docdir}/%{name}-%{version}/README.md
+%{_sysconfdir}/bash_completion.d/%{name}
 
 %changelog
+* 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
+
 * Tue Oct 02 2012 Till Maas <opensource at till.name> - 2012.09.27-3
 - Add BR: python >= 2.6