rpms/rtmpdump/F-12 rtmpdump-link-gcrypt.patch, NONE, 1.1 rtmpdump.spec, 1.1, 1.2
Author: dwmw2
Update of /cvs/free/rpms/rtmpdump/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv20924
Modified Files:
rtmpdump.spec
Added Files:
rtmpdump-link-gcrypt.patch
Log Message:
fix link error
rtmpdump-link-gcrypt.patch:
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE rtmpdump-link-gcrypt.patch ---
Author: hyc
Date: Sun Apr 18 21:41:36 2010
New Revision: 435
Log:
Windows GNUTLS needs explicit -lgcrypt
Modified:
trunk/Makefile
Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile Sun Apr 18 21:32:42 2010 (r434)
+++ trunk/Makefile Sun Apr 18 21:41:36 2010 (r435)
@@ -5,7 +5,7 @@ LD=$(CROSS_COMPILE)ld
CRYPTO=OPENSSL
#CRYPTO=GNUTLS
-LIB_GNUTLS=-lgnutls
+LIB_GNUTLS=-lgnutls -lgcrypt
LIB_OPENSSL=-lssl -lcrypto
CRYPTO_LIB=$(LIB_$(CRYPTO))
DEF_=-DNO_CRYPTO
_______________________________________________
rtmpdump mailing list
rtmpdump(a)mplayerhq.hu
https://lists.mplayerhq.hu/mailman/listinfo/rtmpdump
Index: rtmpdump.spec
===================================================================
RCS file: /cvs/free/rpms/rtmpdump/F-12/rtmpdump.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rtmpdump.spec 20 Apr 2010 08:04:35 -0000 1.1
+++ rtmpdump.spec 20 Apr 2010 08:21:23 -0000 1.2
@@ -1,6 +1,6 @@
Name: rtmpdump
Version: 2.2c
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Toolkit for RTMP streams
Group: Applications/Internet
@@ -10,6 +10,7 @@
# label its licence correctly. But the _tools_ are GPLv2.
URL: http://rtmpdump.mplayerhq.hu/
Source0: http://rtmpdump.mplayerhq.hu/download/rtmpdump-%{version}.tar.gz
+Patch1: rtmpdump-link-gcrypt.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gnutls-devel zlib-devel
@@ -20,6 +21,7 @@
%prep
%setup -q
+%patch1 -p1
%build
make CRYPTO=GNUTLS OPT="$RPM_OPT_FLAGS" progs
@@ -54,5 +56,8 @@
%changelog
+* Tue Apr 20 2010 David Woodhouse <dwmw2(a)infradead.org> 2.2c-2
+- Link with libgcrypt explicitly since we call it directly
+
* Mon Apr 19 2010 David Woodhouse <dwmw2(a)infradead.org> 2.2c-1
- Initial package