May 2018 - openSUSE Commits - openSUSE Mailing Lists

commit libreoffice-voikko for openSUSE:Factory
by root＠hilbert.suse.de 02 May '18

02 May '18

Hello community, here is the log from the commit of package libreoffice-voikko for openSUSE:Factory checked in at 2018-05-02 12:19:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libreoffice-voikko (Old) and /work/SRC/openSUSE:Factory/.libreoffice-voikko.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libreoffice-voikko" Wed May 2 12:19:57 2018 rev:18 rq:602970 version:5.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libreoffice-voikko/libreoffice-voikko.changes 2017-10-11 22:56:50.508769056 +0200 +++ /work/SRC/openSUSE:Factory/.libreoffice-voikko.new/libreoffice-voikko.changes 2018-05-02 12:20:01.452673610 +0200 @@ -1,0 +2,6 @@ +Wed May 2 08:12:23 UTC 2018 - tchvatal(a)suse.com + +- Use exclusive arch wrt issue bsc#1091620 as it gets unresolvable + otherwise + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice-voikko.spec ++++++ --- /var/tmp/diff_new_pack.r2dOkC/_old 2018-05-02 12:20:02.840622969 +0200 +++ /var/tmp/diff_new_pack.r2dOkC/_new 2018-05-02 12:20:02.868621948 +0200 @@ -1,7 +1,7 @@ # # spec file for package libreoffice-voikko # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,9 +20,9 @@ Version: 5.0 Release: 0 Summary: LibreOffice spellchecker/hyphenator for finnish language -License: MPL-2.0 OR GPL-3.0+ +License: MPL-2.0 OR GPL-3.0-or-later Group: Productivity/Text/Spell -Url: http://voikko.puimula.org/ +URL: http://voikko.puimula.org/ Source0: http://www.puimula.org/voikko-sources/%{name}/%{name}-%{version}.tar.gz Source1: http://www.puimula.org/voikko-sources/%{name}/%{name}-%{version}.tar.gz.asc Source2: %{name}.keyring @@ -36,6 +36,7 @@ BuildRequires: pkgconfig(libvoikko) Requires: python3-libvoikko Provides: locale(libreoffice:fi) +ExclusiveArch: aarch64 %{ix86} x86_64 %description LibreOffice spellchecker/hyphenator for finnish language, which uses @@ -55,7 +56,8 @@ unzip $voikko_pkg %files -%doc COPYING README +%license COPYING +%doc README %{_libdir}/libreoffice/share/extensions/voikko %changelog

1 0

commit yast2-iscsi-lio-server for openSUSE:Factory
by root＠hilbert.suse.de 02 May '18

02 May '18

Hello community, here is the log from the commit of package yast2-iscsi-lio-server for openSUSE:Factory checked in at 2018-05-02 12:19:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-iscsi-lio-server (Old) and /work/SRC/openSUSE:Factory/.yast2-iscsi-lio-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-iscsi-lio-server" Wed May 2 12:19:51 2018 rev:28 rq:602967 version:4.0.9 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-iscsi-lio-server/yast2-iscsi-lio-server.changes 2018-04-11 14:03:47.446901073 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-iscsi-lio-server.new/yast2-iscsi-lio-server.changes 2018-05-02 12:20:00.224718413 +0200 @@ -2 +2,8 @@ -Tue Apr 10 08:58:28 UTC 2018 - lszhu@localhost +Sat Apr 28 05:59:05 UTC 2018 - lszhu(a)suse.com + +- bsc#1091194 + Change Adding LUN dialog UI, place "Browse" button under LUN + path input field, avoid unaligned UI. + +------------------------------------------------------------------- +Tue Apr 10 08:58:28 UTC 2018 - lszhu(a)suse.com Old: ---- yast2-iscsi-lio-server-4.0.8.tar.bz2 New: ---- yast2-iscsi-lio-server-4.0.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-iscsi-lio-server.spec ++++++ --- /var/tmp/diff_new_pack.1At7Fl/_old 2018-05-02 12:20:00.932692582 +0200 +++ /var/tmp/diff_new_pack.1At7Fl/_new 2018-05-02 12:20:00.936692436 +0200 @@ -17,7 +17,7 @@ Name: yast2-iscsi-lio-server -Version: 4.0.8 +Version: 4.0.9 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-iscsi-lio-server-4.0.8.tar.bz2 -> yast2-iscsi-lio-server-4.0.9.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-lio-server-4.0.8/package/yast2-iscsi-lio-server.changes new/yast2-iscsi-lio-server-4.0.9/package/yast2-iscsi-lio-server.changes --- old/yast2-iscsi-lio-server-4.0.8/package/yast2-iscsi-lio-server.changes 2018-04-10 11:51:24.000000000 +0200 +++ new/yast2-iscsi-lio-server-4.0.9/package/yast2-iscsi-lio-server.changes 2018-05-02 09:59:57.000000000 +0200 @@ -1,5 +1,12 @@ ------------------------------------------------------------------- -Tue Apr 10 08:58:28 UTC 2018 - lszhu@localhost +Sat Apr 28 05:59:05 UTC 2018 - lszhu(a)suse.com + +- bsc#1091194 + Change Adding LUN dialog UI, place "Browse" button under LUN + path input field, avoid unaligned UI. + +------------------------------------------------------------------- +Tue Apr 10 08:58:28 UTC 2018 - lszhu(a)suse.com - bsc#1088677 A better UI layout for IP selection combox and port input field diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-lio-server-4.0.8/package/yast2-iscsi-lio-server.spec new/yast2-iscsi-lio-server-4.0.9/package/yast2-iscsi-lio-server.spec --- old/yast2-iscsi-lio-server-4.0.8/package/yast2-iscsi-lio-server.spec 2018-04-10 11:51:24.000000000 +0200 +++ new/yast2-iscsi-lio-server-4.0.9/package/yast2-iscsi-lio-server.spec 2018-05-02 09:59:57.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-iscsi-lio-server -Version: 4.0.8 +Version: 4.0.9 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-lio-server-4.0.8/src/include/iscsi-lio-server/UI_dialogs.rb new/yast2-iscsi-lio-server-4.0.9/src/include/iscsi-lio-server/UI_dialogs.rb --- old/yast2-iscsi-lio-server-4.0.8/src/include/iscsi-lio-server/UI_dialogs.rb 2018-04-10 11:51:24.000000000 +0200 +++ new/yast2-iscsi-lio-server-4.0.9/src/include/iscsi-lio-server/UI_dialogs.rb 2018-05-02 09:59:57.000000000 +0200 @@ -2687,9 +2687,9 @@ end def contents - HBox( + VBox( @lun_path_input, - PushButton(Id(:browse), _('Browse')) + PushButton(Id(:browse), _('Browse')), ) end

1 0

commit youtube-dl for openSUSE:Factory
by root＠hilbert.suse.de 02 May '18

02 May '18

