rpms/rtmpdump/devel .cvsignore, 1.4, 1.5 rtmpdump.spec, 1.5, 1.6 sources, 1.4, 1.5

[David Woodhouse]

Author: dwmw2

Update of /cvs/free/rpms/rtmpdump/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22174

Modified Files:
	.cvsignore rtmpdump.spec sources 
Log Message:
Update to almost-2.4


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/rtmpdump/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	4 Jul 2010 20:29:51 -0000	1.4
+++ .cvsignore	29 Aug 2011 19:52:01 -0000	1.5
@@ -1 +1 @@
-rtmpdump-2.3.tgz
+rtmpdump-20110811-gc58cfb3e.tar.gz


Index: rtmpdump.spec
===================================================================
RCS file: /cvs/free/rpms/rtmpdump/devel/rtmpdump.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rtmpdump.spec	5 Jul 2010 06:21:28 -0000	1.5
+++ rtmpdump.spec	29 Aug 2011 19:52:01 -0000	1.6
@@ -1,6 +1,9 @@
+%define snapshot c58cfb3e
+%define snapshot_date 20110811
+
 Name:		rtmpdump
-Version:	2.3
-Release:	2%{?dist}
+Version:	2.4
+Release:	0.1.%{snapshot_date}git%{snapshot}%{?dist}
 Summary:	Toolkit for RTMP streams
 
 Group:		Applications/Internet
@@ -9,7 +12,7 @@
 # (for which you'd probably want to make it a dynamic library) you should
 # label its licence correctly. But the _tools_ are GPLv2.
 URL:		http://rtmpdump.mplayerhq.hu/
-Source0:	http://rtmpdump.mplayerhq.hu/download/rtmpdump-%{version}.tgz
+Source0:	http://rtmpdump.mplayerhq.hu/download/rtmpdump-%{snapshot_date}-g%{snapshot}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gnutls-devel zlib-devel
@@ -38,12 +41,11 @@
 contains include files needed to develop applications using librtmp.
 
 %prep
-%setup -q
+%setup -q -n rtmpdump-%{snapshot_date}-g%{snapshot}
 
 %build
 # 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=
-
+make CRYPTO=GNUTLS SHARED=yes OPT="$RPM_OPT_FLAGS" LIB_GNUTLS="-lgnutls -lgcrypt -ldl"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -81,6 +83,9 @@
 %doc ChangeLog
 
 %changelog
+* Mon Aug 29 2011 David Woodhouse <dwmw2 at infradead.org> 2.4-0.1.20110811gitc58cfb3e
+- Update to almost-2.4 snapshot
+
 * 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


Index: sources
===================================================================
RCS file: /cvs/free/rpms/rtmpdump/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	4 Jul 2010 20:29:51 -0000	1.4
+++ sources	29 Aug 2011 19:52:01 -0000	1.5
@@ -1 +1 @@
-eb961f31cd55f0acf5aad1a7b900ef59  rtmpdump-2.3.tgz
+07ed0f980eeb51f2431dedfbb525efcc  rtmpdump-20110811-gc58cfb3e.tar.gz