diff options
Diffstat (limited to 'network/youtube-dl/setup.patch')
| -rw-r--r-- | network/youtube-dl/setup.patch | 47 |
1 files changed, 35 insertions, 12 deletions
diff --git a/network/youtube-dl/setup.patch b/network/youtube-dl/setup.patch index 3e1210c501..1ffdd77d59 100644 --- a/network/youtube-dl/setup.patch +++ b/network/youtube-dl/setup.patch @@ -1,11 +1,11 @@ ---- youtube-dl-2015.12.06/Makefile 2015-12-06 19:51:25.000000000 +0200 -+++ youtube-dl-2015.12.06/Makefile.orig 2015-12-08 03:44:10.554844147 +0200 -@@ -4,11 +4,11 @@ - 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 +--- youtube-dl-2016.06.23.1/Makefile.orig 2016-06-23 05:42:56.000000000 +0300 ++++ youtube-dl-2016.06.23.1/Makefile 2016-06-24 06:06:24.990732349 +0300 +@@ -5,14 +5,22 @@ find . -name "*.pyc" -delete + find . -name "*.class" -delete -PREFIX ?= /usr/local -+PREFIX ?= ++PREFIX ?= /usr BINDIR ?= $(PREFIX)/bin MANDIR ?= $(PREFIX)/man SHAREDIR ?= $(PREFIX)/share @@ -13,8 +13,20 @@ +PYTHON ?= /usr/bin/python # set SYSCONFDIR to /etc if PREFIX=/usr or PREFIX=/usr/local - ifeq ($(PREFIX),/usr) -@@ -50,7 +50,7 @@ +-SYSCONFDIR != if [ $(PREFIX) = /usr -o $(PREFIX) = /usr/local ]; then echo /etc; else echo $(PREFIX)/etc; fi ++ifeq ($(PREFIX),/usr) ++ SYSCONFDIR=/etc ++else ++ ifeq ($(PREFIX),/usr/local) ++ SYSCONFDIR=/etc ++ else ++ SYSCONFDIR=$(PREFIX)/etc ++ endif ++endif + + install: youtube-dl youtube-dl.1 youtube-dl.bash-completion youtube-dl.zsh youtube-dl.fish + install -d $(DESTDIR)$(BINDIR) +@@ -43,7 +51,7 @@ .PHONY: all clean install test tar bash-completion pypi-files zsh-completion fish-completion ot offlinetest codetest supportedsites @@ -23,7 +35,7 @@ youtube-dl: youtube_dl/*.py youtube_dl/*/*.py zip --quiet youtube-dl youtube_dl/*.py youtube_dl/*/*.py -@@ -70,11 +70,11 @@ +@@ -66,11 +74,11 @@ $(PYTHON) devscripts/make_supportedsites.py docs/supportedsites.md README.txt: README.md @@ -31,15 +43,24 @@ + # pandoc -f markdown -t plain README.md -o README.txt youtube-dl.1: README.md - $(PYTHON) devscripts/prepare_manpage.py >youtube-dl.1.temp.md + $(PYTHON) devscripts/prepare_manpage.py youtube-dl.1.temp.md - pandoc -s -f markdown -t man youtube-dl.1.temp.md -o youtube-dl.1 + # pandoc -s -f markdown -t man youtube-dl.1.temp.md -o youtube-dl.1 rm -f youtube-dl.1.temp.md youtube-dl.bash-completion: youtube_dl/*.py youtube_dl/*/*.py devscripts/bash-completion.in ---- youtube-dl-2015.12.06/setup.py 2015-12-06 19:51:25.000000000 +0200 -+++ youtube-dl-2015.12.06/setup.py.orig 2015-12-08 03:47:01.705704467 +0200 -@@ -46,10 +46,8 @@ +@@ -90,7 +98,7 @@ + + lazy-extractors: youtube_dl/extractor/lazy_extractors.py + +-_EXTRACTOR_FILES != find youtube_dl/extractor -iname '*.py' -and -not -iname 'lazy_extractors.py' ++ _EXTRACTOR_FILES != find youtube_dl/extractor -iname '*.py' -and -not -iname 'lazy_extractors.py' + youtube_dl/extractor/lazy_extractors.py: devscripts/make_lazy_extractors.py devscripts/lazy_load_template.py $(_EXTRACTOR_FILES) + $(PYTHON) devscripts/make_lazy_extractors.py $@ + +--- youtube-dl-2016.06.23.1/setup.py.orig 2016-06-24 06:06:54.071368791 +0300 ++++ youtube-dl-2016.06.23.1/setup.py 2016-06-24 06:07:18.516063191 +0300 +@@ -47,10 +47,10 @@ params = py2exe_params else: files_spec = [ @@ -49,6 +70,8 @@ - ('share/man/man1', ['youtube-dl.1']) + ('/etc/bash_completion.d', ['youtube-dl.bash-completion']), + ('/etc/fish/completions', ['youtube-dl.fish']), ++ ('/usr/doc/youtube_dl', ['README.txt']), ++ ('/usr/man/man1', ['youtube-dl.1']) ] root = os.path.dirname(os.path.abspath(__file__)) data_files = [] |