diff --git a/.gitignore b/.gitignore index 95c2e6b..68e159e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ yle-dl-*.tar.gz -/391.patch diff --git a/.packit.yaml b/.packit.yaml deleted file mode 100644 index 5017339..0000000 --- a/.packit.yaml +++ /dev/null @@ -1,18 +0,0 @@ -# See the documentation for more information: -# https://packit.dev/docs/configuration/ - -upstream_project_url: git@github.com:aajanki/yle-dl.git -jobs: - - job: pull_from_upstream - trigger: release - dist_git_branches: - - fedora-rawhide - - job: koji_build - trigger: commit - dist_git_branches: - - fedora-rawhide - allowed_pr_authors: - - packit - - all_admins - allowed_committers: - - all_admins diff --git a/0000-Revert-New-style-license-metadata.patch b/0000-Revert-New-style-license-metadata.patch deleted file mode 100644 index 134ad12..0000000 --- a/0000-Revert-New-style-license-metadata.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 1d8f4bb2528c1b2db6e93168077c414963d1b3be Mon Sep 17 00:00:00 2001 -From: Otto Liljalaakso -Date: Mon, 17 Mar 2025 22:36:58 +0200 -Subject: [PATCH] Revert "New style license metadata" - -This reverts commit 7c53d148de1e5722271c7d9c3249746a25b29bf5 in order -retain compatibility with Flit versions older than 3.11 as present in -Fedora < 43. - -diff --git a/pyproject.toml b/pyproject.toml -index 367998b..74a8800 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -5,8 +5,7 @@ readme = "README.md" - authors = [ - {name = "Antti Ajanki", email = "antti.ajanki@iki.fi"} - ] --license = "GPL-3.0-or-later" --license-files = ["COPYING"] -+license = {text = "GPLv3+"} - dependencies = [ - "requests", - "lxml", -@@ -17,6 +16,7 @@ classifiers = [ - "Development Status :: 5 - Production/Stable", - "Environment :: Console", - "Intended Audience :: End Users/Desktop", -+ "License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)", - "Operating System :: OS Independent", - "Programming Language :: Python", - "Programming Language :: Python :: 3", -@@ -46,7 +46,7 @@ yle-dl = "yledl.yledl:main" - [project.urls] - Home = "https://aajanki.github.io/yle-dl/" - Source = "https://github.com/aajanki/yle-dl/" --changelog = "https://github.com/aajanki/yle-dl/blob/master/ChangeLog" -+changelog = "https://raw.githubusercontent.com/aajanki/yle-dl/master/ChangeLog" - issues = "https://github.com/aajanki/yle-dl/issues" - - [tool.flit.module] -@@ -73,5 +73,5 @@ quote-style = "single" - disable_error_code = "import-untyped" - - [build-system] --requires = ["flit_core >=3.11,<4"] -+requires = ["flit_core >=3.9,<4"] - build-backend = "flit_core.buildapi" --- -2.48.1 - diff --git a/README.packit b/README.packit deleted file mode 100644 index 4df53f3..0000000 --- a/README.packit +++ /dev/null @@ -1,3 +0,0 @@ -This repository is maintained by packit. -https://packit.dev/ -The file was generated using packit 0.100.1. diff --git a/sources b/sources index 029b36c..70ea302 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (yle-dl-20260624.tar.gz) = 0705fcee26b5d37a4b15c8a1b281f2f42448636713d3445280c86936e442ca766c0e383cbd4da8890ff0939de623623d137d1f05ea86e30777dfd84772034c19 +SHA512 (yle-dl-20230611.tar.gz) = 9027a00f7a3b383187ae1de3bcf2145c64b0f618680ec3fe224397ac23cbb43d0f181f64c8cd7f21b9dbbdfd5ea0045458fb6858fd6be2c4b5b04d5df2747f79 diff --git a/yle-dl.spec b/yle-dl.spec index 81ff3cc..4d4c6d3 100644 --- a/yle-dl.spec +++ b/yle-dl.spec @@ -1,21 +1,19 @@ Name: yle-dl -Version: 20260624 +Version: 20230611 Release: %autorelease Summary: Download videos from Yle servers License: GPL-3.0-or-later URL: https://aajanki.github.io/yle-dl/index-en.html -Source: https://github.com/aajanki/%{name}/archive/releases/%{version}/%{name}-%{version}.tar.gz +Source: https://github.com/aajanki/%{name}/archive/%{version}/%{name}-%{version}.tar.gz BuildArch: noarch # Depends on archful python3-xattr which excludes i686 ExcludeArch: %{ix86} BuildRequires: python3-devel -BuildRequires: /usr/bin/ffmpeg Requires: /usr/bin/ffmpeg -Recommends: yle-dl+extra -# According to README, "required for podcasts". +# According to README, needed "optionally for few rare streams". Recommends: wget %description @@ -24,18 +22,12 @@ services of the Finnish national broadcasting company Yle: Yle Areena, Elävä arkisto, and Yle news. The videos are saved in Matroska (.mkv) or MP4 format. - -# Enables storing video metadata as extended file attributes -# and automatically detecting filesystems that require restricted character sets. -%pyproject_extras_subpkg -n yle-dl extra - - %prep -%autosetup -p1 -n %{name}-releases-%{version} +%autosetup -p1 -n %{name}-%{version} %generate_buildrequires -%pyproject_buildrequires -x extra -g test +%pyproject_buildrequires -x test %build