From d42925e07054d9d87c21376f1c3030cb60b7cdf5 Mon Sep 17 00:00:00 2001
From: tigro <tigro@msvsphere-os.ru>
Date: Mon, 30 Dec 2024 20:30:53 +0300
Subject: [PATCH] - Update to 2.6 20240301.git6f6bb13 - Added -lnettle
 -lhogweed to linker

---
 .gitignore                   |  2 +-
 .rtmpdump.metadata           |  2 +-
 SOURCES/gcc14_buildfix.patch | 11 -----------
 SPECS/rtmpdump.spec          | 15 +++++++++------
 4 files changed, 11 insertions(+), 19 deletions(-)
 delete mode 100644 SOURCES/gcc14_buildfix.patch

diff --git a/.gitignore b/.gitignore
index 15d2dad..58472d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/rtmpdump-f1b83c1.tar.gz
+SOURCES/rtmpdump-6f6bb13.tar.gz
diff --git a/.rtmpdump.metadata b/.rtmpdump.metadata
index b649f23..d13973d 100644
--- a/.rtmpdump.metadata
+++ b/.rtmpdump.metadata
@@ -1 +1 @@
-c4977e7e8b557cc303618f0fc51448d6d36dc1b1  SOURCES/rtmpdump-f1b83c1.tar.gz
+99fafae20b96082ffe7946bd653e2f5371189865  SOURCES/rtmpdump-6f6bb13.tar.gz
diff --git a/SOURCES/gcc14_buildfix.patch b/SOURCES/gcc14_buildfix.patch
deleted file mode 100644
index 3109df4..0000000
--- a/SOURCES/gcc14_buildfix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/librtmp/hashswf.c
-+++ b/librtmp/hashswf.c
-@@ -25,6 +25,7 @@
- #include <string.h>
- #include <ctype.h>
- #include <time.h>
-+#include <limits.h>
- 
- #include "rtmp_sys.h"
- #include "log.h"
-
diff --git a/SPECS/rtmpdump.spec b/SPECS/rtmpdump.spec
index e81c1c8..a320119 100644
--- a/SPECS/rtmpdump.spec
+++ b/SPECS/rtmpdump.spec
@@ -1,17 +1,16 @@
-%global commit f1b83c10d8beb43fcc70a6e88cf4325499f25857
+%global commit 6f6bb1353fc84f4cc37138baa99f586750028a01
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global gitdate 20210219
+%global gitdate 20240301
 
 Name:           rtmpdump
-Version:        2.4
-Release:        24.%{gitdate}.git%{shortcommit}%{?dist}
+Version:        2.6
+Release:        1.%{gitdate}.git%{shortcommit}%{?dist}
 Summary:        Toolkit for RTMP streams
 
 # The tools are GPLv2+. The library is LGPLv2+, see below.
 License:        GPLv2+
 URL:            https://rtmpdump.mplayerhq.hu/
 Source0:        https://git.ffmpeg.org/gitweb/rtmpdump.git/snapshot/%{commit}.tar.gz#/rtmpdump-%{shortcommit}.tar.gz
-Patch0:         gcc14_buildfix.patch
 
 BuildRequires:  gcc
 BuildRequires:  gnutls-devel
@@ -48,7 +47,7 @@ contains include files needed to develop applications using librtmp.
 
 %build
 # The fact that we have to add -ldl for gnutls is Fedora bug #611318
-make SYS=posix CRYPTO=GNUTLS SHARED=yes OPT="%{optflags}" LIB_GNUTLS="-lgnutls -lgcrypt -ldl -lz"
+make SYS=posix CRYPTO=GNUTLS SHARED=yes OPT="%{optflags}" LIB_GNUTLS="-lgnutls -lgcrypt -ldl -lz -lgmp -lnettle -lhogweed"
 
 %install
 make CRYPTO=GNUTLS SHARED=yes DESTDIR=%{buildroot} prefix=%{_prefix} mandir=%{_mandir} libdir=%{_libdir} install
@@ -78,6 +77,10 @@ rm -f %{buildroot}%{_libdir}/librtmp.a
 %{_mandir}/man3/librtmp.3*
 
 %changelog
+* Mon Dec 30 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 2.6-1.20240301.git6f6bb13
+- Update to 2.6 20240301.git6f6bb13
+- Added -lnettle -lhogweed to linker
+
 * Mon Dec 23 2024 Dmitriy Samoylik <samoylikdv@msvsphere-os.ru> - 2.4-24.20210219.gitf1b83c1
 - Rebuilt for MSVSphere 10