[packages/rtmpdump] - updated to 2.6 (untagged, so mark also as snapshot; new soname)

[qboosh]

commit 7749f797003b1698466d8012e9b765075eb0ae1a
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun May 26 18:18:16 2024 +0200

    - updated to 2.6 (untagged, so mark also as snapshot; new soname)

 rtmpdump-libtool.patch | 12 ++++++------
 rtmpdump.spec          | 22 +++++++++++++---------
 2 files changed, 19 insertions(+), 15 deletions(-)
---
diff --git a/rtmpdump.spec b/rtmpdump.spec
index a181e9a..7af9deb 100644
--- a/rtmpdump.spec
+++ b/rtmpdump.spec
@@ -5,16 +5,18 @@
 Summary:	A utility for getting files from RTMP servers
 Summary(pl.UTF-8):	Narzędzie do pobierania plików z sewerów RTMP
 Name:		rtmpdump
-Version:	2.4
-%define	gitref	c5f04a58fc2aeea6296ca7c44ee4734c18401aa3
-%define	snap	20190331
-%define	rel	2
+Version:	2.6
+%define	gitref	6f6bb1353fc84f4cc37138baa99f586750028a01
+%define	snap	20240302
+%define	rel	1
 Release:	1.%{snap}.%{rel}
 License:	GPL v2
 Group:		Applications/Networking
 #Source0:	http://rtmpdump.mplayerhq.hu/download/%{name}-%{version}.tgz
-Source0:	https://git.ffmpeg.org/gitweb/rtmpdump.git/snapshot/%{gitref}.tar.gz?fakename=/%{name}-%{snap}.tar.gz
-# Source0-md5:	64fc96a898c038d75bbaf13325b0fda2
+#Source0:	https://git.ffmpeg.org/gitweb/rtmpdump.git/snapshot/%{gitref}.tar.gz#/%{name}-%{smap}.tar.gz
+# snapshots no longer allowed, use just git archive
+Source0:	%{name}-%{snap}.tar.gz
+# Source0-md5:	58095263a0dff40d8dcc374d8a15d6d7
 Patch0:		%{name}-libtool.patch
 URL:		http://rtmpdump.mplayerhq.hu/
 %if %{with gnutls}
@@ -84,7 +86,7 @@ Static version of RTMP library.
 Statyczna wersja biblioteki RTMP.
 
 %prep
-%setup -q -n %{name}-c5f04a5
+%setup -q -n %{name}-%{snap}
 %patch0 -p1
 
 %build
@@ -104,6 +106,9 @@ rm -rf $RPM_BUILD_ROOT
 	mandir=%{_mandir} \
 	prefix=%{_prefix}
 
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/librtmp.la
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -123,12 +128,11 @@ rm -rf $RPM_BUILD_ROOT
 %files -n librtmp
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/librtmp.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/librtmp.so.0
+%attr(755,root,root) %ghost %{_libdir}/librtmp.so.1
 
 %files -n librtmp-devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/librtmp.so
-%{_libdir}/librtmp.la
 %{_includedir}/librtmp
 %{_pkgconfigdir}/librtmp.pc
 %{_mandir}/man3/librtmp.3*
diff --git a/rtmpdump-libtool.patch b/rtmpdump-libtool.patch
index 9123047..5299072 100644
--- a/rtmpdump-libtool.patch
+++ b/rtmpdump-libtool.patch
@@ -60,9 +60,8 @@ diff -urNp -x '*.orig' rtmpdump-c5f04a5.org/Makefile rtmpdump-c5f04a5/Makefile
  
  rtmpgw.o: rtmpgw.c $(INCRTMP) Makefile
  rtmpdump.o: rtmpdump.c $(INCRTMP) Makefile
-diff -urNp -x '*.orig' rtmpdump-c5f04a5.org/librtmp/Makefile rtmpdump-c5f04a5/librtmp/Makefile
---- rtmpdump-c5f04a5.org/librtmp/Makefile	2019-03-30 22:33:00.000000000 +0100
-+++ rtmpdump-c5f04a5/librtmp/Makefile	2022-02-27 01:58:10.811841072 +0100
+--- rtmpdump-20240302/librtmp/Makefile.orig	2024-03-01 16:57:47.000000000 +0100
++++ rtmpdump-20240302/librtmp/Makefile	2024-05-26 18:12:08.755987192 +0200
 @@ -11,9 +11,11 @@ INCDIR=$(DESTDIR)$(incdir)
  LIBDIR=$(DESTDIR)$(libdir)
  MANDIR=$(DESTDIR)$(mandir)
@@ -92,7 +91,7 @@ diff -urNp -x '*.orig' rtmpdump-c5f04a5.org/librtmp/Makefile rtmpdump-c5f04a5/li
 -librtmp.a: $(OBJS)
 -	$(AR) rs $@ $?
 +librtmp.la: $(OBJS)
-+	$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -rpath $(libdir) -o $@ $^ $> $(CRYPTO_LIB)
++	$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -rpath $(libdir) -o $@ $^ $> $(CRYPTO_LIB) -version-info $(SO_VERSION):0:0
  
 -librtmp$(SO_EXT): $(OBJS)
 -	$(CC) $(SO_LDFLAGS) $(LDFLAGS) -o $@ $^ $> $(CRYPTO_LIB)
@@ -114,7 +113,7 @@ diff -urNp -x '*.orig' rtmpdump-c5f04a5.org/librtmp/Makefile rtmpdump-c5f04a5/li
  
  librtmp.pc: librtmp.pc.in Makefile
  	sed -e "s;@prefix@;$(prefix);" -e "s;@libdir@;$(libdir);" \
-@@ -105,17 +106,10 @@ librtmp.pc: librtmp.pc.in Makefile
+@@ -105,18 +106,10 @@ librtmp.pc: librtmp.pc.in Makefile
  		-e "s;@PUBLIC_LIBS@;$(PUBLIC_LIBS);" \
  		-e "s;@PRIVATE_LIBS@;$(PRIVATE_LIBS);" librtmp.pc.in > $@
  
@@ -122,7 +121,7 @@ diff -urNp -x '*.orig' rtmpdump-c5f04a5.org/librtmp/Makefile rtmpdump-c5f04a5/li
 -
 -install_base:	librtmp.a librtmp.pc
 +install:	librtmp.la librtmp.pc
- 	-mkdir -p $(INCDIR) $(LIBDIR)/pkgconfig $(MANDIR)/man3 $(SODIR)
+ 	-mkdir -p $(INCDIR) $(LIBDIR)/pkgconfig $(MANDIR)/man3
  	cp amf.h http.h log.h rtmp.h $(INCDIR)
 -	cp librtmp.a $(LIBDIR)
 +	$(LIBTOOL) --tag=CC --mode=install $(INSTALL) librtmp.la $(LIBDIR)
@@ -130,6 +129,7 @@ diff -urNp -x '*.orig' rtmpdump-c5f04a5.org/librtmp/Makefile rtmpdump-c5f04a5/li
  	cp librtmp.3 $(MANDIR)/man3
  
 -install_so:	librtmp$(SO_EXT)
+-	-mkdir -p $(SODIR)
 -	cp librtmp$(SO_EXT) $(SODIR)
 -	$(INSTALL_IMPLIB)
 -	cd $(SODIR); ln -sf librtmp$(SO_EXT) librtmp.$(SOX)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rtmpdump.git/commitdiff/7749f797003b1698466d8012e9b765075eb0ae1a