packages: ccrtp/ccrtp.spec, ccrtp/ccrtp-info.patch (NEW), ccrtp/ccrtp-opens...

Tue Jan 3 17:22:36 CET 2012

Author: qboosh                       Date: Tue Jan  3 16:22:35 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 2.0.2
- removed obsolete gcc4,lt patches
- added openssl patch to fix build with openssl, use it by default (+gcrypt bcond)
- added info patch to unify direntry
- ccrtp now uses commoncpp from ucommon (5.0.0+) instead of commoncpp2

---- Files affected:
packages/ccrtp:
   ccrtp.spec (1.23 -> 1.24) , ccrtp-info.patch (NONE -> 1.1)  (NEW), ccrtp-openssl.patch (NONE -> 1.1)  (NEW), ccrtp-gcc4.patch (1.1 -> NONE)  (REMOVED), ccrtp-lt.patch (1.3 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/ccrtp/ccrtp.spec
diff -u packages/ccrtp/ccrtp.spec:1.23 packages/ccrtp/ccrtp.spec:1.24

--- packages/ccrtp/ccrtp.spec:1.23	Fri Feb 27 22:23:28 2009
+++ packages/ccrtp/ccrtp.spec	Tue Jan  3 17:22:30 2012
@@ -1,21 +1,29 @@
 # $Revision$, $Date$
-Summary:	Common C++ class framework for RTP/RTCP
-Summary(pl.UTF-8):	Szkielet klas C++ dla RTP/RTCP
+#
+# Conditional build:
+%bcond_with	gcrypt	# use libgcrypt instead of OpenSSL (ucommon in PLD uses OpenSSL by default)
+#
+Summary:	Common C++ class framework for RTP packets
+Summary(pl.UTF-8):	Szkielet klas C++ dla pakietów RTP
 Name:		ccrtp
-Version:	1.7.1
+Version:	2.0.2
 Release:	1
-License:	GPL
+License:	GPL v2+ with runtime exception
 Group:		Libraries
 Source0:	http://ftp.gnu.org/gnu/ccrtp/%{name}-%{version}.tar.gz
-# Source0-md5:	9f5d34a18f2c1c779d2e5818cc4987f8
-Patch0:		%{name}-gcc4.patch
-Patch1:		%{name}-lt.patch
+# Source0-md5:	dd676a6359e549b5a45ed3992e8a7056
+Patch0:		%{name}-info.patch
+Patch1:		%{name}-openssl.patch
 URL:		http://www.gnu.org/software/ccrtp/
-BuildRequires:	autoconf
+BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
-BuildRequires:	commoncpp2-devel >= 1.7.1
 BuildRequires:	doxygen
-BuildRequires:	libtool
+%{?with_gcrypt:BuildRequires:	libgcrypt-devel >= 1.2.3}
+BuildRequires:	libstdc++-devel
+BuildRequires:	libtool >= 2:1.5
+%{!?with_gcrypt:BuildRequires:	openssl-devel}
+BuildRequires:	pkgconfig
+BuildRequires:	ucommon-devel >= 5.0.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -43,7 +51,10 @@
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki ccrtp
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	commoncpp2-devel
+%{?with_gcrypt:Requires:	libgcrypt-devel >= 1.2.3}
+Requires:	libstdc++-devel
+%{!?with_gcrypt:Requires:	openssl-devel}
+Requires:	ucommon-devel >= 5.0.0
 
 %description devel
 Header files for ccrtp library.
@@ -74,7 +85,9 @@
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure
+# LIBGCRYPT_CONFIG is a hack to disable libgcrypt and pass to openssl detection
+%configure \
+	%{!?with_gcrypt:LIBGCRYPT_CONFIG=/bin/false}
 %{__make}
 
 %install
@@ -91,21 +104,22 @@
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS COPYING COPYING.addendum README
-%attr(755,root,root) %{_libdir}/lib*.so.*.*.*
+%doc AUTHORS COPYING.addendum ChangeLog NEWS README TODO
+%attr(755,root,root) %{_libdir}/libccrtp.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libccrtp.so.0
 
 %files devel
 %defattr(644,root,root,755)
-%doc doc/html/*.html doc/html/*.*g*
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
+%doc doc/html/*.{css,html,js,png}
+%attr(755,root,root) %{_libdir}/libccrtp.so
+%{_libdir}/libccrtp.la
 %{_includedir}/ccrtp
-%{_pkgconfigdir}/*.pc
-%{_infodir}/*.info*
+%{_pkgconfigdir}/libccrtp.pc
+%{_infodir}/ccrtp.info*
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libccrtp.a
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -113,6 +127,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.24  2012/01/03 16:22:30  qboosh
+- updated to 2.0.2
+- removed obsolete gcc4,lt patches
+- added openssl patch to fix build with openssl, use it by default (+gcrypt bcond)
+- added info patch to unify direntry
+- ccrtp now uses commoncpp from ucommon (5.0.0+) instead of commoncpp2
+
 Revision 1.23  2009/02/27 21:23:28  arekm
 - up to 1.7.1
 

================================================================
Index: packages/ccrtp/ccrtp-info.patch
diff -u /dev/null packages/ccrtp/ccrtp-info.patch:1.1
--- /dev/null	Tue Jan  3 17:22:36 2012
+++ packages/ccrtp/ccrtp-info.patch	Tue Jan  3 17:22:30 2012
@@ -0,0 +1,14 @@
+--- ccrtp-2.0.2/doc/ccrtp.texi.orig	2011-08-03 00:31:14.000000000 +0200
++++ ccrtp-2.0.2/doc/ccrtp.texi	2012-01-03 16:04:18.158947409 +0100
+@@ -12,9 +12,9 @@
+ @set VERSION 1.3
+ @set UPDATED Jan 2006
+ 
+- at dircategory Development
++ at dircategory Libraries
+ @direntry
+-* GNU ccRTP: (ccrtp).        GNU ccRTP Real-Time Transport Protocol Framework.
++* GNU ccRTP: (ccrtp).			GNU ccRTP Real-Time Transport Protocol Framework
+ @end direntry
+ 
+ 

================================================================
Index: packages/ccrtp/ccrtp-openssl.patch
diff -u /dev/null packages/ccrtp/ccrtp-openssl.patch:1.1
--- /dev/null	Tue Jan  3 17:22:36 2012
+++ packages/ccrtp/ccrtp-openssl.patch	Tue Jan  3 17:22:30 2012
@@ -0,0 +1,22 @@
+--- ccrtp-2.0.2/src/Makefile.am.orig	2011-10-30 16:03:54.000000000 +0100
++++ ccrtp-2.0.2/src/Makefile.am	2012-01-03 16:53:30.349046258 +0100
+@@ -19,7 +19,7 @@
+ if SRTP_OPENSSL
+ srtp_src_o =    ccrtp/crypto/openssl/hmac.cpp \
+         ccrtp/crypto/openssl/AesSrtp.cxx \
+-        ccrtp/crypto/openssl/InitializeOpenSSL.cxx
++        ccrtp/crypto/openssl/InitializeOpenSSL.cxx ccrtp/crypto/twofish.c
+ endif
+ 
+ if SRTP_GCRYPT
+--- ccrtp-2.0.2/configure.ac.orig	2011-11-13 23:49:08.000000000 +0100
++++ ccrtp-2.0.2/configure.ac	2012-01-03 17:07:33.392407821 +0100
+@@ -95,7 +95,7 @@
+                   ],
+                   [AC_CHECK_LIB([crypto],
+                       [EVP_CipherInit_ex],
+-                      [AC_CHECK_HEADERS([openssl/bn.h openssl/aes.h openssl/sha.h],
++                      [AC_CHECK_HEADERS([openssl/bn.h openssl/aes.h openssl/sha.h pthread.h],
+                                         [], AC_MSG_ERROR([OpenSSL headers not found.]))
+                        LIBS="-lcrypto $LIBS"
+                        openssl="true"
================================================================

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