Hello community, here is the log from the commit of package youtube-dl for openSUSE:Factory checked in at 2018-05-02 12:19:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/youtube-dl (Old) and /work/SRC/openSUSE:Factory/.youtube-dl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "youtube-dl" Wed May 2 12:19:45 2018 rev:75 rq:602951 version:2018.05.01 Changes: -------- --- /work/SRC/openSUSE:Factory/youtube-dl/python-youtube-dl.changes 2018-04-30 22:59:19.239624832 +0200 +++ /work/SRC/openSUSE:Factory/.youtube-dl.new/python-youtube-dl.changes 2018-05-02 12:19:51.813025321 +0200 @@ -1,0 +2,7 @@ +Wed May 2 06:03:52 UTC 2018 - jengelh(a)inai.de + +- Update to new upstream release 2018.05.01 + * Restart download if .ytdl file is corrupt + * Add support for old.reddit.com URLs + +------------------------------------------------------------------- youtube-dl.changes: same change Old: ---- youtube-dl-2018.04.25.tar.gz youtube-dl-2018.04.25.tar.gz.sig New: ---- youtube-dl-2018.05.01.tar.gz youtube-dl-2018.05.01.tar.gz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-youtube-dl.spec ++++++ --- /var/tmp/diff_new_pack.f3VP06/_old 2018-05-02 12:19:56.756844941 +0200 +++ /var/tmp/diff_new_pack.f3VP06/_new 2018-05-02 12:19:56.760844795 +0200 @@ -19,7 +19,7 @@ %define modname youtube-dl %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-youtube-dl -Version: 2018.04.25 +Version: 2018.05.01 Release: 0 Summary: A python module for downloading from video sites for offline watching License: SUSE-Public-Domain AND CC-BY-SA-3.0 ++++++ youtube-dl.spec ++++++ --- /var/tmp/diff_new_pack.f3VP06/_old 2018-05-02 12:19:56.788843774 +0200 +++ /var/tmp/diff_new_pack.f3VP06/_new 2018-05-02 12:19:56.788843774 +0200 @@ -17,7 +17,7 @@ Name: youtube-dl -Version: 2018.04.25 +Version: 2018.05.01 Release: 0 Summary: A tool for downloading from video sites for offline watching License: SUSE-Public-Domain AND CC-BY-SA-3.0 ++++++ youtube-dl-2018.04.25.tar.gz -> youtube-dl-2018.05.01.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/youtube-dl/ChangeLog new/youtube-dl/ChangeLog --- old/youtube-dl/ChangeLog 2018-04-24 20:12:36.000000000 +0200 +++ new/youtube-dl/ChangeLog 2018-04-30 22:38:54.000000000 +0200 @@ -1,3 +1,29 @@ +version 2018.05.01 + +Core +* [downloader/fragment] Restart download if .ytdl file is corrupt (#16312) ++ [extractor/common] Extract interaction statistic ++ [utils] Add merge_dicts ++ [extractor/common] Add _download_json_handle + +Extractors +* [kaltura] Improve iframe embeds detection (#16337) ++ [udemy] Extract outputs renditions (#16289, #16291, #16320, #16321, #16334, + #16335) ++ [zattoo] Add support for zattoo.com and mobiltv.quickline.com (#14668, #14676) +* [yandexmusic] Convert release_year to int +* [udemy] Override _download_webpage_handle instead of _download_webpage +* [xiami] Override _download_webpage_handle instead of _download_webpage +* [yandexmusic] Override _download_webpage_handle instead of _download_webpage +* [youtube] Correctly disable polymer on all requests (#16323, #16326) +* [generic] Prefer enclosures over links in RSS feeds (#16189) ++ [redditr] Add support for old.reddit.com URLs (#16274) +* [nrktv] Update API host (#16324) ++ [imdb] Extract all formats (#16249) ++ [vimeo] Extract JSON-LD (#16295) +* [funk:channel] Improve extraction (#16285) + + version 2018.04.25 Core diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/youtube-dl/devscripts/gh-pages/generate-download.py new/youtube-dl/devscripts/gh-pages/generate-download.py --- old/youtube-dl/devscripts/gh-pages/generate-download.py 2018-04-24 20:11:37.000000000 +0200 +++ new/youtube-dl/devscripts/gh-pages/generate-download.py 2018-04-30 22:36:24.000000000 +0200 @@ -1,27 +1,22 @@ #!/usr/bin/env python3 from __future__ import unicode_literals -import hashlib -import urllib.request import json versions_info = json.load(open('update/versions.json')) version = versions_info['latest'] -URL = versions_info['versions'][version]['bin'][0] - -data = urllib.request.urlopen(URL).read() +version_dict = versions_info['versions'][version] # Read template page with open('download.html.in', 'r', encoding='utf-8') as tmplf: template = tmplf.read() -sha256sum = hashlib.sha256(data).hexdigest() template = template.replace('@PROGRAM_VERSION@', version) -template = template.replace('@PROGRAM_URL@', URL) -template = template.replace('@PROGRAM_SHA256SUM@', sha256sum) -template = template.replace('@EXE_URL@', versions_info['versions'][version]['exe'][0]) -template = template.replace('@EXE_SHA256SUM@', versions_info['versions'][version]['exe'][1]) -template = template.replace('@TAR_URL@', versions_info['versions'][version]['tar'][0]) -template = template.replace('@TAR_SHA256SUM@', versions_info['versions'][version]['tar'][1]) +template = template.replace('@PROGRAM_URL@', version_dict['bin'][0]) +template = template.replace('@PROGRAM_SHA256SUM@', version_dict['bin'][1]) +template = template.replace('@EXE_URL@', version_dict['exe'][0]) +template = template.replace('@EXE_SHA256SUM@', version_dict['exe'][1]) +template = template.replace('@TAR_URL@', version_dict['tar'][0]) +template = template.replace('@TAR_SHA256SUM@', version_dict['tar'][1]) with open('download.html', 'w', encoding='utf-8') as dlf: dlf.write(template) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/youtube-dl/docs/supportedsites.md new/youtube-dl/docs/supportedsites.md --- old/youtube-dl/docs/supportedsites.md 2018-04-24 20:12:40.000000000 +0200 +++ new/youtube-dl/docs/supportedsites.md 2018-04-30 22:38:57.000000000 +0200 @@ -667,6 +667,8 @@ - **qqmusic:playlist**: QQ音乐 - 歌单 - **qqmusic:singer**: QQ音乐 - 歌手 - **qqmusic:toplist**: QQ音乐 - 排行榜 + - **Quickline** + - **QuicklineLive** - **R7** - **R7Article** - **radio.de** @@ -1092,6 +1094,8 @@ - **youtube:watchlater**: Youtube watch later list, ":ytwatchlater" for short (requires authentication) - **Zapiks** - **Zaq1** + - **Zattoo** + - **ZattooLive** - **ZDF** - **ZDFChannel** - **zingmp3**: mp3.zing.vn diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/youtube-dl/test/test_utils.py new/youtube-dl/test/test_utils.py --- old/youtube-dl/test/test_utils.py 2018-04-24 20:11:43.000000000 +0200 +++ new/youtube-dl/test/test_utils.py 2018-04-30 22:36:24.000000000 +0200 @@ -42,6 +42,7 @@ is_html, js_to_json, limit_length, + merge_dicts, mimetype2ext, month_by_name, multipart_encode, @@ -669,6 +670,17 @@ self.assertEqual(dict_get(d, ('b', 'c', key, )), None) self.assertEqual(dict_get(d, ('b', 'c', key, ), skip_false_values=False), false_value) + def test_merge_dicts(self): + self.assertEqual(merge_dicts({'a': 1}, {'b': 2}), {'a': 1, 'b': 2}) + self.assertEqual(merge_dicts({'a': 1}, {'a': 2}), {'a': 1}) + self.assertEqual(merge_dicts({'a': 1}, {'a': None}), {'a': 1}) + self.assertEqual(merge_dicts({'a': 1}, {'a': ''}), {'a': 1}) + self.assertEqual(merge_dicts({'a': 1}, {}), {'a': 1}) + self.assertEqual(merge_dicts({'a': None}, {'a': 1}), {'a': 1}) + self.assertEqual(merge_dicts({'a': ''}, {'a': 1}), {'a': ''}) + self.assertEqual(merge_dicts({'a': ''}, {'a': 'abc'}), {'a': 'abc'}) + self.assertEqual(merge_dicts({'a': None}, {'a': ''}, {'a': 'abc'}), {'a': 'abc'}) + def test_encode_compat_str(self): self.assertEqual(encode_compat_str(b'\xd1\x82\xd0\xb5\xd1\x81\xd1\x82', 'utf-8'), 'тест') self.assertEqual(encode_compat_str('тест', 'utf-8'), 'тест') Binary files old/youtube-dl/youtube-dl and new/youtube-dl/youtube-dl differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/youtube-dl/youtube_dl/downloader/fragment.py new/youtube-dl/youtube_dl/downloader/fragment.py --- old/youtube-dl/youtube_dl/downloader/fragment.py 2018-04-24 20:11:37.000000000 +0200 +++ new/youtube-dl/youtube_dl/downloader/fragment.py 2018-04-30 22:36:24.000000000 +0200 @@ -74,9 +74,14 @@ return not ctx['live'] and not ctx['tmpfilename'] == '-' def _read_ytdl_file(self, ctx): + assert 'ytdl_corrupt' not in ctx stream, _ = sanitize_open(self.ytdl_filename(ctx['filename']), 'r') - ctx['fragment_index'] = json.loads(stream.read())['downloader']['current_fragment']['index'] - stream.close() + try: + ctx['fragment_index'] = json.loads(stream.read())['downloader']['current_fragment']['index'] + except Exception: + ctx['ytdl_corrupt'] = True + finally: + stream.close() def _write_ytdl_file(self, ctx): frag_index_stream, _ = sanitize_open(self.ytdl_filename(ctx['filename']), 'w') @@ -158,11 +163,17 @@ if self.__do_ytdl_file(ctx): if os.path.isfile(encodeFilename(self.ytdl_filename(ctx['filename']))): self._read_ytdl_file(ctx) - if ctx['fragment_index'] > 0 and resume_len == 0: + is_corrupt = ctx.get('ytdl_corrupt') is True + is_inconsistent = ctx['fragment_index'] > 0 and resume_len == 0 + if is_corrupt or is_inconsistent: + message = ( + '.ytdl file is corrupt' if is_corrupt else + 'Inconsistent state of incomplete fragment download') self.report_warning( - 'Inconsistent state of incomplete fragment download. ' - 'Restarting from the beginning...') + '%s. Restarting from the beginning...' % message) ctx['fragment_index'] = resume_len = 0 + if 'ytdl_corrupt' in ctx: + del ctx['ytdl_corrupt'] self._write_ytdl_file(ctx) else: self._write_ytdl_file(ctx) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/youtube-dl/youtube_dl/extractor/common.py new/youtube-dl/youtube_dl/extractor/common.py --- old/youtube-dl/youtube_dl/extractor/common.py 2018-04-24 20:11:37.000000000 +0200 +++ new/youtube-dl/youtube_dl/extractor/common.py 2018-04-30 22:36:24.000000000 +0200 @@ -682,18 +682,30 @@ else: self.report_warning(errmsg + str(ve)) - def _download_json(self, url_or_request, video_id, - note='Downloading JSON metadata', - errnote='Unable to download JSON metadata', - transform_source=None, - fatal=True, encoding=None, data=None, headers={}, query={}): - json_string = self._download_webpage( + def _download_json_handle( + self, url_or_request, video_id, note='Downloading JSON metadata', + errnote='Unable to download JSON metadata', transform_source=None, + fatal=True, encoding=None, data=None, headers={}, query={}): + """Return a tuple (JSON object, URL handle)""" + res = self._download_webpage_handle( url_or_request, video_id, note, errnote, fatal=fatal, encoding=encoding, data=data, headers=headers, query=query) - if (not fatal) and json_string is False: - return None + if res is False: + return res + json_string, urlh = res return self._parse_json( - json_string, video_id, transform_source=transform_source, fatal=fatal) + json_string, video_id, transform_source=transform_source, + fatal=fatal), urlh + + def _download_json( + self, url_or_request, video_id, note='Downloading JSON metadata', + errnote='Unable to download JSON metadata', transform_source=None, + fatal=True, encoding=None, data=None, headers={}, query={}): + res = self._download_json_handle( + url_or_request, video_id, note=note, errnote=errnote, + transform_source=transform_source, fatal=fatal, encoding=encoding, + data=data, headers=headers, query=query) + return res if res is False else res[0] def _parse_json(self, json_string, video_id, transform_source=None, fatal=True): if transform_source: @@ -1008,6 +1020,40 @@ if isinstance(json_ld, dict): json_ld = [json_ld] + INTERACTION_TYPE_MAP = { + 'CommentAction': 'comment', + 'AgreeAction': 'like', + 'DisagreeAction': 'dislike', + 'LikeAction': 'like', + 'DislikeAction': 'dislike', + 'ListenAction': 'view', + 'WatchAction': 'view', + 'ViewAction': 'view', + } + + def extract_interaction_statistic(e): + interaction_statistic = e.get('interactionStatistic') + if not isinstance(interaction_statistic, list): + return + for is_e in interaction_statistic: + if not isinstance(is_e, dict): + continue + if is_e.get('@type') != 'InteractionCounter': + continue + interaction_type = is_e.get('interactionType') + if not isinstance(interaction_type, compat_str): + continue + interaction_count = int_or_none(is_e.get('userInteractionCount')) + if interaction_count is None: + continue + count_kind = INTERACTION_TYPE_MAP.get(interaction_type.split('/')[-1]) + if not count_kind: + continue + count_key = '%s_count' % count_kind + if info.get(count_key) is not None: + continue + info[count_key] = interaction_count + def extract_video_object(e): assert e['@type'] == 'VideoObject' info.update({ @@ -1023,6 +1069,7 @@ 'height': int_or_none(e.get('height')), 'view_count': int_or_none(e.get('interactionCount')), }) + extract_interaction_statistic(e) for e in json_ld: if isinstance(e.get('@context'), compat_str) and re.match(r'^https?://schema.org/?$', e.get('@context')): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/youtube-dl/youtube_dl/extractor/extractors.py new/youtube-dl/youtube_dl/extractor/extractors.py --- old/youtube-dl/youtube_dl/extractor/extractors.py 2018-04-24 20:11:43.000000000 +0200 +++ new/youtube-dl/youtube_dl/extractor/extractors.py 2018-04-30 22:36:24.000000000 +0200 @@ -1418,5 +1418,11 @@ ) from .zapiks import ZapiksIE from .zaq1 import Zaq1IE +from .zattoo import ( + QuicklineIE, + QuicklineLiveIE, + ZattooIE, + ZattooLiveIE, +) from .zdf import ZDFIE, ZDFChannelIE from .zingmp3 import ZingMp3IE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/youtube-dl/youtube_dl/extractor/funk.py new/youtube-dl/youtube_dl/extractor/funk.py --- old/youtube-dl/youtube_dl/extractor/funk.py 2018-04-24 20:11:37.000000000 +0200 +++ new/youtube-dl/youtube_dl/extractor/funk.py 2018-04-30 22:36:24.000000000 +0200 @@ -5,7 +5,10 @@ from .common import InfoExtractor from .nexx import NexxIE -from ..utils import int_or_none +from ..utils import ( + int_or_none, + try_get, +) class FunkBaseIE(InfoExtractor): @@ -78,6 +81,20 @@ 'skip_download': True, }, }, { + # only available via byIdList API + 'url': 'https://www.funk.net/channel/informr/martin-sonneborn-erklaert-die-eu', + 'info_dict': { + 'id': '205067', + 'ext': 'mp4', + 'title': 'Martin Sonneborn erklärt die EU', + 'description': 'md5:050f74626e4ed87edf4626d2024210c0', + 'timestamp': 1494424042, + 'upload_date': '20170510', + }, + 'params': { + 'skip_download': True, + }, + }, { 'url': 'https://www.funk.net/channel/59d5149841dca100012511e3/mein-erster-job-lovem…', 'only_matching': True, }] @@ -87,16 +104,28 @@ channel_id = mobj.group('id') alias = mobj.group('alias') - results = self._download_json( - 'https://www.funk.net/api/v3.0/content/videos/filter', channel_id, - headers={ - 'authorization': 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJjbGllbnROYW1lIjoiY3VyYXRpb24tdG9vbCIsInNjb3BlIjoic3RhdGljLWNvbnRlbnQtYXBpLGN1cmF0aW9uLWFwaSxzZWFyY2gtYXBpIn0.q4Y2xZG8PFHai24-4Pjx2gym9RmJejtmK6lMXP5wAgc', - 'Referer': url, - }, query={ - 'channelId': channel_id, - 'size': 100, - })['result'] + headers = { + 'authorization': 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJjbGllbnROYW1lIjoiY3VyYXRpb24tdG9vbCIsInNjb3BlIjoic3RhdGljLWNvbnRlbnQtYXBpLGN1cmF0aW9uLWFwaSxzZWFyY2gtYXBpIn0.q4Y2xZG8PFHai24-4Pjx2gym9RmJejtmK6lMXP5wAgc', + 'Referer': url, + } + + video = None - video = next(r for r in results if r.get('alias') == alias) + by_id_list = self._download_json( + 'https://www.funk.net/api/v3.0/content/videos/byIdList', channel_id, + headers=headers, query={ + 'ids': alias, + }, fatal=False) + if by_id_list: + video = try_get(by_id_list, lambda x: x['result'][0], dict) + + if not video: + results = self._download_json( + 'https://www.funk.net/api/v3.0/content/videos/filter', channel_id, + headers=headers, query={ + 'channelId': channel_id, + 'size': 100, + })['result'] + video = next(r for r in results if r.get('alias') == alias) return self._make_url_result(video) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/youtube-dl/youtube_dl/extractor/generic.py new/youtube-dl/youtube_dl/extractor/generic.py --- old/youtube-dl/youtube_dl/extractor/generic.py 2018-04-24 20:11:37.000000000 +0200 +++ new/youtube-dl/youtube_dl/extractor/generic.py 2018-04-30 22:36:24.000000000 +0200 @@ -23,6 +23,7 @@ is_html, js_to_json, KNOWN_EXTENSIONS, + merge_dicts, mimetype2ext, orderedSet, sanitized_Request, @@ -190,6 +191,16 @@ 'title': 'pdv_maddow_netcast_m4v-02-27-2015-201624', } }, + # RSS feed with enclosures and unsupported link URLs + { + 'url': 'http://www.hellointernet.fm/podcast?format=rss', + 'info_dict': { + 'id': 'http://www.hellointernet.fm/podcast?format=rss', + 'description': 'CGP Grey and Brady Haran talk about YouTube, life, work, whatever.', + 'title': 'Hello Internet', + }, + 'playlist_mincount': 100, + }, # SMIL from http://videolectures.net/promogram_igor_mekjavic_eng { 'url': 'http://videolectures.net/promogram_igor_mekjavic_eng/video/1/smil.xml', @@ -1272,6 +1283,23 @@ 'add_ie': ['Kaltura'], }, { + # Kaltura iframe embed, more sophisticated + 'url': 'http://www.cns.nyu.edu/~eero/math-tools/Videos/lecture-05sep2017.html', + 'info_dict': { + 'id': '1_9gzouybz', + 'ext': 'mp4', + 'title': 'lecture-05sep2017', + 'description': 'md5:40f347d91fd4ba047e511c5321064b49', + 'upload_date': '20170913', + 'uploader_id': 'eps2', + 'timestamp': 1505340777, + }, + 'params': { + 'skip_download': True, + }, + 'add_ie': ['Kaltura'], + }, + { # meta twitter:player 'url': 'http://thechive.com/2017/12/08/all-i-want-for-christmas-is-more-twerk/', 'info_dict': { @@ -2025,13 +2053,15 @@ entries = [] for it in doc.findall('./channel/item'): - next_url = xpath_text(it, 'link', fatal=False) + next_url = None + enclosure_nodes = it.findall('./enclosure') + for e in enclosure_nodes: + next_url = e.attrib.get('url') + if next_url: + break + if not next_url: - enclosure_nodes = it.findall('./enclosure') - for e in enclosure_nodes: - next_url = e.attrib.get('url') - if next_url: - break + next_url = xpath_text(it, 'link', fatal=False) if not next_url: continue @@ -3002,21 +3032,6 @@ return self.playlist_from_matches( sharevideos_urls, video_id, video_title) - def merge_dicts(dict1, dict2): - merged = {} - for k, v in dict1.items(): - if v is not None: - merged[k] = v - for k, v in dict2.items(): - if v is None: - continue - if (k not in merged or - (isinstance(v, compat_str) and v and - isinstance(merged[k], compat_str) and - not merged[k])): - merged[k] = v - return merged - # Look for HTML5 media entries = self._parse_html5_media_entries(url, webpage, video_id, m3u8_id='hls') if entries: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/youtube-dl/youtube_dl/extractor/imdb.py new/youtube-dl/youtube_dl/extractor/imdb.py --- old/youtube-dl/youtube_dl/extractor/imdb.py 2018-04-24 20:11:37.000000000 +0200 +++ new/youtube-dl/youtube_dl/extractor/imdb.py 2018-04-30 22:36:24.000000000 +0200 @@ -3,7 +3,9 @@ import re from .common import InfoExtractor +from ..compat import compat_str from ..utils import ( + determine_ext, mimetype2ext, qualities, remove_end, @@ -73,19 +75,25 @@ video_info_list = format_info.get('videoInfoList') if not video_info_list or not isinstance(video_info_list, list): continue - video_info = video_info_list[0] - if not video_info or not isinstance(video_info, dict): - continue - video_url = video_info.get('videoUrl') - if not video_url: - continue - format_id = format_info.get('ffname') - formats.append({ - 'format_id': format_id, - 'url': video_url, - 'ext': mimetype2ext(video_info.get('videoMimeType')), - 'quality': quality(format_id), - }) + for video_info in video_info_list: + if not video_info or not isinstance(video_info, dict): + continue + video_url = video_info.get('videoUrl') + if not video_url or not isinstance(video_url, compat_str): + continue + if (video_info.get('videoMimeType') == 'application/x-mpegURL' or + determine_ext(video_url) == 'm3u8'): + formats.extend(self._extract_m3u8_formats( + video_url, video_id, 'mp4', entry_protocol='m3u8_native', + m3u8_id='hls', fatal=False)) + continue + format_id = format_info.get('ffname') + formats.append({ + 'format_id': format_id, + 'url': video_url, + 'ext': mimetype2ext(video_info.get('videoMimeType')), + 'quality': quality(format_id), + }) self._sort_formats(formats) return { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/youtube-dl/youtube_dl/extractor/kaltura.py new/youtube-dl/youtube_dl/extractor/kaltura.py --- old/youtube-dl/youtube_dl/extractor/kaltura.py 2018-04-24 20:11:37.000000000 +0200 +++ new/youtube-dl/youtube_dl/extractor/kaltura.py 2018-04-30 22:36:24.000000000 +0200 @@ -136,9 +136,10 @@ re.search( r'''(?xs) <(?:iframe[^>]+src|meta[^>]+\bcontent)=(?P<q1>["']) - (?:https?:)?//(?:(?:www|cdnapi)\.)?kaltura\.com/(?:(?!(?P=q1)).)*\b(?:p|partner_id)/(?P<partner_id>\d+) + (?:https?:)?//(?:(?:www|cdnapi(?:sec)?)\.)?kaltura\.com/(?:(?!(?P=q1)).)*\b(?:p|partner_id)/(?P<partner_id>\d+) (?:(?!(?P=q1)).)* [?&;]entry_id=(?P<id>(?:(?!(?P=q1))[^&])+) + (?:(?!(?P=q1)).)* (?P=q1) ''', webpage) ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/youtube-dl/youtube_dl/extractor/nrk.py new/youtube-dl/youtube_dl/extractor/nrk.py --- old/youtube-dl/youtube_dl/extractor/nrk.py 2018-04-24 20:11:37.000000000 +0200 +++ new/youtube-dl/youtube_dl/extractor/nrk.py 2018-04-30 22:36:24.000000000 +0200 @@ -237,7 +237,7 @@ (?:/\d{2}-\d{2}-\d{4})? (?:\#del=(?P<part_id>\d+))? ''' % _EPISODE_RE - _API_HOST = 'psapi-ne.nrk.no' + _API_HOST = 'psapi-we.nrk.no' _TESTS = [{ 'url': 'https://tv.nrk.no/serie/20-spoersmaal-tv/MUHH48000314/23-05-2014', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/youtube-dl/youtube_dl/extractor/reddit.py new/youtube-dl/youtube_dl/extractor/reddit.py --- old/youtube-dl/youtube_dl/extractor/reddit.py 2018-04-24 20:11:37.000000000 +0200 +++ new/youtube-dl/youtube_dl/extractor/reddit.py 2018-04-30 22:36:24.000000000 +0200 @@ -47,7 +47,7 @@ class RedditRIE(InfoExtractor): - _VALID_URL = r'(?P<url>https?://(?:www\.)?reddit\.com/r/[^/]+/comments/(?P<id>[^/?#&]+))' + _VALID_URL = r'(?P<url>https?://(?:(?:www|old)\.)?reddit\.com/r/[^/]+/comments/(?P<id>[^/?#&]+))' _TESTS = [{ 'url': 'https://www.reddit.com/r/videos/comments/6rrwyj/that_small_heart_attack/', 'info_dict': { @@ -75,6 +75,10 @@ 'url': 'https://www.reddit.com/r/MadeMeSmile/comments/6t7wi5/wait_for_it/', 'only_matching': True, }, { + # imgur @ old reddit + 'url': 'https://old.reddit.com/r/MadeMeSmile/comments/6t7wi5/wait_for_it/', + 'only_matching': True, + }, { # streamable 'url': 'https://www.reddit.com/r/videos/comments/6t7sg9/comedians_hilarious_joke_ab…', 'only_matching': True, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/youtube-dl/youtube_dl/extractor/udemy.py new/youtube-dl/youtube_dl/extractor/udemy.py --- old/youtube-dl/youtube_dl/extractor/udemy.py 2018-04-24 20:11:37.000000000 +0200 +++ new/youtube-dl/youtube_dl/extractor/udemy.py 2018-04-30 22:36:24.000000000 +0200 @@ -58,6 +58,10 @@ # no url in outputs format entry 'url': 'https://www.udemy.com/learn-web-development-complete-step-by-step-guide-to-…', 'only_matching': True, + }, { + # only outputs rendition + 'url': 'https://www.udemy.com/how-you-can-help-your-local-community-5-amazing-examp…', + 'only_matching': True, }] def _extract_course_info(self, webpage, video_id): @@ -115,9 +119,9 @@ error_str += ' - %s' % error_data.get('formErrors') raise ExtractorError(error_str, expected=True) - def _download_webpage(self, *args, **kwargs): + def _download_webpage_handle(self, *args, **kwargs): kwargs.setdefault('headers', {})['User-Agent'] = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_5) AppleWebKit/603.2.4 (KHTML, like Gecko) Version/10.1.1 Safari/603.2.4' - return super(UdemyIE, self)._download_webpage( + return super(UdemyIE, self)._download_webpage_handle( *args, **compat_kwargs(kwargs)) def _download_json(self, url_or_request, *args, **kwargs): @@ -357,6 +361,12 @@ fatal=False) extract_subtitles(text_tracks) + if not formats and outputs: + for format_id, output in outputs.items(): + f = extract_output_format(output, format_id) + if f.get('url'): + formats.append(f) + self._sort_formats(formats, field_preference=('height', 'width', 'tbr', 'format_id')) return { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/youtube-dl/youtube_dl/extractor/vimeo.py new/youtube-dl/youtube_dl/extractor/vimeo.py --- old/youtube-dl/youtube_dl/extractor/vimeo.py 2018-04-24 20:11:37.000000000 +0200 +++ new/youtube-dl/youtube_dl/extractor/vimeo.py 2018-04-30 22:36:24.000000000 +0200 @@ -16,6 +16,7 @@ ExtractorError, InAdvancePagedList, int_or_none, + merge_dicts, NO_DEFAULT, RegexNotFoundError, sanitized_Request, @@ -639,16 +640,18 @@ 'preference': 1, }) - info_dict = self._parse_config(config, video_id) - formats.extend(info_dict['formats']) + info_dict_config = self._parse_config(config, video_id) + formats.extend(info_dict_config['formats']) self._vimeo_sort_formats(formats) + json_ld = self._search_json_ld(webpage, video_id, default={}) + if not cc_license: cc_license = self._search_regex( r'<link[^>]+rel=["\']license["\'][^>]+href=(["\'])(?P<license>(?:(?!\1).)+)\1', webpage, 'license', default=None, group='license') - info_dict.update({ + info_dict = { 'id': video_id, 'formats': formats, 'timestamp': unified_timestamp(timestamp), @@ -658,7 +661,9 @@ 'like_count': like_count, 'comment_count': comment_count, 'license': cc_license, - }) + } + + info_dict = merge_dicts(info_dict, info_dict_config, json_ld) return info_dict diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/youtube-dl/youtube_dl/extractor/xiami.py new/youtube-dl/youtube_dl/extractor/xiami.py --- old/youtube-dl/youtube_dl/extractor/xiami.py 2018-04-24 20:11:37.000000000 +0200 +++ new/youtube-dl/youtube_dl/extractor/xiami.py 2018-04-30 22:36:24.000000000 +0200 @@ -9,8 +9,8 @@ class XiamiBaseIE(InfoExtractor): _API_BASE_URL = 'http://www.xiami.com/song/playlist/cat/json/id' - def _download_webpage(self, *args, **kwargs): - webpage = super(XiamiBaseIE, self)._download_webpage(*args, **kwargs) + def _download_webpage_handle(self, *args, **kwargs): + webpage = super(XiamiBaseIE, self)._download_webpage_handle(*args, **kwargs) if '>Xiami is currently not available in your country.<' in webpage: self.raise_geo_restricted('Xiami is currently not available in your country') return webpage diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/youtube-dl/youtube_dl/extractor/yandexmusic.py new/youtube-dl/youtube_dl/extractor/yandexmusic.py --- old/youtube-dl/youtube_dl/extractor/yandexmusic.py 2018-04-24 20:11:37.000000000 +0200 +++ new/youtube-dl/youtube_dl/extractor/yandexmusic.py 2018-04-30 22:36:24.000000000 +0200 @@ -34,8 +34,8 @@ 'youtube-dl with --cookies', expected=True) - def _download_webpage(self, *args, **kwargs): - webpage = super(YandexMusicBaseIE, self)._download_webpage(*args, **kwargs) + def _download_webpage_handle(self, *args, **kwargs): + webpage = super(YandexMusicBaseIE, self)._download_webpage_handle(*args, **kwargs) if 'Нам очень жаль, но запросы, поступившие с вашего IP-адреса, похожи на автоматические.' in webpage: self._raise_captcha() return webpage @@ -57,14 +57,14 @@ 'info_dict': { 'id': '4878838', 'ext': 'mp3', - 'title': 'Carlo Ambrosio & Fabio Di Bari, Carlo Ambrosio - Gypsy Eyes 1', + 'title': 'Carlo Ambrosio, Carlo Ambrosio & Fabio Di Bari - Gypsy Eyes 1', 'filesize': 4628061, 'duration': 193.04, 'track': 'Gypsy Eyes 1', 'album': 'Gypsy Soul', 'album_artist': 'Carlo Ambrosio', - 'artist': 'Carlo Ambrosio & Fabio Di Bari, Carlo Ambrosio', - 'release_year': '2009', + 'artist': 'Carlo Ambrosio, Carlo Ambrosio & Fabio Di Bari', + 'release_year': 2009, }, 'skip': 'Travis CI servers blocked by YandexMusic', } @@ -120,7 +120,7 @@ track_info.update({ 'album': album.get('title'), 'album_artist': extract_artist(album.get('artists')), - 'release_year': compat_str(year) if year else None, + 'release_year': int_or_none(year), }) track_artist = extract_artist(track.get('artists')) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/youtube-dl/youtube_dl/extractor/youtube.py new/youtube-dl/youtube_dl/extractor/youtube.py --- old/youtube-dl/youtube_dl/extractor/youtube.py 2018-04-24 20:11:37.000000000 +0200 +++ new/youtube-dl/youtube_dl/extractor/youtube.py 2018-04-30 22:36:24.000000000 +0200 @@ -246,9 +246,9 @@ return True - def _download_webpage(self, *args, **kwargs): + def _download_webpage_handle(self, *args, **kwargs): kwargs.setdefault('query', {})['disable_polymer'] = 'true' - return super(YoutubeBaseInfoExtractor, self)._download_webpage( + return super(YoutubeBaseInfoExtractor, self)._download_webpage_handle( *args, **compat_kwargs(kwargs)) def _real_initialize(self): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/youtube-dl/youtube_dl/extractor/zattoo.py new/youtube-dl/youtube_dl/extractor/zattoo.py --- old/youtube-dl/youtube_dl/extractor/zattoo.py 1970-01-01 01:00:00.000000000 +0100 +++ new/youtube-dl/youtube_dl/extractor/zattoo.py 2018-04-30 22:36:24.000000000 +0200 @@ -0,0 +1,270 @@ +# coding: utf-8 +from __future__ import unicode_literals + +import re +from uuid import uuid4 + +from .common import InfoExtractor +from ..compat import ( + compat_HTTPError, + compat_str, +) +from ..utils import ( + ExtractorError, + int_or_none, + try_get, + urlencode_postdata, +) + + +class ZattooBaseIE(InfoExtractor): + _NETRC_MACHINE = 'zattoo' + _HOST_URL = 'https://zattoo.com' + + _power_guide_hash = None + + def _login(self): + (username, password) = self._get_login_info() + if not username or not password: + self.raise_login_required( + 'A valid %s account is needed to access this media.' + % self._NETRC_MACHINE) + + try: + data = self._download_json( + '%s/zapi/v2/account/login' % self._HOST_URL, None, 'Logging in', + data=urlencode_postdata({ + 'login': username, + 'password': password, + 'remember': 'true', + }), headers={ + 'Referer': '%s/login' % self._HOST_URL, + 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8', + }) + except ExtractorError as e: + if isinstance(e.cause, compat_HTTPError) and e.cause.code == 400: + raise ExtractorError( + 'Unable to login: incorrect username and/or password', + expected=True) + raise + + self._power_guide_hash = data['session']['power_guide_hash'] + + def _real_initialize(self): + webpage = self._download_webpage( + self._HOST_URL, None, 'Downloading app token') + app_token = self._html_search_regex( + r'appToken\s*=\s*(["\'])(?P<token>(?:(?!\1).)+?)\1', + webpage, 'app token', group='token') + app_version = self._html_search_regex( + r'<!--\w+-(.+?)-', webpage, 'app version', default='2.8.2') + + # Will setup appropriate cookies + self._request_webpage( + '%s/zapi/v2/session/hello' % self._HOST_URL, None, + 'Opening session', data=urlencode_postdata({ + 'client_app_token': app_token, + 'uuid': compat_str(uuid4()), + 'lang': 'en', + 'app_version': app_version, + 'format': 'json', + })) + + self._login() + + def _extract_cid(self, video_id, channel_name): + channel_groups = self._download_json( + '%s/zapi/v2/cached/channels/%s' % (self._HOST_URL, + self._power_guide_hash), + video_id, 'Downloading channel list', + query={'details': False})['channel_groups'] + channel_list = [] + for chgrp in channel_groups: + channel_list.extend(chgrp['channels']) + try: + return next( + chan['cid'] for chan in channel_list + if chan.get('cid') and ( + chan.get('display_alias') == channel_name or + chan.get('cid') == channel_name)) + except StopIteration: + raise ExtractorError('Could not extract channel id') + + def _extract_cid_and_video_info(self, video_id): + data = self._download_json( + '%s/zapi/program/details' % self._HOST_URL, + video_id, + 'Downloading video information', + query={ + 'program_id': video_id, + 'complete': True + }) + + p = data['program'] + cid = p['cid'] + + info_dict = { + 'id': video_id, + 'title': p.get('title') or p['episode_title'], + 'description': p.get('description'), + 'thumbnail': p.get('image_url'), + 'creator': p.get('channel_name'), + 'episode': p.get('episode_title'), + 'episode_number': int_or_none(p.get('episode_number')), + 'season_number': int_or_none(p.get('season_number')), + 'release_year': int_or_none(p.get('year')), + 'categories': try_get(p, lambda x: x['categories'], list), + } + + return cid, info_dict + + def _extract_formats(self, cid, video_id, record_id=None, is_live=False): + postdata_common = { + 'https_watch_urls': True, + } + + if is_live: + postdata_common.update({'timeshift': 10800}) + url = '%s/zapi/watch/live/%s' % (self._HOST_URL, cid) + elif record_id: + url = '%s/zapi/watch/recording/%s' % (self._HOST_URL, record_id) + else: + url = '%s/zapi/watch/recall/%s/%s' % (self._HOST_URL, cid, video_id) + + formats = [] + for stream_type in ('dash', 'hls', 'hls5', 'hds'): + postdata = postdata_common.copy() + postdata['stream_type'] = stream_type + + data = self._download_json( + url, video_id, 'Downloading %s formats' % stream_type.upper(), + data=urlencode_postdata(postdata), fatal=False) + if not data: + continue + + watch_urls = try_get( + data, lambda x: x['stream']['watch_urls'], list) + if not watch_urls: + continue + + for watch in watch_urls: + if not isinstance(watch, dict): + continue + watch_url = watch.get('url') + if not watch_url or not isinstance(watch_url, compat_str): + continue + format_id_list = [stream_type] + maxrate = watch.get('maxrate') + if maxrate: + format_id_list.append(compat_str(maxrate)) + audio_channel = watch.get('audio_channel') + if audio_channel: + format_id_list.append(compat_str(audio_channel)) + preference = 1 if audio_channel == 'A' else None + format_id = '-'.join(format_id_list) + if stream_type in ('dash', 'dash_widevine', 'dash_playready'): + this_formats = self._extract_mpd_formats( + watch_url, video_id, mpd_id=format_id, fatal=False) + elif stream_type in ('hls', 'hls5', 'hls5_fairplay'): + this_formats = self._extract_m3u8_formats( + watch_url, video_id, 'mp4', + entry_protocol='m3u8_native', m3u8_id=format_id, + fatal=False) + elif stream_type == 'hds': + this_formats = self._extract_f4m_formats( + watch_url, video_id, f4m_id=format_id, fatal=False) + elif stream_type == 'smooth_playready': + this_formats = self._extract_ism_formats( + watch_url, video_id, ism_id=format_id, fatal=False) + else: + assert False + for this_format in this_formats: + this_format['preference'] = preference + formats.extend(this_formats) + self._sort_formats(formats) + return formats + + def _extract_video(self, channel_name, video_id, record_id=None, is_live=False): + if is_live: + cid = self._extract_cid(video_id, channel_name) + info_dict = { + 'id': channel_name, + 'title': self._live_title(channel_name), + 'is_live': True, + } + else: + cid, info_dict = self._extract_cid_and_video_info(video_id) + formats = self._extract_formats( + cid, video_id, record_id=record_id, is_live=is_live) + info_dict['formats'] = formats + return info_dict + + +class QuicklineBaseIE(ZattooBaseIE): + _NETRC_MACHINE = 'quickline' + _HOST_URL = 'https://mobiltv.quickline.com' + + +class QuicklineIE(QuicklineBaseIE): + _VALID_URL = r'https?://(?:www\.)?mobiltv\.quickline\.com/watch/(?P<channel>[^/]+)/(?P<id>[0-9]+)' + + _TEST = { + 'url': 'https://mobiltv.quickline.com/watch/prosieben/130671867-maze-runner-die-aus…', + 'only_matching': True, + } + + def _real_extract(self, url): + channel_name, video_id = re.match(self._VALID_URL, url).groups() + return self._extract_video(channel_name, video_id) + + +class QuicklineLiveIE(QuicklineBaseIE): + _VALID_URL = r'https?://(?:www\.)?mobiltv\.quickline\.com/watch/(?P<id>[^/]+)' + + _TEST = { + 'url': 'https://mobiltv.quickline.com/watch/srf1', + 'only_matching': True, + } + + @classmethod + def suitable(cls, url): + return False if QuicklineIE.suitable(url) else super(QuicklineLiveIE, cls).suitable(url) + + def _real_extract(self, url): + channel_name = video_id = self._match_id(url) + return self._extract_video(channel_name, video_id, is_live=True) + + +class ZattooIE(ZattooBaseIE): + _VALID_URL = r'https?://(?:www\.)?zattoo\.com/watch/(?P<channel>[^/]+?)/(?P<id>[0-9]+)[^/]+(?:/(?P<recid>[0-9]+))?' + + # Since regular videos are only available for 7 days and recorded videos + # are only available for a specific user, we cannot have detailed tests. + _TESTS = [{ + 'url': 'https://zattoo.com/watch/prosieben/130671867-maze-runner-die-auserwaehlten-…', + 'only_matching': True, + }, { + 'url': 'https://zattoo.com/watch/srf_zwei/132905652-eishockey-spengler-cup/10279147…', + 'only_matching': True, + }] + + def _real_extract(self, url): + channel_name, video_id, record_id = re.match(self._VALID_URL, url).groups() + return self._extract_video(channel_name, video_id, record_id) + + +class ZattooLiveIE(ZattooBaseIE): + _VALID_URL = r'https?://(?:www\.)?zattoo\.com/watch/(?P<id>[^/]+)' + + _TEST = { + 'url': 'https://zattoo.com/watch/srf1', + 'only_matching': True, + } + + @classmethod + def suitable(cls, url): + return False if ZattooIE.suitable(url) else super(ZattooLiveIE, cls).suitable(url) + + def _real_extract(self, url): + channel_name = video_id = self._match_id(url) + return self._extract_video(channel_name, video_id, is_live=True) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/youtube-dl/youtube_dl/utils.py new/youtube-dl/youtube_dl/utils.py --- old/youtube-dl/youtube_dl/utils.py 2018-04-24 20:11:43.000000000 +0200 +++ new/youtube-dl/youtube_dl/utils.py 2018-04-30 22:36:24.000000000 +0200 @@ -2225,6 +2225,20 @@ return v +def merge_dicts(*dicts): + merged = {} + for a_dict in dicts: + for k, v in a_dict.items(): + if v is None: + continue + if (k not in merged or + (isinstance(v, compat_str) and v and + isinstance(merged[k], compat_str) and + not merged[k])): + merged[k] = v + return merged + + def encode_compat_str(string, encoding=preferredencoding(), errors='strict'): return string if isinstance(string, compat_str) else compat_str(string, encoding, errors) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/youtube-dl/youtube_dl/version.py new/youtube-dl/youtube_dl/version.py --- old/youtube-dl/youtube_dl/version.py 2018-04-24 20:12:36.000000000 +0200 +++ new/youtube-dl/youtube_dl/version.py 2018-04-30 22:38:54.000000000 +0200 @@ -1,3 +1,3 @@ from __future__ import unicode_literals -__version__ = '2018.04.25' +__version__ = '2018.05.01'

1 0

commit nnn for openSUSE:Factory
by root＠hilbert.suse.de 02 May '18

02 May '18

Hello community, here is the log from the commit of package nnn for openSUSE:Factory checked in at 2018-05-02 12:19:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nnn (Old) and /work/SRC/openSUSE:Factory/.nnn.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "nnn" Wed May 2 12:19:37 2018 rev:3 rq:602898 version:1.8 Changes: -------- --- /work/SRC/openSUSE:Factory/nnn/nnn.changes 2018-02-28 20:02:56.891494174 +0100 +++ /work/SRC/openSUSE:Factory/.nnn.new/nnn.changes 2018-05-02 12:19:50.641068081 +0200 @@ -1,0 +2,24 @@ +Tue May 1 23:30:03 UTC 2018 - avindra(a)opensuse.org + +- Update to 1.8 + * Run a custom script + * Archive selected file/directory + * Show number of cherry-picked files in multi-copy mode + * Env var NNN_SHOW_HIDDEN to show hidden files by default + * Additional information in help screen + * Prefer env var VISUAL, if defined, to EDITOR + * New/changed/remapped shortcuts + ^] - spawn a new shell in current directory + r - edit directory entries in vidir + R - run a custom script + ^I - toggle navigate-as-you-type mode + L - lock the current terminal + * All Ctrl shortcuts enabled in navigate-as-you-type mode + * Fix: GUI programs closing when parent terminal is closed + * Recognize ~, - and & at bookmark prompt + * Recognize ruby (.rb) files as text files + * Efficient integer-only file size calculation +- minor cleanup with spec-cleaner +- include license, readme and changelog + +------------------------------------------------------------------- Old: ---- nnn-1.7.tar.gz New: ---- nnn-1.8.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nnn.spec ++++++ --- /var/tmp/diff_new_pack.hnSGOT/_old 2018-05-02 12:19:51.529035682 +0200 +++ /var/tmp/diff_new_pack.hnSGOT/_new 2018-05-02 12:19:51.529035682 +0200 @@ -17,12 +17,12 @@ Name: nnn -Version: 1.7 +Version: 1.8 Release: 0 Summary: Terminal based file browser License: GPL-2.0-or-later Group: Productivity/File utilities -Url: https://github.com/jarun/nnn#nnn +URL: https://github.com/jarun/nnn#nnn Source0: https://github.com/jarun/nnn/archive/v%{version}.tar.gz#/%{name}-%{version}… BuildRequires: pkgconfig BuildRequires: readline-devel @@ -46,10 +46,15 @@ %install %make_install PREFIX=%{_prefix} +# fix E: env-script-interpreter +sed -i 's,usr/bin/env ,bin/,' %{buildroot}%{_bindir}/nlay %files +%license LICENSE +%doc README.md CHANGELOG %{_bindir}/nlay %{_bindir}/%{name} %{_mandir}/man1/%{name}.1%{?ext_man} +%{_mandir}/man1/nlay.1%{?ext_man} %changelog ++++++ nnn-1.7.tar.gz -> nnn-1.8.tar.gz ++++++ ++++ 1895 lines of diff (skipped)

