packages: ortp/ortp.spec, ortp/ortp-Werror.patch (REMOVED) - updated to 0.1...

[qboosh]

Author: qboosh                       Date: Tue Jan  3 17:58:35 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 0.18.0
- removed obsolete Werror patch
- build with srtp and zrtp support by default

---- Files affected:
packages/ortp:
   ortp.spec (1.24 -> 1.25) , ortp-Werror.patch (1.2 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/ortp/ortp.spec
diff -u packages/ortp/ortp.spec:1.24 packages/ortp/ortp.spec:1.25
--- packages/ortp/ortp.spec:1.24	Tue Jul 26 13:12:16 2011
+++ packages/ortp/ortp.spec	Tue Jan  3 18:58:30 2012
@@ -1,40 +1,49 @@
 # $Revision$, $Date$
+#
+# Conditional build:
+%bcond_without	zrtp	# ZRTP (RFC 6189: Media Path Key Agreement for Unicast Secure RTP) support; GPL v3
+#
 Summary:	RTP/RTCP protocol library
 Summary(pl.UTF-8):	Biblioteka obsługująca protokół RTP/RTCP
 Name:		ortp
-Version:	0.16.5
+Version:	0.18.0
 Release:	1
+%if %{with zrtp}
+License:	GPL v3+
+%else
 License:	LGPL v2.1+
+%endif
 Group:		Libraries
 Source0:	http://download.savannah.nongnu.org/releases/linphone/ortp/sources/%{name}-%{version}.tar.gz
-# Source0-md5:	94546901d14b85f97342f4ecf39489b1
+# Source0-md5:	098e984f9325d9e2648bfd9863eed501
 Patch0:		%{name}-i486.patch
-Patch1:		%{name}-Werror.patch
-Patch2:		%{name}-libssl-not-required.patch
-URL:		http://www.linphone.org/index.php/eng/code_review/ortp
+Patch1:		%{name}-libssl-not-required.patch
+URL:		http://www.linphone.org/eng/documentation/dev/ortp.html
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
 BuildRequires:	doxygen
-BuildRequires:	libtool
+BuildRequires:	libtool >= 2:2.0
+%{?with_zrtp:BuildRequires:	libzrtpcpp-devel >= 2.0.0}
 BuildRequires:	openssl-devel
+BuildRequires:	srtp-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		specflags	-fno-strict-aliasing
 
 %description
-ortp is a library for handling RTP/RTCP packets. (See RFC 1889 and
-1890 for more information about the protocol)
+ortp is a library for handling RTP protocol (RFC 3550).
 
 %description -l pl.UTF-8
-ortp to biblioteka obsługująca pakiety RTP/RTCP. Więcej informacji o
-protokole znajduje się w RFC 1889 i 1890.
+ortp to biblioteka obsługująca protokół RTP (RFC 3550).
 
 %package devel
 Summary:	Header files to develop applications using ortp
 Summary(pl.UTF-8):	Pliki nagłówkowe do tworzenia aplikacji używających ortp
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+%{?with_zrtp:Requires:	libzrtpcpp-devel >= 2.0.0}
 Requires:	openssl-devel
+Requires:	srtp-devel
 
 %description devel
 Header files for the ortp library.
@@ -58,21 +67,25 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
+%{__autoheader}
 %{__automake}
 %configure \
+	--disable-silent-rules \
+	--disable-strict \
+	--enable-ipv6 \
 %if "%{_lib}" == "lib64"
 	--enable-mode64bit=yes \
 %else
 	--enable-mode64bit=no \
 %endif
-	--enable-ipv6 \
-	--disable-strict
+	--enable-static \
+	%{?with_zrtp:--enable-zrtp}
+
 %{__make}
 
 %install
@@ -81,6 +94,8 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/ortp
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -89,12 +104,13 @@
 
 %files
 %defattr(644,root,root,755)
-%doc README NEWS AUTHORS ChangeLog doc/html
+%doc AUTHORS ChangeLog NEWS README TODO
 %attr(755,root,root) %{_libdir}/libortp.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libortp.so.8
 
 %files devel
 %defattr(644,root,root,755)
+%doc doc/html/*
 %attr(755,root,root) %{_libdir}/libortp.so
 %{_libdir}/libortp.la
 %{_includedir}/ortp
@@ -110,6 +126,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.25  2012/01/03 17:58:30  qboosh
+- updated to 0.18.0
+- removed obsolete Werror patch
+- build with srtp and zrtp support by default
+
 Revision 1.24  2011/07/26 11:12:16  arekm
 - up to 0.16.5; disable Werror
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ortp/ortp.spec?r1=1.24&r2=1.25&f=u