From 32416670e8cf926903a6451689d21e25f9b779ad Mon Sep 17 00:00:00 2001 From: Mohamed El Morabity Date: Sep 27 2020 16:22:36 +0000 Subject: Fix dependency on pycryptodomex --- diff --git a/python-streamlink-1.6.0-pycryptodomex.patch b/python-streamlink-1.6.0-pycryptodomex.patch index b3e1e23..4a910a8 100644 --- a/python-streamlink-1.6.0-pycryptodomex.patch +++ b/python-streamlink-1.6.0-pycryptodomex.patch @@ -1,6 +1,18 @@ +diff -up ./setup.py.orig ./setup.py +--- ./setup.py.orig 2020-09-23 01:31:24.000000000 +0200 ++++ ./setup.py 2020-09-27 18:07:41.828984513 +0200 +@@ -31,7 +31,7 @@ if environ.get("STREAMLINK_USE_PYCRYPTO" + deps.append("pycrypto") + else: + # this version of pycryptodome is known to work and has a Windows wheel for py2.7, py3.3-3.6 +- deps.append("pycryptodome>=3.4.3,<4") ++ deps.append("pycryptodomex>=3.4.3,<4") + + # for localization + if environ.get("STREAMLINK_USE_PYCOUNTRY"): diff -up ./src/streamlink/plugins/abematv.py.orig ./src/streamlink/plugins/abematv.py --- ./src/streamlink/plugins/abematv.py.orig 2020-09-23 01:31:24.000000000 +0200 -+++ ./src/streamlink/plugins/abematv.py 2020-09-24 20:01:40.760143637 +0200 ++++ ./src/streamlink/plugins/abematv.py 2020-09-27 18:07:27.773329974 +0200 @@ -9,7 +9,7 @@ import uuid from base64 import urlsafe_b64encode from binascii import unhexlify @@ -12,7 +24,7 @@ diff -up ./src/streamlink/plugins/abematv.py.orig ./src/streamlink/plugins/abema from requests.adapters import BaseAdapter diff -up ./src/streamlink/plugins/rtve.py.orig ./src/streamlink/plugins/rtve.py --- ./src/streamlink/plugins/rtve.py.orig 2020-09-23 01:31:24.000000000 +0200 -+++ ./src/streamlink/plugins/rtve.py 2020-09-24 20:01:40.756143734 +0200 ++++ ./src/streamlink/plugins/rtve.py 2020-09-27 18:07:27.773329974 +0200 @@ -3,7 +3,7 @@ import logging import re from functools import partial @@ -24,7 +36,7 @@ diff -up ./src/streamlink/plugins/rtve.py.orig ./src/streamlink/plugins/rtve.py from streamlink.plugin import Plugin, PluginArguments, PluginArgument diff -up ./src/streamlink/plugins/steam.py.orig ./src/streamlink/plugins/steam.py --- ./src/streamlink/plugins/steam.py.orig 2020-09-23 01:31:24.000000000 +0200 -+++ ./src/streamlink/plugins/steam.py 2020-09-24 20:01:40.755143759 +0200 ++++ ./src/streamlink/plugins/steam.py 2020-09-27 18:07:27.773329974 +0200 @@ -3,8 +3,8 @@ import logging import re import time @@ -36,10 +48,9 @@ diff -up ./src/streamlink/plugins/steam.py.orig ./src/streamlink/plugins/steam.p import streamlink from streamlink.exceptions import FatalPluginError -diff -up ./src/streamlink/plugins/streann.py.orig ./src/streamlink/plugins/streann.py diff -up ./src/streamlink/plugins/ustvnow.py.orig ./src/streamlink/plugins/ustvnow.py --- ./src/streamlink/plugins/ustvnow.py.orig 2020-09-23 01:31:24.000000000 +0200 -+++ ./src/streamlink/plugins/ustvnow.py 2020-09-24 20:06:15.006441450 +0200 ++++ ./src/streamlink/plugins/ustvnow.py 2020-09-27 18:07:27.774329949 +0200 @@ -7,9 +7,9 @@ import logging import re from uuid import uuid4 @@ -55,7 +66,7 @@ diff -up ./src/streamlink/plugins/ustvnow.py.orig ./src/streamlink/plugins/ustvn from streamlink.compat import urljoin, urlparse diff -up ./src/streamlink/plugins/webtv.py.orig ./src/streamlink/plugins/webtv.py --- ./src/streamlink/plugins/webtv.py.orig 2020-09-23 01:31:24.000000000 +0200 -+++ ./src/streamlink/plugins/webtv.py 2020-09-24 20:01:40.753143808 +0200 ++++ ./src/streamlink/plugins/webtv.py 2020-09-27 18:07:27.774329949 +0200 @@ -3,7 +3,7 @@ import base64 import binascii @@ -67,7 +78,7 @@ diff -up ./src/streamlink/plugins/webtv.py.orig ./src/streamlink/plugins/webtv.p from streamlink.plugin.api import validate diff -up ./src/streamlink/stream/hls.py.orig ./src/streamlink/stream/hls.py --- ./src/streamlink/stream/hls.py.orig 2020-09-23 01:31:24.000000000 +0200 -+++ ./src/streamlink/stream/hls.py 2020-09-24 20:01:40.762143588 +0200 ++++ ./src/streamlink/stream/hls.py 2020-09-27 18:07:27.774329949 +0200 @@ -3,7 +3,7 @@ import re import struct @@ -79,7 +90,7 @@ diff -up ./src/streamlink/stream/hls.py.orig ./src/streamlink/stream/hls.py from streamlink.compat import urlparse, str diff -up ./src/streamlink/utils/crypto.py.orig ./src/streamlink/utils/crypto.py --- ./src/streamlink/utils/crypto.py.orig 2020-09-23 01:31:24.000000000 +0200 -+++ ./src/streamlink/utils/crypto.py 2020-09-24 20:01:40.751143857 +0200 ++++ ./src/streamlink/utils/crypto.py 2020-09-27 18:07:27.774329949 +0200 @@ -1,7 +1,7 @@ from __future__ import absolute_import import hashlib @@ -91,7 +102,7 @@ diff -up ./src/streamlink/utils/crypto.py.orig ./src/streamlink/utils/crypto.py diff -up ./tests/streams/test_hls.py.orig ./tests/streams/test_hls.py --- ./tests/streams/test_hls.py.orig 2020-09-23 01:31:24.000000000 +0200 -+++ ./tests/streams/test_hls.py 2020-09-24 20:01:40.749143906 +0200 ++++ ./tests/streams/test_hls.py 2020-09-27 18:07:27.774329949 +0200 @@ -7,7 +7,7 @@ from functools import partial import pytest diff --git a/python-streamlink.spec b/python-streamlink.spec index f66304e..09d6498 100644 --- a/python-streamlink.spec +++ b/python-streamlink.spec @@ -8,7 +8,7 @@ Livestreamer, which is no longer maintained.} Name: python-%{srcname} Version: 1.6.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python library for extracting streams from various websites # src/streamlink/packages/requests_file.py is ASL 2.0 @@ -116,6 +116,9 @@ install -Dpm 0644 build/sphinx/man/%{srcname}.1 $RPM_BUILD_ROOT%{_mandir}/man1/% %changelog +* Sun Sep 27 2020 Mohamed El Morabity - 1.6.0-2 +- Fix dependency on pycryptodomex + * Thu Sep 24 2020 Mohamed El Morabity - 1.6.0-1 - Update to 1.6.0