Merge branch 'rawhide' into epel8

.gitignore

@@ -1,3 +1,3 @@
-/youtube-dl-20*.tar.gz
+/youtube-dl-*.tar.gz
-/youtube-dl-20*.tar.gz.sig
+/youtube-dl-*.tar.gz.sig
 /youtube-dl-gpgkeys.gpg

sources

@@ -1,3 +1 @@
-SHA512 (youtube-dl-2021.12.17.tar.gz) = bfc8280703b08f66e1108e9ebd9ab4689f064ac7cef03bd3d1fd2bc64928570e4376e389c9bc188eafdbcd74444cfc8aeccc83ee362ad4f478910efef3573ddb
+SHA512 (youtube-dl-86e3cf5e5849aefcc540c19bb5fa5ab7f470d1c1.tar.gz) = b9dcd76f3a1b7f52a60022a837dc4f4cbb9e777d7b56ad2b2efa5ce773bddfb6a3b4e23509a16d72f4a9e99a62f0e50bf23f9989f458d9eaf1ac49c9d890b54b
-SHA512 (youtube-dl-2021.12.17.tar.gz.sig) = 4d26b6ae868426843a7aea1c9bf1454eb6c360f3f49c005a0db29f49859e19a4974ca901919b8056cd45b7e263be75c1ca62a8c5ab83fa143d4bd5af707c2547
-SHA512 (youtube-dl-gpgkeys.gpg) = fa4a760cd88709390cb4a5545efd9f8b7c94f821928f4f1348957357d71bd8aa3829d1db2a876263cab5a7f0a0f4b7aa71fdc86f1ead26a058f6d7a750132218

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
+Version:        2023.08.04.git%(c=%{commit}; echo ${c:0:7})
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        A small command-line program to download online videos
 License:        Unlicense
-URL:            https://yt-dl.org
+URL:	        %{forgeurl}
-Source0:        https://yt-dl.org/downloads/%{version}/youtube-dl-%{version}.tar.gz
+Source:         %{forgesource}
-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
 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:  pandoc
-BuildRequires:  gnupg2
+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}
+%forgesetup
-%setup -qn %{name}
-
-# remove pre-built file
-rm youtube-dl
 
 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,6 +81,28 @@ install -Dpm644 youtube-dl.fish %{buildroot}%{_datadir}/fish/vendor_functions.d/
 %{_datadir}/fish/vendor_functions.d/youtube-dl.fish
 
 %changelog
+* Tue Aug 15 2023 David Bold <davidsch@fedoraproject.org> - 2023.08.04.git286e3cf-1.20230815git286e3cf
+- Update to latest git snapshot
+
+* Tue Aug 01 2023 David Bold <davidsch@fedoraproject.org> - 2023.07.30.git2efc8de-1.20230801git2efc8de
+- Update to latest git snapshot
+- Ajust for building from snapshot
+
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2021.12.17-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Tue Jun 13 2023 Python Maint <python-maint@redhat.com> - 2021.12.17-6
+- Rebuilt for Python 3.12
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2021.12.17-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2021.12.17-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 2021.12.17-3
+- Rebuilt for Python 3.11
+
 * Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2021.12.17-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild