From 71fbfb49ccf485346328828f53355eb3680184ca Mon Sep 17 00:00:00 2001
From: sadlerm4 <sad_lerm@hotmail.com>
Date: Sun, 19 Jan 2025 17:51:42 +0800
Subject: [PATCH] fix(yt-dlp): follow upstream versioning + rename package to
 -git (#3042) (#3069)

(cherry picked from commit 740e79f8b46ec5307ad839289bddd17f0e1ff06c)
---
 anda/tools/yt-dlp/anda.hcl                    |  3 +--
 anda/tools/yt-dlp/update.rhai                 | 10 +++-----
 .../{yt-dlp-nightly.spec => yt-dlp-git.spec}  | 23 +++++++++++--------
 3 files changed, 17 insertions(+), 19 deletions(-)
 rename anda/tools/yt-dlp/{yt-dlp-nightly.spec => yt-dlp-git.spec} (87%)

diff --git a/anda/tools/yt-dlp/anda.hcl b/anda/tools/yt-dlp/anda.hcl
index 8cba7d3c07..a318622eba 100644
--- a/anda/tools/yt-dlp/anda.hcl
+++ b/anda/tools/yt-dlp/anda.hcl
@@ -1,9 +1,8 @@
 project pkg {
 	rpm {
-		spec = "yt-dlp-nightly.spec"
+		spec = "yt-dlp-git.spec"
 	}
 	labels {
-		nightly = "1"
 		mock = 1
 	}
 }
diff --git a/anda/tools/yt-dlp/update.rhai b/anda/tools/yt-dlp/update.rhai
index 8bfba97bcf..0fc668a1ea 100644
--- a/anda/tools/yt-dlp/update.rhai
+++ b/anda/tools/yt-dlp/update.rhai
@@ -1,8 +1,4 @@
-if filters.contains("nightly") {
-	rpm.global("commit", gh_commit("yt-dlp/yt-dlp"));
-	if rpm.changed() {
-		rpm.global("ver", gh("yt-dlp/yt-dlp"));
-		rpm.global("commit_date", date());
-		rpm.release();
-	}
+rpm.version(gh("yt-dlp/yt-dlp-master-builds"));
+if rpm.changed() {
+    rpm.release();
 }
diff --git a/anda/tools/yt-dlp/yt-dlp-nightly.spec b/anda/tools/yt-dlp/yt-dlp-git.spec
similarity index 87%
rename from anda/tools/yt-dlp/yt-dlp-nightly.spec
rename to anda/tools/yt-dlp/yt-dlp-git.spec
index d6da548109..7eb12da530 100644
--- a/anda/tools/yt-dlp/yt-dlp-nightly.spec
+++ b/anda/tools/yt-dlp/yt-dlp-git.spec
@@ -1,18 +1,12 @@
 #bcond_without tests
-%global commit 0b6b7742c2e7f2a1fcb0b54ef3dd484bab404b3f
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20241226
-%global ver 2024.12.23
 
-Name:           yt-dlp-nightly
-Version:        %commit_date.git~%shortcommit
-Provides:       yt-dlp-nightly = %ver^%version
+Name:           yt-dlp-git
+Version:        2025.01.16.024033
 Release:        1%?dist
 Summary:        A command-line program to download videos from online video platforms
 
 License:        Unlicense
 URL:            https://github.com/yt-dlp/yt-dlp
-Source:         %url/archive/%commit.tar.gz
 # License of the specfile
 Source:         https://src.fedoraproject.org/rpms/yt-dlp/raw/rawhide/f/yt-dlp.spec.license
 
@@ -31,6 +25,8 @@ BuildRequires:  %{py3_dist pytest}
 BuildRequires:  pandoc
 BuildRequires:  make
 
+BuildRequires:  anda-srpm-macros
+
 # ffmpeg-free is now available in Fedora.
 Recommends:     /usr/bin/ffmpeg
 Recommends:     /usr/bin/ffprobe
@@ -39,12 +35,16 @@ Conflicts:      yt-dlp
 
 Suggests:       python3dist(keyring)
 
+Provides:       yt-dlp-nightly = 1:0-1%?dist
+
+Obsoletes:      yt-dlp-nightly < 0:20241226.git~0b6b774-2%?dist
+
 %global _description %{expand:
 yt-dlp is a command-line program to download videos from many different online
 video platforms, such as youtube.com. The project is a fork of youtube-dl with
 additional features and fixes.}
 
-%description %{_description}
+%description %{_description}. This package is built from the yt-dlp master branch.
 
 %package bash-completion
 Summary:        Bash completion for yt-dlp
@@ -83,13 +83,16 @@ Conflicts:      yt-dlp-fish-completion
 Fish command line completion support for %{name}.
 
 %prep
-%autosetup -n yt-dlp-%commit
+%git_clone %{url} master
 
 # Remove unnecessary shebangs
 find -type f ! -executable -name '*.py' -print -exec sed -i -e '1{\@^#!.*@d}' '{}' +
 # Relax version constraints
 sed -i 's@"\(requests\|urllib3\|websockets\)>=.*"@"\1"@' pyproject.toml
 
+# Update version number
+%{python3} devscripts/update-version.py %{version} -c master -r yt-dlp/yt-dlp-master-builds
+
 %generate_buildrequires
 %pyproject_buildrequires -r