[packages/subdownloader] - up to 2.1.0

[baggins]

commit 5a1c2ec50505a0d468afe6d232825cedabd6ed98
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed Nov 6 07:51:07 2019 +0100

    - up to 2.1.0

 always-en.patch    | 11 -----------
 egginfo.patch      | 23 -----------------------
 subdownloader.spec | 21 ++++-----------------
 3 files changed, 4 insertions(+), 51 deletions(-)
---
diff --git a/subdownloader.spec b/subdownloader.spec
index ab5ddda..afef99b 100644
--- a/subdownloader.spec
+++ b/subdownloader.spec
@@ -1,24 +1,19 @@
-%global commit 2.1.0-rc2
 %define		module		subdownloader
 %define		egg_name	SubDownloader
 Summary:	Fast and Easy Subtitle Downloader
 Summary(pl.UTF-8):	Narzędzie do automatycznego ściągania/wysyłania podpisów do plików wideo
 Name:		subdownloader
 Version:	2.1.0
-Release:	0.2
+Release:	0.1
 License:	GPL v3
 Group:		X11/Applications/Multimedia
-#Source0:	https://launchpad.net/subdownloader/trunk/%{version}/+download/%{name}_%{version}.orig.tar.gz
-Source0:	https://github.com/subdownloader/subdownloader/archive/%{commit}/%{name}-%{commit}.tar.gz
-# Source0-md5:	35c195c0bf8d621e2f1396006ad2dae1
+Source0:	https://github.com/subdownloader/subdownloader/archive/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5:	2ee94f8cb2fd1d8eb8742122273e0ae9
 Source1:	%{name}.desktop
 Source2:	%{name}.png
 # Source2-md5:	de3d0cfa08b1572878cde6e3800205fa
 Source3:	%{name}.sh
 # site down, and was not in distfiles
-#Source:	http://starowa.one.pl/~uzi/pld/%{name}-locale-pl.tar.gz
-Patch0:		always-en.patch
-Patch1:		egginfo.patch
 URL:		http://www.subdownloader.net/
 BuildRequires:	python3 >= 1:3.4
 BuildRequires:	python3-PyQt5
@@ -62,18 +57,10 @@ Cechy:
 - i wiele więcej
 
 %prep
-%setup -qc
-mv subdownloader-%{commit}*/* .
-#%patch0 -p1
-%patch1 -p1
-
-#tar xzf %{SOURCE3}
+%setup -q
 
 %{__rm} scripts/gui/rc/images/icon32.ico
 
-# cleanup backups after patching
-find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
-
 %build
 %py3_build
 
diff --git a/always-en.patch b/always-en.patch
deleted file mode 100644
index 19d2847..0000000
--- a/always-en.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- subdownloader-2.0.19/subdownloader/client/gui/main.py~	2017-02-13 20:10:12.000000000 +0200
-+++ subdownloader-2.0.19/subdownloader/client/gui/main.py	2018-02-04 13:09:27.174853433 +0200
-@@ -371,6 +371,8 @@
-             if 'subdownloader.mo' in files:
-                 self.interface_langs.append(_lang)
- 
-+        # Always add english
-+        self.interface_langs.append('en')
-         log.debug('Found these translations languages: %r' %
-                   self.interface_langs)
- 
diff --git a/egginfo.patch b/egginfo.patch
deleted file mode 100644
index 73565b7..0000000
--- a/egginfo.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- subdownloader-2.1.0/setup.py~	2018-02-09 22:29:43.000000000 +0200
-+++ subdownloader-2.1.0/setup.py	2018-02-13 00:13:26.097980981 +0200
-@@ -19,7 +19,6 @@
-     return open(os.path.join(project_path, filename)).read()
- 
- install_requires = [
--    "argparse >= 1.3.0",
-     "argcomplete >= 1.7.0",
-     "langdetect >= 1.0.7",
-     "pymediainfo >= 2.1.6",
-@@ -30,12 +29,6 @@
-     "docutils >= 0.14",
- ]
- 
--# Workaround since python 2 has no PyQt5 release
--if sys.version_info.major > 2:
--    install_requires.extend([
--        "PyQt5 >= 5.0.0",
--    ])
--
- setup(
-     name=subdownloader.project.PROJECT_TITLE,
-     version=subdownloader.project.PROJECT_VERSION_FULL_STR,
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/subdownloader.git/commitdiff/5a1c2ec50505a0d468afe6d232825cedabd6ed98