Accepting request 693969 from home:simonpuchert:branches:multimedia:apps
- Make the package actually installable. - Update to version 1.1.1. - Use python-rpm-macros. - Fix Rpmlint errors. OBS-URL: https://build.opensuse.org/request/show/693969 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/streamlink?expand=0&rev=7
This commit is contained in:
Simon Puchert
Git OBS Bridge
parent
2a7c25240d
commit
445fd18e40
135
env-script-interpreter.patch
Normal file
135
env-script-interpreter.patch
Normal file
@ -0,0 +1,135 @@
|
||||
diff -Nur streamlink-1.1.1/docs/conf.py streamlink-1.1.1-patched/docs/conf.py
|
||||
--- streamlink-1.1.1/docs/conf.py 2019-04-02 23:37:45.000000000 +0200
|
||||
+++ streamlink-1.1.1-patched/docs/conf.py 2019-04-11 22:39:18.623031000 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/env python3
|
||||
+#!/usr/bin/python3
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
import os
|
||||
diff -Nur streamlink-1.1.1/examples/gst-player.py streamlink-1.1.1-patched/examples/gst-player.py
|
||||
--- streamlink-1.1.1/examples/gst-player.py 2019-04-02 23:37:45.000000000 +0200
|
||||
+++ streamlink-1.1.1-patched/examples/gst-player.py 2019-04-11 22:38:39.482620126 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/env python
|
||||
+#!/usr/bin/python3
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
diff -Nur streamlink-1.1.1/examples/opencv-face.py streamlink-1.1.1-patched/examples/opencv-face.py
|
||||
--- streamlink-1.1.1/examples/opencv-face.py 2019-04-02 23:37:45.000000000 +0200
|
||||
+++ streamlink-1.1.1-patched/examples/opencv-face.py 2019-04-11 22:38:33.290555139 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/env python3
|
||||
+#!/usr/bin/python3
|
||||
import logging
|
||||
import sys
|
||||
import streamlink
|
||||
diff -Nur streamlink-1.1.1/script/github_releases.py streamlink-1.1.1-patched/script/github_releases.py
|
||||
--- streamlink-1.1.1/script/github_releases.py 2019-04-02 23:37:45.000000000 +0200
|
||||
+++ streamlink-1.1.1-patched/script/github_releases.py 2019-04-11 22:38:47.690706278 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/env python
|
||||
+#!/usr/bin/python3
|
||||
import argparse
|
||||
import logging
|
||||
import re
|
||||
diff -Nur streamlink-1.1.1/setup.py streamlink-1.1.1-patched/setup.py
|
||||
--- streamlink-1.1.1/setup.py 2019-04-02 23:37:45.000000000 +0200
|
||||
+++ streamlink-1.1.1-patched/setup.py 2019-04-11 22:38:20.634422322 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/env python
|
||||
+#!/usr/bin/python3
|
||||
import codecs
|
||||
from os import environ, path
|
||||
from sys import argv, path as sys_path
|
||||
diff -Nur streamlink-1.1.1/src/streamlink/packages/flashmedia/error.py streamlink-1.1.1-patched/src/streamlink/packages/flashmedia/error.py
|
||||
--- streamlink-1.1.1/src/streamlink/packages/flashmedia/error.py 2019-04-02 23:37:45.000000000 +0200
|
||||
+++ streamlink-1.1.1-patched/src/streamlink/packages/flashmedia/error.py 2019-04-11 22:39:06.322901865 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/env python
|
||||
+#!/usr/bin/python3
|
||||
|
||||
|
||||
class FLVError(Exception):
|
||||
diff -Nur streamlink-1.1.1/src/streamlink/packages/flashmedia/f4v.py streamlink-1.1.1-patched/src/streamlink/packages/flashmedia/f4v.py
|
||||
--- streamlink-1.1.1/src/streamlink/packages/flashmedia/f4v.py 2019-04-02 23:37:45.000000000 +0200
|
||||
+++ streamlink-1.1.1-patched/src/streamlink/packages/flashmedia/f4v.py 2019-04-11 22:39:00.578841564 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/env python
|
||||
+#!/usr/bin/python3
|
||||
|
||||
from .box import Box, RawPayload
|
||||
from .compat import is_py2
|
||||
diff -Nur streamlink-1.1.1/src/streamlink/packages/flashmedia/flv.py streamlink-1.1.1-patched/src/streamlink/packages/flashmedia/flv.py
|
||||
--- streamlink-1.1.1/src/streamlink/packages/flashmedia/flv.py 2019-04-02 23:37:45.000000000 +0200
|
||||
+++ streamlink-1.1.1-patched/src/streamlink/packages/flashmedia/flv.py 2019-04-11 22:38:54.026772785 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/env python
|
||||
+#!/usr/bin/python3
|
||||
|
||||
from .error import FLVError
|
||||
from .compat import is_py2
|
||||
diff -Nur streamlink-1.1.1/src/streamlink/packages/flashmedia/__init__.py streamlink-1.1.1-patched/src/streamlink/packages/flashmedia/__init__.py
|
||||
--- streamlink-1.1.1/src/streamlink/packages/flashmedia/__init__.py 2019-04-02 23:37:45.000000000 +0200
|
||||
+++ streamlink-1.1.1-patched/src/streamlink/packages/flashmedia/__init__.py 2019-04-11 22:39:25.883107228 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/env python
|
||||
+#!/usr/bin/python3
|
||||
|
||||
from .error import *
|
||||
from .amf import *
|
||||
diff -Nur streamlink-1.1.1/src/streamlink/packages/flashmedia/packet.py streamlink-1.1.1-patched/src/streamlink/packages/flashmedia/packet.py
|
||||
--- streamlink-1.1.1/src/streamlink/packages/flashmedia/packet.py 2019-04-02 23:37:45.000000000 +0200
|
||||
+++ streamlink-1.1.1-patched/src/streamlink/packages/flashmedia/packet.py 2019-04-11 22:38:26.898488057 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/env python
|
||||
+#!/usr/bin/python3
|
||||
|
||||
import struct
|
||||
|
||||
diff -Nur streamlink-1.1.1/src/streamlink/packages/flashmedia/tag.py streamlink-1.1.1-patched/src/streamlink/packages/flashmedia/tag.py
|
||||
--- streamlink-1.1.1/src/streamlink/packages/flashmedia/tag.py 2019-04-02 23:37:45.000000000 +0200
|
||||
+++ streamlink-1.1.1-patched/src/streamlink/packages/flashmedia/tag.py 2019-04-11 22:37:41.630013107 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/env python
|
||||
+#!/usr/bin/python3
|
||||
|
||||
from ctypes import BigEndianStructure, Union, c_uint8
|
||||
from io import BytesIO
|
||||
diff -Nur streamlink-1.1.1/src/streamlink/packages/flashmedia/util.py streamlink-1.1.1-patched/src/streamlink/packages/flashmedia/util.py
|
||||
--- streamlink-1.1.1/src/streamlink/packages/flashmedia/util.py 2019-04-02 23:37:45.000000000 +0200
|
||||
+++ streamlink-1.1.1-patched/src/streamlink/packages/flashmedia/util.py 2019-04-11 22:37:20.297789373 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/env python
|
||||
+#!/usr/bin/python3
|
||||
|
||||
from .compat import bytes, is_py2, string_types
|
||||
|
||||
diff -Nur streamlink-1.1.1/src/streamlink/plugins/dash.py streamlink-1.1.1-patched/src/streamlink/plugins/dash.py
|
||||
--- streamlink-1.1.1/src/streamlink/plugins/dash.py 2019-04-02 23:37:45.000000000 +0200
|
||||
+++ streamlink-1.1.1-patched/src/streamlink/plugins/dash.py 2019-04-11 22:39:11.970961161 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/env python
|
||||
+#!/usr/bin/python3
|
||||
import logging
|
||||
|
||||
import re
|
||||
diff -Nur streamlink-1.1.1/src/streamlink/plugins/tv3cat.py streamlink-1.1.1-patched/src/streamlink/plugins/tv3cat.py
|
||||
--- streamlink-1.1.1/src/streamlink/plugins/tv3cat.py 2019-04-02 23:37:45.000000000 +0200
|
||||
+++ streamlink-1.1.1-patched/src/streamlink/plugins/tv3cat.py 2019-04-11 22:37:34.937942913 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/env python
|
||||
+#!/usr/bin/python3
|
||||
import logging
|
||||
import re
|
||||
|
||||
diff -Nur streamlink-1.1.1/src/streamlink/plugins/tvplayer.py streamlink-1.1.1-patched/src/streamlink/plugins/tvplayer.py
|
||||
--- streamlink-1.1.1/src/streamlink/plugins/tvplayer.py 2019-04-02 23:37:45.000000000 +0200
|
||||
+++ streamlink-1.1.1-patched/src/streamlink/plugins/tvplayer.py 2019-04-11 22:37:26.373853093 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/env python
|
||||
+#!/usr/bin/python3
|
||||
import re
|
||||
|
||||
from streamlink.plugin import Plugin, PluginArguments, PluginArgument
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:440e28a199c8a2b09e5ac17676d0bbf6c3685c6432737be1b3c19fc4ddaa430f
|
||||
size 30757685
|
||||
3
streamlink-1.1.1.tar.gz
Normal file
3
streamlink-1.1.1.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:34fc14197521ba3426241c0bcf163ad65a288ff39525555ba4221c011b330ad4
|
||||
size 30765114
|
||||
@ -1,3 +1,21 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 11 18:16:50 UTC 2019 - Simon Puchert <simonpuchert@alice.de>
|
||||
|
||||
- Add env-script-interpreter.patch to fix Rpmlint errors.
|
||||
- Require python-pycountry instead of python-iso-639 and
|
||||
python-iso3166, as these packages are not available in Factory.
|
||||
- Add dependencies according to the installation instructions
|
||||
- Remove support for Leap 42.3 since it was broken anyway.
|
||||
- Update to version 1.1.1:
|
||||
* no relevant changes
|
||||
- Update to version 1.1.0:
|
||||
* plugin fixes, improvements and new plugin implementations
|
||||
* addition of the --twitch-disable-ads option
|
||||
* DASH stream improvements
|
||||
* documentation enhancements
|
||||
* addition of the {url} player title variable
|
||||
* default player title config for PotPlayer
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 13 22:00:52 UTC 2019 - Simon Puchert <simonpuchert@alice.de>
|
||||
|
||||
|
||||
@ -17,34 +17,28 @@
|
||||
|
||||
|
||||
Name: streamlink
|
||||
Version: 1.0.0
|
||||
Version: 1.1.1
|
||||
Release: 0
|
||||
Summary: Program to pipe streams from services into a video player
|
||||
License: BSD-2-Clause
|
||||
Group: Development/Languages/Python
|
||||
Url: http://streamlink.github.io/
|
||||
Source: https://github.com/%{name}/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||
Recommends: (vlc or mpv)
|
||||
# PATCH-FIX-OPENSUSE env-script-interpreter.patch Fix Rpmlint errors.
|
||||
Patch0: env-script-interpreter.patch
|
||||
Recommends: mpv
|
||||
BuildArch: noarch
|
||||
%if 0%{?suse_version} > 1320
|
||||
BuildRequires: python-rpm-macros
|
||||
BuildRequires: python3-Sphinx
|
||||
BuildRequires: python3-devel >= 3.4
|
||||
BuildRequires: python3-setuptools
|
||||
Requires: python3-iso-639
|
||||
Requires: python3-iso3166
|
||||
BuildRequires: python3-requests >= 1.0
|
||||
Requires: python3-pycountry
|
||||
Requires: python3-pycryptodome
|
||||
Requires: python3-requests >= 1.0
|
||||
%else
|
||||
BuildRequires: python-Sphinx
|
||||
BuildRequires: python-devel >= 2.7
|
||||
BuildRequires: python-futures
|
||||
BuildRequires: python-setuptools
|
||||
BuildRequires: python-singledispatch
|
||||
Requires: python-iso-639
|
||||
Requires: python-iso3166
|
||||
Requires: python-pycryptodome
|
||||
Requires: python-requests >= 1.0
|
||||
%endif
|
||||
Requires: python3-websocket-client
|
||||
Requires: python3-isodate
|
||||
Requires: python3-PySocks
|
||||
|
||||
%description
|
||||
Streamlink is a CLI utility that pipes flash videos
|
||||
@ -56,20 +50,14 @@ Streamlink is a fork of the livestreamer project.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
|
||||
%build
|
||||
%if 0%{?suse_version} > 1320
|
||||
python3 setup.py build
|
||||
%else
|
||||
python2 setup.py build
|
||||
%endif
|
||||
%python3_build
|
||||
|
||||
%install
|
||||
%if 0%{?suse_version} > 1320
|
||||
python3 setup.py install \
|
||||
%else
|
||||
python2 setup.py install \
|
||||
%endif
|
||||
export STREAMLINK_USE_PYCOUNTRY="true"
|
||||
%python3_install \
|
||||
--root=%{buildroot} \
|
||||
--prefix=%{_prefix}
|
||||
|
||||
@ -85,10 +73,6 @@ done
|
||||
%license LICENSE
|
||||
%doc AUTHORS CHANGELOG.md MANIFEST.in README.md
|
||||
%{_bindir}/%{name}
|
||||
%if 0%{?suse_version} > 1320
|
||||
%{python3_sitelib}/%{name}*/
|
||||
%else
|
||||
%{python_sitelib}/%{name}*/
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
|
||||
Loading…
Reference in New Issue
Block a user