From bed5ec527ab29a7ace512fcb265ca83f265a60cc Mon Sep 17 00:00:00 2001
From: David Woodhouse <dwmw2@infradead.org>
Date: Sun, 4 Jul 2010 20:29:51 +0000
Subject: [PATCH] update to 2.3, enable shared library

---
 .gitignore    |  2 +-
 rtmpdump.spec | 62 ++++++++++++++++++++++++++++++++++++---------------
 sources       |  2 +-
 3 files changed, 46 insertions(+), 20 deletions(-)

diff --git a/.gitignore b/.gitignore
index 028f537..8540940 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-rtmpdump-2.2d.tgz
+rtmpdump-2.3.tgz
diff --git a/rtmpdump.spec b/rtmpdump.spec
index 0a75c04..b5ff596 100644
--- a/rtmpdump.spec
+++ b/rtmpdump.spec
@@ -1,5 +1,5 @@
 Name:		rtmpdump
-Version:	2.2d
+Version:	2.3
 Release:	1%{?dist}
 Summary:	Toolkit for RTMP streams
 
@@ -18,23 +18,36 @@ BuildRequires:	gnutls-devel zlib-devel
 rtmpdump is a toolkit for RTMP streams. All forms of RTMP are supported,
 including rtmp://, rtmpt://, rtmpe://, rtmpte://, and rtmps://. 
 
+%package -n librtmp
+Summary:	Support library for RTMP streams
+Group:		Applications/Internet
+License:	LGPLv2+
+
+%description -n librtmp
+librtmp is a suport library for RTMP streams. All forms of RTMP are supported,
+including rtmp://, rtmpt://, rtmpe://, rtmpte://, and rtmps://. 
+
+%package -n librtmp-devel
+Summary:	Files for librtmp development
+Group:		Applications/Internet
+License:	LGPLv2+
+
+%description -n librtmp-devel
+librtmp is a suport library for RTMP streams. The librtmp-devel package
+contains include files needed to develop applications using librtmp.
+
 %prep
 %setup -q
 
 %build
-make CRYPTO=GNUTLS OPT="$RPM_OPT_FLAGS" progs
+# The fact that we have to add -ldl for gnutls is Fedora bug #611318
+make CRYPTO=GNUTLS SHARED=yes OPT="$RPM_OPT_FLAGS" LIB_GNUTLS="-lgnutls -lgcrypt -ldl" LIBRTMP=librtmp/librtmp.so LIBS=
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
-for FILE in rtmpdump rtmpgw rtmpsrv rtmpsuck; do
-    install -m 0755 $FILE $RPM_BUILD_ROOT%{_bindir}
-done
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-install -m 0644 rtmpdump.1 $RPM_BUILD_ROOT%{_mandir}/man1
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8
-install -m 0644 rtmpgw.8 $RPM_BUILD_ROOT%{_mandir}/man8
+make CRYPTO=GNUTLS SHARED=yes DESTDIR=$RPM_BUILD_ROOT prefix=/usr mandir=%{_mandir} libdir=%{_libdir} install
+rm -f $RPM_BUILD_ROOT/%{_libdir}/librtmp.a
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -43,17 +56,30 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %{_bindir}/rtmpdump
-%{_bindir}/rtmpsrv
-%{_bindir}/rtmpgw
-%{_bindir}/rtmpsuck
-%{_mandir}/man1/rtmpdump.1.*
-%{_mandir}/man8/rtmpgw.8.*
-
-%doc COPYING ChangeLog README
-
+%{_sbindir}/rtmpsrv
+%{_sbindir}/rtmpgw
+%{_sbindir}/rtmpsuck
+%{_mandir}/man1/rtmpdump.1*
+%{_mandir}/man8/rtmpgw.8*
+%doc COPYING README
+
+%files -n librtmp
+%defattr(-,root,root,-)
+%{_libdir}/librtmp.so.0
+%doc librtmp/COPYING
 
+%files -n librtmp-devel
+%defattr(-,root,root,-)
+/usr/include/librtmp
+%{_libdir}/librtmp.so
+%{_libdir}/pkgconfig/librtmp.pc
+%{_mandir}/man3/librtmp.3*
+%doc ChangeLog
 
 %changelog
+* Sun Jul 04 2010 David Woodhouse <dwmw2@infradead.org> 2.3-1
+- Update to 2.3; build shared library
+
 * Fri Apr 30 2010 David Woodhouse <dwmw2@infradead.org> 2.2d-1
 - Update to 2.2d
 
diff --git a/sources b/sources
index dd32386..08ff5c9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f12086283002c27e0fa11e33e83b7647  rtmpdump-2.2d.tgz
+eb961f31cd55f0acf5aad1a7b900ef59  rtmpdump-2.3.tgz