1 0

commit openSUSE-release-tools for openSUSE:Factory
by root＠hilbert.suse.de 02 May '18

02 May '18

Hello community, here is the log from the commit of package openSUSE-release-tools for openSUSE:Factory checked in at 2018-05-02 12:19:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openSUSE-release-tools (Old) and /work/SRC/openSUSE:Factory/.openSUSE-release-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openSUSE-release-tools" Wed May 2 12:19:29 2018 rev:89 rq:602860 version:20180430.eb1d0be Changes: -------- --- /work/SRC/openSUSE:Factory/openSUSE-release-tools/openSUSE-release-tools.changes 2018-04-30 22:58:20.121782012 +0200 +++ /work/SRC/openSUSE:Factory/.openSUSE-release-tools.new/openSUSE-release-tools.changes 2018-05-02 12:19:45.193266848 +0200 @@ -1,0 +2,21 @@ +Mon Apr 30 20:34:37 UTC 2018 - opensuse-releaseteam(a)opensuse.org + +- Update to version 20180430.eb1d0be: + * ReviewBot: runner: reload checker and reset memoize session caches. + * osclib/memoize: provide memoize_session_reset(). + +------------------------------------------------------------------- +Fri Apr 27 16:22:23 UTC 2018 - opensuse-releaseteam(a)opensuse.org + +- Update to version 20180427.1730947: + * systemd/osrt-repo-checker-project_only@.timer: increase frequency to hourly. + * repo_checker: project_only: store build hash and skip when unchanged. + +------------------------------------------------------------------- +Fri Apr 27 16:16:04 UTC 2018 - opensuse-releaseteam(a)opensuse.org + +- Update to version 20180427.adbbde2: + * repo_checker: invoke whitelist_clean() as part of project_only. + * repo_checker: whitelist_clean: provide interactive flag. + +------------------------------------------------------------------- Old: ---- openSUSE-release-tools-20180427.add0eb7.obscpio New: ---- openSUSE-release-tools-20180430.eb1d0be.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openSUSE-release-tools.spec ++++++ --- /var/tmp/diff_new_pack.79ovC5/_old 2018-05-02 12:19:46.049235617 +0200 +++ /var/tmp/diff_new_pack.79ovC5/_new 2018-05-02 12:19:46.053235471 +0200 @@ -20,7 +20,7 @@ %define source_dir openSUSE-release-tools %define announcer_filename factory-package-news Name: openSUSE-release-tools -Version: 20180427.add0eb7 +Version: 20180430.eb1d0be Release: 0 Summary: Tools to aid in staging and release work for openSUSE/SUSE License: GPL-2.0-or-later AND MIT ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.79ovC5/_old 2018-05-02 12:19:46.089234158 +0200 +++ /var/tmp/diff_new_pack.79ovC5/_new 2018-05-02 12:19:46.089234158 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/openSUSE/openSUSE-release-tools.git</param> - <param name="changesrevision">add0eb7927dde22dc83b06ae66b3027fbbe83228</param> + <param name="changesrevision">b20c01669e0fe5d1bc199858dfeefcf71e4d7b2f</param> </service> </servicedata> ++++++ openSUSE-release-tools-20180427.add0eb7.obscpio -> openSUSE-release-tools-20180430.eb1d0be.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20180427.add0eb7/ReviewBot.py new/openSUSE-release-tools-20180430.eb1d0be/ReviewBot.py --- old/openSUSE-release-tools-20180427.add0eb7/ReviewBot.py 2018-04-27 17:55:47.000000000 +0200 +++ new/openSUSE-release-tools-20180430.eb1d0be/ReviewBot.py 2018-04-30 22:28:09.000000000 +0200 @@ -30,6 +30,7 @@ from osclib.conf import Config from osclib.core import group_members from osclib.memoize import memoize +from osclib.memoize import memoize_session_reset from osclib.stagingapi import StagingAPI import signal import datetime @@ -719,7 +720,17 @@ else: self.logger.info("sleeping %d minutes." % interval) time.sleep(interval * 60) + + # Reset all memoize session caches which are designed for single + # tool run and not extended usage. + memoize_session_reset() + + # Reload checker to flush instance variables and thus any config + # or caches they may contain. + self.postoptparse() + continue + break if __name__ == "__main__": diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20180427.add0eb7/osclib/memoize.py new/openSUSE-release-tools-20180430.eb1d0be/osclib/memoize.py --- old/openSUSE-release-tools-20180427.add0eb7/osclib/memoize.py 2018-04-27 17:55:47.000000000 +0200 +++ new/openSUSE-release-tools-20180430.eb1d0be/osclib/memoize.py 2018-04-30 22:28:09.000000000 +0200 @@ -100,6 +100,7 @@ SLOTS = 4096 # Number of slots in the cache file NCLEAN = 1024 # Number of slots to remove when limit reached TIMEOUT = 60*60*2 # Time to live for every cache slot (seconds) + memoize.session_functions = [] def _memoize(fn): # Implement a POSIX lock / unlock extension for shelves. Inspired @@ -123,6 +124,7 @@ else: if not hasattr(fn, '_memoize_session_cache'): fn._memoize_session_cache = {} + memoize.session_functions.append(fn) cache = fn._memoize_session_cache return cache @@ -197,3 +199,8 @@ ttl = ttl if ttl else TIMEOUT return _memoize + +def memoize_session_reset(): + """Reset all session caches.""" + for i, _ in enumerate(memoize.session_functions): + memoize.session_functions[i]._memoize_session_cache = {} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20180427.add0eb7/repo_checker.py new/openSUSE-release-tools-20180430.eb1d0be/repo_checker.py --- old/openSUSE-release-tools-20180427.add0eb7/repo_checker.py 2018-04-27 17:55:47.000000000 +0200 +++ new/openSUSE-release-tools-20180430.eb1d0be/repo_checker.py 2018-04-30 22:28:09.000000000 +0200 @@ -59,7 +59,16 @@ self.logger.info('{}/standard not published'.format(project)) return - comment = [] + build = ET.fromstringlist(show_results_meta( + self.apiurl, project, multibuild=True, repository=['standard'])).get('state') + dashboard_content = api.dashboard_content_load('repo_checker') + if not self.force and dashboard_content: + build_previous = dashboard_content.splitlines()[0] + if build == build_previous: + self.logger.info('{} build unchanged'.format(project)) + return + + comment = [build] for arch in self.target_archs(project): directory_project = self.mirror(project, arch) @@ -75,6 +84,7 @@ text = '\n'.join(comment).strip() if not self.dryrun: api.dashboard_content_ensure('repo_checker', text, 'project_only run') + self.whitelist_clean(project) else: print(text) @@ -520,7 +530,7 @@ self.review_messages['accepted'] = 'delete request is safe' return True - def whitelist_clean(self, project): + def whitelist_clean(self, project, interactive=False): from copy import copy from difflib import unified_diff from osclib.core import BINARY_REGEX @@ -579,9 +589,15 @@ # Present diff and prompt to apply. print(''.join(unified_diff(config, config_new, fromfile='config.orig', tofile='config.new'))) print('Apply config changes? [y/n] (y): ', end='') - response = raw_input().lower() - if response == '' or response == 'y': - api.dashboard_content_save('config', ''.join(config_new), 'repo_checker whitelist clean') + if interactive: + response = raw_input().lower() + if response != '' and response != 'y': + print('quit') + return + else: + print('y') + + api.dashboard_content_save('config', ''.join(config_new), 'repo_checker whitelist clean') def whitelist_clean_set(self, config, key, value): # Unfortunately even OscConfigParser does not preserve empty lines. @@ -625,7 +641,7 @@ def do_whitelist_clean(self, subcmd, opts, project): self.checker.check_requests() # Needed to properly init ReviewBot. - self.checker.whitelist_clean(project) + self.checker.whitelist_clean(project, interactive=True) if __name__ == "__main__": app = CommandLineInterface() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20180427.add0eb7/systemd/osrt-repo-checker-project_only@.timer new/openSUSE-release-tools-20180430.eb1d0be/systemd/osrt-repo-checker-project_only@.timer --- old/openSUSE-release-tools-20180427.add0eb7/systemd/osrt-repo-checker-project_only@.timer 2018-04-27 17:55:47.000000000 +0200 +++ new/openSUSE-release-tools-20180430.eb1d0be/systemd/osrt-repo-checker-project_only@.timer 2018-04-30 22:28:09.000000000 +0200 @@ -2,7 +2,7 @@ Description=openSUSE Release Tools: repo-checker project_only for %i [Timer] -OnCalendar=daily +OnCalendar=hourly Unit=osrt-repo-checker-project_only(a)%i.service [Install] ++++++ openSUSE-release-tools.obsinfo ++++++ --- /var/tmp/diff_new_pack.79ovC5/_old 2018-05-02 12:19:46.929203511 +0200 +++ /var/tmp/diff_new_pack.79ovC5/_new 2018-05-02 12:19:46.929203511 +0200 @@ -1,5 +1,5 @@ name: openSUSE-release-tools -version: 20180427.add0eb7 -mtime: 1524844547 -commit: add0eb7927dde22dc83b06ae66b3027fbbe83228 +version: 20180430.eb1d0be +mtime: 1525120089 +commit: eb1d0be0cd0fc7da80fb917f23e39d081983f946

1 0

commit papirus-icon-theme for openSUSE:Factory
by root＠hilbert.suse.de 02 May '18

02 May '18

Hello community, here is the log from the commit of package papirus-icon-theme for openSUSE:Factory checked in at 2018-05-02 12:19:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/papirus-icon-theme (Old) and /work/SRC/openSUSE:Factory/.papirus-icon-theme.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "papirus-icon-theme" Wed May 2 12:19:18 2018 rev:6 rq:602848 version:20180501 Changes: -------- --- /work/SRC/openSUSE:Factory/papirus-icon-theme/papirus-icon-theme.changes 2018-04-04 11:09:18.075596899 +0200 +++ /work/SRC/openSUSE:Factory/.papirus-icon-theme.new/papirus-icon-theme.changes 2018-05-02 12:19:38.393514943 +0200 @@ -1,0 +2,8 @@ +Tue May 1 17:54:49 UTC 2018 - matthias.eliasson(a)gmail.com + +- Update to 20180501 + * Added icons + * Updated icons + * full changelog: https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/releases/tag/2… + +------------------------------------------------------------------- Old: ---- papirus-icon-theme-20180401.tar.gz New: ---- papirus-icon-theme-20180501.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ papirus-icon-theme.spec ++++++ --- /var/tmp/diff_new_pack.xN1FVZ/_old 2018-05-02 12:19:40.129451606 +0200 +++ /var/tmp/diff_new_pack.xN1FVZ/_new 2018-05-02 12:19:40.133451460 +0200 @@ -17,7 +17,7 @@ Name: papirus-icon-theme -Version: 20180401 +Version: 20180501 Release: 0 Summary: Papirus icon theme for Linux License: GPL-3.0-only ++++++ papirus-icon-theme-20180401.tar.gz -> papirus-icon-theme-20180501.tar.gz ++++++ /work/SRC/openSUSE:Factory/papirus-icon-theme/papirus-icon-theme-20180401.tar.gz /work/SRC/openSUSE:Factory/.papirus-icon-theme.new/papirus-icon-theme-20180501.tar.gz differ: char 22, line 1

1 0

commit python-testinfra for openSUSE:Factory
by root＠hilbert.suse.de 02 May '18

02 May '18

Hello community, here is the log from the commit of package python-testinfra for openSUSE:Factory checked in at 2018-05-02 12:19:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-testinfra (Old) and /work/SRC/openSUSE:Factory/.python-testinfra.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-testinfra" Wed May 2 12:19:06 2018 rev:2 rq:602843 version:1.12.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-testinfra/python-testinfra.changes 2017-08-30 16:24:00.546687800 +0200 +++ /work/SRC/openSUSE:Factory/.python-testinfra.new/python-testinfra.changes 2018-05-02 12:19:16.914298629 +0200 @@ -1,0 +2,39 @@ +Tue May 1 18:11:56 UTC 2018 - sean.marlow(a)suse.com + +- Update to v1.12.0 + + ansible: fix compatibility with ansible 2.5 + + pip: fix compatibility with pip 10 +- Update to v1.11.1 + + Socket: fix error with old versions of ss without the + --no-header option +- Update to v1.11.0 + + Fix bad error reporting when using ansible module without + ansible backend + + Socket: add a new implementation using ss instead of netstat + + Add service, process, and systeminfo support for Alpine +- Update to v1.10.1 + + Fix get_variables() for ansible>=2.0,<2.4 + + Paramiko: Use the RequireTTY setting if specified in a + provided SSHConfig +- Update to v1.10.0 + + New iptables module +- Update to v1.9.1 + + Fix running testinfra within a suite using doctest (#268) + + Service: add is_valid method for systemd + + Fix file.linked_to() for Mac OS +- Update to v1.9.0 + + Interface: allow to find 'ip' command ousite of PATH + + Fix --nagios option with python 3 +- Update to v1.8.0 + + Deprecate testinfra command (will be dropped in 2.0), use + py.test instead. + + Handle --nagios option when using py.test command +- Update to v1.7.1 + + Support for ansible 2.4 +- Update to v1.7.0 + + Salt: allow specifiy config directory + + Add a WinRM backend + + Socket: ipv6 sockets can handle ipv4 clients + + Service: Enhance upstart detection + +------------------------------------------------------------------- Old: ---- testinfra-1.6.5.tar.gz New: ---- testinfra-1.12.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-testinfra.spec ++++++ --- /var/tmp/diff_new_pack.rDtFYG/_old 2018-05-02 12:19:19.002222450 +0200 +++ /var/tmp/diff_new_pack.rDtFYG/_new 2018-05-02 12:19:19.006222304 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-testinfra # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-testinfra -Version: 1.6.5 +Version: 1.12.0 Release: 0 Summary: Test infrastructures License: Apache-2.0 ++++++ testinfra-1.6.5.tar.gz -> testinfra-1.12.0.tar.gz ++++++ ++++ 3260 lines of diff (skipped)

1 0

commit mypaint for openSUSE:Factory
by root＠hilbert.suse.de 02 May '18

02 May '18

Hello community, here is the log from the commit of package mypaint for openSUSE:Factory checked in at 2018-05-02 12:18:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mypaint (Old) and /work/SRC/openSUSE:Factory/.mypaint.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mypaint" Wed May 2 12:18:55 2018 rev:5 rq:602831 version:1.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/mypaint/mypaint.changes 2018-04-30 22:58:53.492564333 +0200 +++ /work/SRC/openSUSE:Factory/.mypaint.new/mypaint.changes 2018-05-02 12:19:06.210689159 +0200 @@ -1,0 +2,8 @@ +Mon Apr 30 16:16:57 UTC 2018 - jengelh(a)inai.de + +- Limit fdupes to one partition, /usr. +- Remove unnecessary ldconfig calls; there are no shared libraries + in the standard search paths. +- Use find -delete instead of the slower xargs. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mypaint.spec ++++++ --- /var/tmp/diff_new_pack.UZnp2j/_old 2018-05-02 12:19:07.802631075 +0200 +++ /var/tmp/diff_new_pack.UZnp2j/_new 2018-05-02 12:19:07.806630929 +0200 @@ -110,22 +110,20 @@ %find_lang %{name} # Updated libmypaint already provides its own lang files -find %{buildroot} -name "libmypaint.mo" -print | xargs rm -f +find %{buildroot} -name "libmypaint.mo" -print -delete # Fix env-based hashbang sed -E -i "s:/usr/bin/env python*.*:/usr/bin/python3:" %{buildroot}%{_bindir}/mypaint -%fdupes %{buildroot} +%fdupes %{buildroot}/%{_prefix} %post -/sbin/ldconfig %if 0%{?suse_version} < 1500 %desktop_database_post %icon_theme_cache_post %endif %postun -/sbin/ldconfig %if 0%{?suse_version} < 1500 %desktop_database_postun %icon_theme_cache_postun

1 0

commit q4wine for openSUSE:Factory
by root＠hilbert.suse.de 02 May '18

02 May '18

Hello community, here is the log from the commit of package q4wine for openSUSE:Factory checked in at 2018-05-02 12:18:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/q4wine (Old) and /work/SRC/openSUSE:Factory/.q4wine.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "q4wine" Wed May 2 12:18:46 2018 rev:32 rq:602601 version:1.3.7 Changes: -------- --- /work/SRC/openSUSE:Factory/q4wine/q4wine.changes 2017-12-04 12:16:22.464594144 +0100 +++ /work/SRC/openSUSE:Factory/.q4wine.new/q4wine.changes 2018-05-02 12:19:03.010805909 +0200 @@ -1,0 +2,15 @@ +Mon Apr 30 16:05:32 UTC 2018 - jengelh(a)inai.de + +- Update grammar of description. + +------------------------------------------------------------------- +Fri Apr 27 21:53:50 UTC 2018 - lazy.kent(a)opensuse.org + +- Update to 1.3.7. + * Updated: + + Wine stock icons to be organized through Q4WineWine. + + Add gnome-terminal into terminal detection logic. + * Added: + + French translation. + +------------------------------------------------------------------- @@ -4,9 +19,19 @@ -- Update to version 1.3.6: - * Bind Plus and Minus keys for Config tab for +\- zoom respectively; Allow to change Config and Program Icon sizes independently [BUG-112]; - * Bind Plus and Minus keys for Program tab for +\- zoom respectively [BUT-112]; - * Update AUTHORS and authors.h; - * Add app version to help url; - * Update contact information. - * Get rid of dead 'jabber.com.ua' entities; - * Update ChangeLog; - * Documented: q4wine prevents user from running winecfg from KRunner even after uninstalling [BUG-98]; +- Update to version 1.3.6. + * Updated: + + Added indication of applications which was installed through + winetricks. + + Default Wine Desktop Integartion path settings for new prefixes. + + Added option to run custom scripts with fake drive settings + after creation of fake drive. + + Qt5 build enabled by default. + + Taiwan, Russian translation, Ukrainian translation, Spanish, + Czech translations. + + Bind Plus and Minus keys for Program tab for +- zoom respectively. + + Bind Plus and Minus keys for Config tab for +- zoom respectively. + + Allow to change Config and Program Icon sizes independently. + * Documented: + + q4wine prevents user from running winecfg from KRunner even + after uninstalling. + * Fixed: + + Static code analysis: errors and warnings. + + Error: wrong or broken XML data. Try again later. Old: ---- _service _servicedata q4wine-1.3.6.tar.xz New: ---- q4wine-1.3.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ q4wine.spec ++++++ --- /var/tmp/diff_new_pack.F61nFt/_old 2018-05-02 12:19:04.990733670 +0200 +++ /var/tmp/diff_new_pack.F61nFt/_new 2018-05-02 12:19:04.990733670 +0200 @@ -1,7 +1,7 @@ # # spec file for package q4wine # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,13 +17,13 @@ Name: q4wine -Version: 1.3.6 +Version: 1.3.7 Release: 0 -Summary: Qt4 GUI for WINE -License: GPL-3.0 +Summary: Qt GUI for WINE +License: GPL-3.0-only Group: System/Emulators/PC -Url: http://q4wine.brezblock.org.ua/ -Source0: %{name}-%{version}.tar.xz +URL: http://q4wine.brezblock.org.ua/ +Source0: https://github.com/brezerk/q4wine/archive/v%{version}.tar.gz#/%{name}-%{ver… BuildRequires: cmake >= 2.8.0 BuildRequires: fdupes BuildRequires: fuseiso @@ -31,33 +31,34 @@ BuildRequires: icoutils BuildRequires: pkgconfig BuildRequires: update-desktop-files +BuildRequires: cmake(Qt5LinguistTools) BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5DBus) -BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5Network) BuildRequires: pkgconfig(Qt5Sql) +BuildRequires: pkgconfig(Qt5Svg) +BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5Xml) -BuildRequires: cmake(Qt5LinguistTools) Requires: fuseiso Requires: icoutils Requires: sudo Requires: wine Recommends: %{name}-lang -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -Q4Wine is an Qt4-based GUI for WINE. It will help you to manage wine +Q4Wine is a Qt-based GUI for WINE. It can help manage Wine prefixes and installed applications. General features: -- Can export Qt color theme into wine colors settings. -- Can easy work with different wine versions at the same time. -- Easy creating, deleting and managing prefixes (WINEPREFIX). -- Easy controlling for wine process. -- Autostart icons support. -- Easy cd-image use. -- You can extract icons from PE files (.exe .dll). -- Easy backup and restore for managed prefixes. +- Can export Qt color theme into Wine color settings. +- Can work with different Wine versions at the same time. +- Creation, deletion and management of prefixes (WINEPREFIX). +- Control for Wine process. +- Autostart icon support. +- CD image use. +- Icons can be extracted from PE files (.exe, .dll). +- Backup and restore for managed prefixes. - Wine AppDB browser. - Logging subsystem. - Winetricks support. @@ -86,6 +87,7 @@ rm -fr %{buildroot}%{_datadir}/icons/ubuntu-mono-dark/ %find_lang %{name} --with-qt +%if 0%{?suse_version} && 0%{?suse_version} < 1330 %post %desktop_database_post %icon_theme_cache_post @@ -93,11 +95,14 @@ %postun %desktop_database_postun %icon_theme_cache_postun +%endif %files -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING README -%{_bindir}/%{name}* +%license COPYING +%doc AUTHORS ChangeLog README +%{_bindir}/%{name} +%{_bindir}/%{name}-cli +%{_bindir}/%{name}-helper %{_datadir}/%{name}/ %exclude %{_datadir}/%{name}/l10n/ %{_datadir}/applications/%{name}.desktop @@ -106,7 +111,6 @@ %{_mandir}/man?/* %files lang -f %{name}.lang -%defattr(-,root,root,-) %dir %{_datadir}/%{name}/l10n/ %changelog

1 0

commit kalarm for openSUSE:Factory
by root＠hilbert.suse.de 02 May '18

02 May '18

Hello community, here is the log from the commit of package kalarm for openSUSE:Factory checked in at 2018-05-02 12:18:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kalarm (Old) and /work/SRC/openSUSE:Factory/.kalarm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kalarm" Wed May 2 12:18:41 2018 rev:17 rq:598996 version:18.04.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kalarm/kalarm.changes 2018-03-22 11:59:51.672981179 +0100 +++ /work/SRC/openSUSE:Factory/.kalarm.new/kalarm.changes 2018-05-02 12:18:50.259271158 +0200 @@ -1,0 +2,23 @@ +Wed Apr 18 07:48:44 CEST 2018 - lbeltrame(a)kde.org + +- Update to 18.04.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.04.0.php +- Changes since 18.03.90: + * None + +------------------------------------------------------------------- +Fri Apr 06 07:08:53 CEST 2018 - lbeltrame(a)kde.org + +- Update to 18.03.90 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.03.90.php +- Changes since 17.12.3: + * Remove KDE4Support, standardise kauth naming + * Update RTC wake to KF5 + * kholiday was moved to kf5 + * Use override keyword + +------------------------------------------------------------------- Old: ---- kalarm-17.12.3.tar.xz New: ---- kalarm-18.04.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kalarm.spec ++++++ --- /var/tmp/diff_new_pack.qvAHMX/_old 2018-05-02 12:18:51.927210302 +0200 +++ /var/tmp/diff_new_pack.qvAHMX/_new 2018-05-02 12:18:51.931210156 +0200 @@ -19,7 +19,7 @@ %bcond_without lang Name: kalarm -Version: 17.12.3 +Version: 18.04.0 Release: 0 %define kf5_version 5.26.0 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) @@ -116,7 +116,7 @@ %doc COPYING COPYING.LIB COPYING.DOC README %config %{_kf5_configdir}/kalarm.categories %config %{_kf5_configdir}/kalarm.renamecategories -%config %{_sysconfdir}/dbus-1/system.d/org.kde.kalarmrtcwake.conf +%config %{_sysconfdir}/dbus-1/system.d/org.kde.kalarm.rtcwake.conf %dir %{_kf5_appstreamdir} %dir %{_libdir}/libexec/kauth/ %{_kf5_applicationsdir}/org.kde.kalarm.desktop @@ -129,10 +129,10 @@ %{_kf5_iconsdir}/hicolor/*/apps/kalarm.png %{_kf5_libdir}/libexec/kauth/kalarm_helper %{_kf5_kxmlguidir}/kalarm/ -%{_kf5_sharedir}/dbus-1/system-services/org.kde.kalarmrtcwake.service +%{_kf5_sharedir}/dbus-1/system-services/org.kde.kalarm.rtcwake.service %{_kf5_sharedir}/kalarm/ %{_kf5_sharedir}/kconf_update/ -%{_kf5_sharedir}/polkit-1/actions/org.kde.kalarmrtcwake.policy +%{_kf5_sharedir}/polkit-1/actions/org.kde.kalarm.rtcwake.policy %if %{with lang} %files lang -f %{name}.lang ++++++ kalarm-17.12.3.tar.xz -> kalarm-18.04.0.tar.xz ++++++ ++++ 14470 lines of diff (skipped)

1 0