diff --git a/libsrtp-automake.patch b/libsrtp-automake.patch index 52c750d..ef90e2f 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 ++++- @@ -136,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 bff196d..090868f 100644 --- a/libsrtp.changes +++ b/libsrtp.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +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 + +- 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..f7df3dc 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,15 +25,18 @@ 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 -BuildRequires: automake >= 1.11 +BuildRequires: automake BuildRequires: dos2unix BuildRequires: libtool BuildRequires: pkg-config +BuildRequires: xz Provides: srtp = %{version}-%{release} Obsoletes: srtp < %{version} @@ -130,13 +133,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