summaryrefslogtreecommitdiff
path: root/network/youtube-dl/setup.patch
diff options
context:
space:
mode:
Diffstat (limited to 'network/youtube-dl/setup.patch')
-rw-r--r--network/youtube-dl/setup.patch37
1 files changed, 22 insertions, 15 deletions
diff --git a/network/youtube-dl/setup.patch b/network/youtube-dl/setup.patch
index 99cbdaa3f3..2d62a9d2e7 100644
--- a/network/youtube-dl/setup.patch
+++ b/network/youtube-dl/setup.patch
@@ -1,5 +1,5 @@
---- youtube-dl-2015.02.26.2/Makefile.orig 2015-02-28 11:04:48.582638405 +0200
-+++ youtube-dl-2015.02.26.2/Makefile 2015-02-28 11:11:36.383540192 +0200
+--- youtube-dl-2015.03.09/Makefile.orig 2015-03-11 01:22:06.331608738 +0200
++++ youtube-dl-2015.03.09/Makefile 2015-03-11 01:33:42.747902336 +0200
@@ -4,22 +4,23 @@
rm -rf youtube-dl.1.temp.md youtube-dl.1 youtube-dl.bash-completion README.txt MANIFEST build/ dist/ .coverage cover/ youtube-dl.tar.gz youtube-dl.zsh youtube-dl.fish *.dump *.part *.info.json *.mp4 *.flv *.mp3 *.avi CONTRIBUTING.md.tmp youtube-dl youtube-dl.exe
find -name "*.pyc" -delete
@@ -23,15 +23,15 @@
- SYSCONFDIR=$(PREFIX)/etc
- endif
-endif
-+# ifeq ($(PREFIX),/usr)
-+# SYSCONFDIR=/etc
-+# else
-+# ifeq ($(PREFIX),/usr/local)
++#ifeq ($(PREFIX),/usr)
++# SYSCONFDIR=/etc
++#else
++# ifeq ($(PREFIX),/usr/local)
+# SYSCONFDIR=/etc
+# else
+# SYSCONFDIR=$(PREFIX)/etc
+# endif
-+# endif
++#endif
install: youtube-dl youtube-dl.1 youtube-dl.bash-completion youtube-dl.zsh youtube-dl.fish
install -d $(DESTDIR)$(BINDIR)
@@ -40,7 +40,7 @@
.PHONY: all clean install test tar bash-completion pypi-files zsh-completion fish-completion ot offlinetest codetest supportedsites
-pypi-files: youtube-dl.bash-completion README.txt youtube-dl.1 youtube-dl.fish
-+pypi-files: youtube-dl.bash-completion youtube-dl.1 youtube-dl.fish
++pypi-files: youtube-dl.bash-completion README.md youtube-dl.1 youtube-dl.fish
youtube-dl: youtube_dl/*.py youtube_dl/*/*.py
zip --quiet youtube-dl youtube_dl/*.py youtube_dl/*/*.py
@@ -49,7 +49,7 @@
README.txt: README.md
- pandoc -f markdown -t plain README.md -o README.txt
-+ # pandoc -f markdown -t plain README.md -o README.txt
++ # pandoc -f markdown -t plain README.md -o
youtube-dl.1: README.md
python devscripts/prepare_manpage.py >youtube-dl.1.temp.md
@@ -76,9 +76,18 @@
Makefile MANIFEST.in youtube-dl.1 youtube-dl.bash-completion \
youtube-dl.zsh youtube-dl.fish setup.py \
youtube-dl
---- youtube-dl-2015.02.26.2/setup.orig.py 2015-02-28 11:05:15.387303300 +0200
-+++ youtube-dl-2015.02.26.2/setup.py 2015-02-28 11:13:17.893271146 +0200
-@@ -46,10 +46,10 @@
+--- youtube-dl-2015.03.09/setup.orig.py 2015-03-11 01:21:28.928076346 +0200
++++ youtube-dl-2015.03.09/setup.py 2015-03-11 01:37:37.112972370 +0200
+@@ -6,6 +6,8 @@
+ import os.path
+ import warnings
+ import sys
++from youtube_dl.version import __version__
++
+
+ try:
+ from setuptools import setup
+@@ -46,10 +48,8 @@
params = py2exe_params
else:
files_spec = [
@@ -87,9 +96,7 @@
- ('share/doc/youtube_dl', ['README.txt']),
- ('share/man/man1', ['youtube-dl.1'])
+ ('/etc/bash_completion.d', ['youtube-dl.bash-completion']),
-+ ('/etc/fish/completions', ['youtube-dl.fish']),
-+ ('/share/doc/youtube_dl', ['README.txt']),
-+ ('/share/man/man1', ['youtube-dl.1'])
++ ('/etc/fish/completions', ['youtube-dl.fish'])
]
root = os.path.dirname(os.path.abspath(__file__))
data_files = []