rpms/rtmpdump/F-13 .cvsignore, 1.3, 1.4 rtmpdump.spec, 1.4, 1.5 sources, 1.3, 1.4

[Alex Lancaster]

Author: alexlan

Update of /cvs/free/rpms/rtmpdump/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv11670

Modified Files:
	.cvsignore rtmpdump.spec sources 
Log Message:
Sync with F-14+ branch as per https://bugzilla.rpmfusion.org/show_bug.cgi?id=1317



Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/rtmpdump/F-13/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	30 Apr 2010 10:00:56 -0000	1.3
+++ .cvsignore	10 Nov 2010 00:41:55 -0000	1.4
@@ -1 +1 @@
-rtmpdump-2.2d.tgz
+rtmpdump-2.3.tgz


Index: rtmpdump.spec
===================================================================
RCS file: /cvs/free/rpms/rtmpdump/F-13/rtmpdump.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rtmpdump.spec	30 Apr 2010 10:00:56 -0000	1.4
+++ rtmpdump.spec	10 Nov 2010 00:41:56 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		rtmpdump
-Version:	2.2d
-Release:	1%{?dist}
+Version:	2.3
+Release:	2%{?dist}
 Summary:	Toolkit for RTMP streams
 
 Group:		Applications/Internet
@@ -18,42 +18,76 @@
 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+
+Requires:	librtmp = %{version}-%{release}
+
+%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
 
+%post -n librtmp -p /sbin/ldconfig
+
+%postun -n librtmp -p /sbin/ldconfig
 
 %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 Dominik Mierzejewski <rpm at greysector.net> 2.3-2
+- call ldconfig in post(un) scripts for the shared library
+- add strict dependency on the library to -devel
+
+* Sun Jul 04 2010 David Woodhouse <dwmw2 at infradead.org> 2.3-1
+- Update to 2.3; build shared library
+
 * Fri Apr 30 2010 David Woodhouse <dwmw2 at infradead.org> 2.2d-1
 - Update to 2.2d
 


Index: sources
===================================================================
RCS file: /cvs/free/rpms/rtmpdump/F-13/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	30 Apr 2010 10:00:56 -0000	1.3
+++ sources	10 Nov 2010 00:41:56 -0000	1.4
@@ -1 +1 @@
-f12086283002c27e0fa11e33e83b7647  rtmpdump-2.2d.tgz
+eb961f31cd55f0acf5aad1a7b900ef59  rtmpdump-2.3.tgz