From 26e168f66307c767e79878e98b65f962836fabd8ecc36d7658256ff94173ec92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Wed, 27 Aug 2014 04:34:21 +0000 Subject: [PATCH 1/2] Accepting request 246582 from home:jengelh:branches:network:telephony - Update project metadata, and patch description OBS-URL: https://build.opensuse.org/request/show/246582 OBS-URL: https://build.opensuse.org/package/show/network:telephony/libsrtp?expand=0&rev=3 --- libsrtp-automake.patch | 8 ++++++++ libsrtp.changes | 5 +++++ libsrtp.spec | 12 +++++++----- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/libsrtp-automake.patch b/libsrtp-automake.patch index 52c750d..2dd987d 100644 --- a/libsrtp-automake.patch +++ b/libsrtp-automake.patch @@ -5,6 +5,14 @@ Switch to stress-free automake with libtool library generation. Also add a pkgconfig file for easy detection of presence and paths by secondary projects. +As libsrtp 1.4.5 has not yet officially been released (as a tarball, +on sf.net) and the API is still changing, using -release +${PACKAGE_VERSION} won't be of help. We really need to count ABI +versions ourselves. So far, + + libsrtp.so.1: srtp 1.4.4 + libsrtp.so.2: srtp 1.4.5-pre (7db9eb2c67ec8da7c016b7422885) + --- Makefile.am | 99 +++++++++++++++++++++++++++++++++++++++++++++ configure.in | 13 ++++- diff --git a/libsrtp.changes b/libsrtp.changes index bff196d..e52fc05 100644 --- a/libsrtp.changes +++ b/libsrtp.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Aug 26 21:16:21 UTC 2014 - jengelh@inai.de + +- Update project metadata, and patch description + ------------------------------------------------------------------- Wed Sep 18 18:46:49 CEST 2013 - sbrabec@suse.cz diff --git a/libsrtp.spec b/libsrtp.spec index 62b2c8b..868dabc 100644 --- a/libsrtp.spec +++ b/libsrtp.spec @@ -1,7 +1,7 @@ # # spec file for package libsrtp # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,8 +25,10 @@ Summary: Secure Real-Time Transport Protocol (SRTP) library License: BSD-3-Clause Group: Development/Libraries/C and C++ Url: http://srtp.sourceforge.net/srtp.html + +#Git-Clone: git://github.com/cisco/libsrtp Source: %{name}-git%{git_snapshot}.tar.xz -# PATCH-FEATURE-OPENSUSE libsrtp-automake.patch jengelh@medozas.de -- Support for automake to easily build shared library. +# PATCH-FEATURE-OPENSUSE libsrtp-automake.patch jengelh@inai.de -- Support for automake to easily build shared library. Patch: %{name}-automake.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf @@ -130,13 +132,13 @@ set -x %postun -n %{library_name} -p /sbin/ldconfig %files -n %{library_name} -%defattr(-,root,root,-) +%defattr(-,root,root) %{_libdir}/libsrtp.so.2* %files devel -%defattr(-,root,root,-) +%defattr(-,root,root) %doc CHANGES LICENSE README TODO VERSION doc/*.pdf doc/*.txt -%{_includedir}/srtp +%{_includedir}/srtp/ %{_libdir}/libsrtp.so %{_libdir}/pkgconfig/libsrtp.pc From fddd431c986807a9284731bd10ba4978ea398f1d3573bd7a472a6e29376a9d30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Thu, 28 Aug 2014 09:31:29 +0000 Subject: [PATCH 2/2] Accepting request 246695 from home:jengelh:branches:network:telephony - Relax build restrictions for SLE11 OBS-URL: https://build.opensuse.org/request/show/246695 OBS-URL: https://build.opensuse.org/package/show/network:telephony/libsrtp?expand=0&rev=4 --- libsrtp-automake.patch | 2 +- libsrtp.changes | 7 +++++++ libsrtp.spec | 3 ++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/libsrtp-automake.patch b/libsrtp-automake.patch index 2dd987d..ef90e2f 100644 --- a/libsrtp-automake.patch +++ b/libsrtp-automake.patch @@ -144,7 +144,7 @@ Index: libsrtp/configure.in dnl Checks for programs. -AC_PROG_RANLIB -+AM_INIT_AUTOMAKE([-Wall foreign subdir-objects no-dist-gzip dist-xz tar-pax]) ++AM_INIT_AUTOMAKE([-Wall foreign subdir-objects tar-pax]) AC_PROG_CC +AM_PROG_CC_C_O AC_PROG_INSTALL diff --git a/libsrtp.changes b/libsrtp.changes index e52fc05..090868f 100644 --- a/libsrtp.changes +++ b/libsrtp.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Aug 28 06:03:05 UTC 2014 - jengelh@inai.de + +- Relax build restrictions for SLE11 (needs BuildRequires xz to + even start, and we can drop dist-xz from the suggestive patch + so that automake ~1.10) + ------------------------------------------------------------------- Tue Aug 26 21:16:21 UTC 2014 - jengelh@inai.de diff --git a/libsrtp.spec b/libsrtp.spec index 868dabc..f7df3dc 100644 --- a/libsrtp.spec +++ b/libsrtp.spec @@ -32,10 +32,11 @@ Source: %{name}-git%{git_snapshot}.tar.xz Patch: %{name}-automake.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf -BuildRequires: automake >= 1.11 +BuildRequires: automake BuildRequires: dos2unix BuildRequires: libtool BuildRequires: pkg-config +BuildRequires: xz Provides: srtp = %{version}-%{release} Obsoletes: srtp < %{version}