diff --git a/.gitignore b/.gitignore index 69fc7f3..305f587 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/youtube-dl-2021.12.17.tar.gz +SOURCES/youtube-dl-86e3cf5e5849aefcc540c19bb5fa5ab7f470d1c1.tar.gz diff --git a/.youtube-dl.metadata b/.youtube-dl.metadata index 7adb73a..e512ff9 100644 --- a/.youtube-dl.metadata +++ b/.youtube-dl.metadata @@ -1 +1 @@ -b67859a4f67d7dcb06cbb290a8c782f874124132 SOURCES/youtube-dl-2021.12.17.tar.gz +15cdc15a849bece4a27f965adcdfccfe79fad937 SOURCES/youtube-dl-86e3cf5e5849aefcc540c19bb5fa5ab7f470d1c1.tar.gz diff --git a/SOURCES/youtube-dl-2021.12.17.tar.gz.sig b/SOURCES/youtube-dl-2021.12.17.tar.gz.sig deleted file mode 100644 index 3fefe44..0000000 Binary files a/SOURCES/youtube-dl-2021.12.17.tar.gz.sig and /dev/null differ diff --git a/SOURCES/youtube-dl-gpgkeys.gpg b/SOURCES/youtube-dl-gpgkeys.gpg deleted file mode 100644 index 7b18bdd..0000000 Binary files a/SOURCES/youtube-dl-gpgkeys.gpg and /dev/null differ diff --git a/SPECS/youtube-dl.spec b/SPECS/youtube-dl.spec index 18c10fb..5fa381b 100644 --- a/SPECS/youtube-dl.spec +++ b/SPECS/youtube-dl.spec @@ -1,39 +1,33 @@ +%global forgeurl https://github.com/ytdl-org/youtube-dl/ +%global commit 86e3cf5e5849aefcc540c19bb5fa5ab7f470d1c1 +%forgemeta Name: youtube-dl -Version: 2021.12.17 -Release: 2%{?dist} +Version: 2023.08.04.git%(c=%{commit}; echo ${c:0:7}) +Release: 1%{?dist} Summary: A small command-line program to download online videos License: Unlicense -URL: https://yt-dl.org -Source0: https://yt-dl.org/downloads/%{version}/youtube-dl-%{version}.tar.gz -Source1: https://yt-dl.org/downloads/%{version}/youtube-dl-%{version}.tar.gz.sig -# 2016-06-09: -# Merged GPG keys from https://rg3.github.io/youtube-dl/download.html in one file -# gpg --export --export-options export-minimal "428D F5D6 3EF0 7494 BB45 5AC0 EBF0 1804 BCF0 5F6B" \ -# "ED7F 5BF4 6B3B BED8 1C87 368E 2C39 3E0F 18A9 236D" \ -# "7D33 D762 FD6C 3513 0481 347F DB4B 54CB A482 6A18" > youtube-dl-gpgkeys.gpg -Source2: youtube-dl-gpgkeys.gpg +URL: %{forgeurl} +Source: %{forgesource} Source3: %{name}.conf BuildRequires: python%{python3_pkgversion}-devel BuildRequires: python%{python3_pkgversion}-setuptools Requires: python%{python3_pkgversion}-setuptools # Tests failed because of no connection in Koji. -# BuildRequires: python-nose BuildArch: noarch -# For source verification with gpgv -BuildRequires: gnupg2 +BuildRequires: pandoc +BuildRequires: make # https://bugzilla.redhat.com/show_bug.cgi?id=1951630 Recommends: AtomicParsley +# https://bugzilla.redhat.com/show_bug.cgi?id=2203543 +Recommends: /usr/bin/ffmpeg + %description Small command-line program to download videos from YouTube and other sites. %prep -gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0} -%setup -qn %{name} - -# remove pre-built file -rm youtube-dl +%forgesetup cp -a setup.py setup.py.installpath # Remove files that are installed to the wrong path @@ -46,6 +40,8 @@ find youtube_dl -type f -exec sed -i -e '1{/^\#!\/usr\/bin\/env python$/d;};' {} %build %py3_build +make PYTHON=python3 + %install @@ -85,9 +81,31 @@ install -Dpm644 youtube-dl.fish %{buildroot}%{_datadir}/fish/vendor_functions.d/ %{_datadir}/fish/vendor_functions.d/youtube-dl.fish %changelog -* Mon Jul 17 2023 Arkady L. Shane - 2021.12.17-2 +* Tue Aug 15 2023 David Bold - 2023.08.04.git286e3cf-1.20230815git286e3cf +- Update to latest git snapshot + +* Tue Aug 01 2023 David Bold - 2023.07.30.git2efc8de-1.20230801git2efc8de +- Update to latest git snapshot +- Ajust for building from snapshot + +* Sat Jul 22 2023 Fedora Release Engineering - 2021.12.17-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Mon Jul 17 2023 Arkady L. Shane - 2021.12.17-6 - Rebuilt for MSVSphere 9.2 +* Tue Jun 13 2023 Python Maint - 2021.12.17-6 +- Rebuilt for Python 3.12 + +* Sat Jan 21 2023 Fedora Release Engineering - 2021.12.17-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 2021.12.17-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon Jun 13 2022 Python Maint - 2021.12.17-3 +- Rebuilt for Python 3.11 + * Sat Jan 22 2022 Fedora Release Engineering - 2021.12.17-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild