From 0941b1bf1e392cfbcc7cc1ba5bbf0769e9993dfca22e7658f721ba2e6d5b4090 Mon Sep 17 00:00:00 2001 From: Dinar Valeev Date: Fri, 7 Jun 2013 10:56:31 +0000 Subject: [PATCH] Accepting request 177838 from home:jengelh:branches:network:telephony - Update to new upstream release 2.0.6 * Fixes to the build procedure - Remove ccrtp-ppc64.patch (no longer applies) OBS-URL: https://build.opensuse.org/request/show/177838 OBS-URL: https://build.opensuse.org/package/show/network:telephony/ccrtp?expand=0&rev=12 --- 0001-build-properly-use-autotools.patch | 122 ++++++++++++++++++++++++ ccrtp-2.0.1.tar.bz2 | 3 - ccrtp-2.0.6.tar.gz | 3 + ccrtp-2.0.6.tar.gz.sig | Bin 0 -> 543 bytes ccrtp-ppc64.patch | 13 --- ccrtp.changes | 7 ++ ccrtp.keyring | 55 +++++++++++ ccrtp.spec | 51 +++++----- 8 files changed, 213 insertions(+), 41 deletions(-) create mode 100644 0001-build-properly-use-autotools.patch delete mode 100644 ccrtp-2.0.1.tar.bz2 create mode 100644 ccrtp-2.0.6.tar.gz create mode 100644 ccrtp-2.0.6.tar.gz.sig delete mode 100644 ccrtp-ppc64.patch create mode 100644 ccrtp.keyring diff --git a/0001-build-properly-use-autotools.patch b/0001-build-properly-use-autotools.patch new file mode 100644 index 0000000..f004d2b --- /dev/null +++ b/0001-build-properly-use-autotools.patch @@ -0,0 +1,122 @@ +From e060ed1f4ce7d54d092dee5dc02a90361e78392c Mon Sep 17 00:00:00 2001 +From: Jan Engelhardt +Date: Thu, 6 Jun 2013 00:23:09 +0200 +X-Upstream-Status: submitted, waiting for merge +Subject: [PATCH] build: properly use autotools + +--- + Makefile.am | 1 - + configure.ac | 5 +++-- + demo/Makefile.am | 18 +++++++++--------- + src/Makefile.am | 5 +++-- + 4 files changed, 15 insertions(+), 14 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index eec516b..046d815 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -9,7 +9,6 @@ + # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the + # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +-AUTOMAKE_OPTIONS = no-dependencies dist-shar dist-zip + ACLOCAL_AMFLAGS = -I m4 + EXTRA_DIST = autogen.sh ccrtp.spec ccrtp.spec.in COPYING.addendum \ + ccrtp.list ccrtp.list.in libccrtp.pc libccrtp.pc.in autoconf/* \ +diff --git a/configure.ac b/configure.ac +index b5d8a10..5108a20 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -9,7 +9,8 @@ + # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the + # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +-AC_INIT(src/ccrtp/rtp.h) ++AC_INIT([ccrtp], [2.0.3]) ++AC_CONFIG_SRCDIR([src/ccrtp/rtp.h]) + + cfg_options="" + if test -z "$*" ; then +@@ -42,7 +43,7 @@ AC_PROG_CXXCPP + AC_PROG_CXX + # OST_PROG_CC_POSIX + AM_PROG_LIBTOOL +-AM_INIT_AUTOMAKE(ccrtp,[$VERSION]) ++AM_INIT_AUTOMAKE([no-dependencies dist-shar dist-zip]) + AM_CONFIG_HEADER(ccrtp-config.h) + + AC_C_RESTRICT +diff --git a/demo/Makefile.am b/demo/Makefile.am +index 5e6e3a0..5a11837 100644 +--- a/demo/Makefile.am ++++ b/demo/Makefile.am +@@ -19,35 +19,35 @@ ccxxincludedir=$(includedir)/cc++ + if SRTP_GCRYPT + srtp_src = ccsrtptest + ccsrtptest_SOURCES = ccsrtptest.cpp +-ccsrtptest_LDFLAGS = ../src/libccrtp.la @GNULIBS@ ++ccsrtptest_LDADD = ../src/libccrtp.la @GNULIBS@ + endif + + if SRTP_OPENSSL + srtp_src = ccsrtptest + ccsrtptest_SOURCES = ccsrtptest.cpp +-ccsrtptest_LDFLAGS = ../src/libccrtp.la @GNULIBS@ ++ccsrtptest_LDADD = ../src/libccrtp.la @GNULIBS@ + endif + + noinst_PROGRAMS = rtpsend rtplisten rtphello rtpduphello audiorx audiotx \ + ccrtptest $(srtp_src) + + rtpsend_SOURCES = rtpsend.cpp +-rtpsend_LDFLAGS = ../src/libccrtp.la @GNULIBS@ ++rtpsend_LDADD = ../src/libccrtp.la @GNULIBS@ + + rtplisten_SOURCES = rtplisten.cpp +-rtplisten_LDFLAGS = ../src/libccrtp.la @GNULIBS@ ++rtplisten_LDADD = ../src/libccrtp.la @GNULIBS@ + + rtphello_SOURCES = rtphello.cpp +-rtphello_LDFLAGS = ../src/libccrtp.la @GNULIBS@ ++rtphello_LDADD = ../src/libccrtp.la @GNULIBS@ + + rtpduphello_SOURCES = rtpduphello.cpp +-rtpduphello_LDFLAGS = ../src/libccrtp.la @GNULIBS@ ++rtpduphello_LDADD = ../src/libccrtp.la @GNULIBS@ + + audiorx_SOURCES = audiorx.cpp audio.h +-audiorx_LDFLAGS = ../src/libccrtp.la @GNULIBS@ ++audiorx_LDADD = ../src/libccrtp.la @GNULIBS@ + + audiotx_SOURCES = audiotx.cpp +-audiotx_LDFLAGS = ../src/libccrtp.la @GNULIBS@ ++audiotx_LDADD = ../src/libccrtp.la @GNULIBS@ + + ccrtptest_SOURCES = ccrtptest.cpp +-ccrtptest_LDFLAGS = ../src/libccrtp.la @GNULIBS@ ++ccrtptest_LDADD = ../src/libccrtp.la @GNULIBS@ +diff --git a/src/Makefile.am b/src/Makefile.am +index 58cf4c1..1683a2d 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -16,7 +16,7 @@ AM_CXXFLAGS= @WARN_FLAGS@ -I$(top_srcdir)/src/ccrtp + AM_CPPFLAGS= @WARN_FLAGS@ -I$(top_srcdir)/src/ccrtp + + # RELEASE = $(LT_VERSION) -release $(LT_RELEASE) +-RELEASE = --version-info $(LT_VERSION) ++RELEASE = -version-info $(LT_VERSION) + + lib_LTLIBRARIES = libccrtp.la + +@@ -43,6 +43,7 @@ libccrtp_la_SOURCES = rtppkt.cpp rtcppkt.cpp source.cpp data.cpp incqueue.cpp \ + outqueue.cpp queue.cpp control.cpp members.cpp socket.cpp duplex.cpp pool.cpp \ + CryptoContext.cpp CryptoContextCtrl.cpp $(srtp_src_g) $(srtp_src_o) $(skein_srcs) + +-libccrtp_la_LDFLAGS = $(RELEASE) @GNULIBS@ ++libccrtp_la_LDFLAGS = $(RELEASE) ++libccrtp_la_LIBADD = @GNULIBS@ + + noinst_HEADERS = private.h +-- +1.8.2 + diff --git a/ccrtp-2.0.1.tar.bz2 b/ccrtp-2.0.1.tar.bz2 deleted file mode 100644 index 7150e10..0000000 --- a/ccrtp-2.0.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f9af643a9faf8eb88ec8f0f66868049c3201b7b4bfddb2a58eb112f34c68dc93 -size 974916 diff --git a/ccrtp-2.0.6.tar.gz b/ccrtp-2.0.6.tar.gz new file mode 100644 index 0000000..56d1561 --- /dev/null +++ b/ccrtp-2.0.6.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:39fe4cd98635f710800b1d3f4090cae7110cbfee97ad42c77233eac2c5e4381b +size 735455 diff --git a/ccrtp-2.0.6.tar.gz.sig b/ccrtp-2.0.6.tar.gz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..3c6f0b429481e2555b3c22aa5e48e9f5e920c1a50f359f332f2edfa3ad686eb7 GIT binary patch literal 543 zcmV+)0^t3L0vrSY0SEvF1p-m5p#}g72@tV!Dx9-?hq|U-5CFHv!)4lc+Wf`Q>dW8^ zN&|<^i-?-MTEc*qV)aqV-@{b*Hv|$s7n!)RIp#_+QendX=k1@BljSnN6{}$Dg()NL zNptsJY&`Vy3;wjccLV)~EW)&?%xlOGQF%)e0NZH4WO@C_?n!hV;L_UCNI+6LW7!q_ ziUO{CwG%K&Jynk#ORJ#FnLej-U-Sjui8>sY1L5utEZ&;vdef%(FpiQ@&r_ugE05@5 zKQsgQnCV1m)A^fII|jfHiSzYScXvt;rMXpIBgdoH3|6)}XT=48&Bcu+(?)$317leJ zBhr?K|81LHfLZ4?#c9Hb*~uOVeC3lH%@@nu*Y5?+z%~s9WWC4z;Uzf88RD_);#*t^ zYk!*rY&b15W4$$1fBdwvwIX`HS5741!DZecYX6#Vg~k3OP1fKQ(H0X&y`oq8l@uC549FaX$!^kA)&I}OQn6>n0fq7@HD$Ppg@OA<$wd*ny;jm$sd0wy_TU3tOnicQ?+@K ho01DWWg-b3hYlI!m`%>T{M(@b{U;>x3ak>P3#HIs5t9G_ literal 0 HcmV?d00001 diff --git a/ccrtp-ppc64.patch b/ccrtp-ppc64.patch deleted file mode 100644 index bced0ad..0000000 --- a/ccrtp-ppc64.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: ccrtp-2.0.1/CMakeLists.txt -=================================================================== ---- ccrtp-2.0.1.orig/CMakeLists.txt -+++ ccrtp-2.0.1/CMakeLists.txt -@@ -32,7 +32,7 @@ set (PACKAGE ccrtp) - # this caused problems in debian where it has to always be lib.... - set(LIB64 "") - if (NOT EXISTS /etc/debian_version) -- if ( "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64" ) -+ if ( "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64" OR "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "ppc64" OR "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "aarch64") - set(LIB64 "64") - endif() - endif() diff --git a/ccrtp.changes b/ccrtp.changes index df0bded..5c08395 100644 --- a/ccrtp.changes +++ b/ccrtp.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Jun 5 22:17:02 UTC 2013 - jengelh@inai.de + +- Update to new upstream release 2.0.6 +* Fixes to the build procedure +- Remove ccrtp-ppc64.patch (no longer applies) + ------------------------------------------------------------------- Sat Mar 23 08:51:28 UTC 2013 - schwab@suse.de diff --git a/ccrtp.keyring b/ccrtp.keyring new file mode 100644 index 0000000..8ab9520 --- /dev/null +++ b/ccrtp.keyring @@ -0,0 +1,55 @@ +pub 4096R/B37C87BA 2012-05-22 +uid David Sugar +sub 4096R/C8F039C8 2012-05-22 + +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v2.0.19 (GNU/Linux) + +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 +=wI7T +-----END PGP PUBLIC KEY BLOCK----- diff --git a/ccrtp.spec b/ccrtp.spec index d18b25e..4f9783e 100644 --- a/ccrtp.spec +++ b/ccrtp.spec @@ -18,20 +18,30 @@ Name: ccrtp %define lname libccrtp2 -Version: 2.0.1 +Version: 2.0.6 Release: 0 Summary: A Common C++ Class Framework for RTP Packets License: SUSE-GPL-2.0+-with-openssl-exception Group: System/Libraries -Url: http://www.gnu.org/software/ccrtp/ -Source0: %{name}-%{version}.tar.bz2 -Patch1: ccrtp-ppc64.patch -BuildRequires: cmake +Url: http://gnu.org/software/ccrtp/ + +#Freecode-URL: http://freecode.com/projects/ccrtp +#Git-Clone: git://git.sv.gnu.org/ccrtp +Source: ftp://ftp.gnu.org/pub/gnu/ccrtp/%name-%version.tar.gz +Source2: ftp://ftp.gnu.org/pub/gnu/ccrtp/%name-%version.tar.gz.sig +Source3: %name.keyring +Patch1: 0001-build-properly-use-autotools.patch +BuildRequires: autoconf +BuildRequires: automake BuildRequires: gcc-c++ BuildRequires: libgcrypt-devel BuildRequires: libstdc++-devel +BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: ucommon-devel >= 5.0.0 +%if 0%{?suse_version} >= 1230 +BuildRequires: gpg-offline +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -61,31 +71,22 @@ Obsoletes: libccrtp-devel < %version %description devel This package contains files needed when developing applications using -ccrtp +ccrtp. %prep -%setup -q -n ccrtp-%{version} -%patch1 -p1 +%{?gpg_verify: %gpg_verify %{S:2}} +%setup -q +%patch -P 1 -p1 %build -mkdir build -cd build -cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ - -DSYSCONFDIR=%{_sysconfdir} \ - -DMANDIR=%{_mandir} \ - -DCMAKE_VERBOSE_MAKEFILE=TRUE \ - -DCMAKE_C_FLAGS_RELEASE:STRING="%{optflags}" \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING="%{optflags}" \ - .. - -make %{?_smp_mflags} VERBOSE=1 +# Got patches to .am +autoreconf -fi; +%configure --disable-static +make %{?_smp_mflags} V=1; %install -cd build -%make_install - -%clean -rm -rf %{buildroot}; +make install DESTDIR="%buildroot"; +rm -f "%buildroot/%_libdir"/*.la; %post -n %lname -p /sbin/ldconfig @@ -93,7 +94,7 @@ rm -rf %{buildroot}; %files -n %lname %defattr(-,root,root,0755) -%{_libdir}/libccrtp*.so.* +%{_libdir}/libccrtp*.so.2* %files devel %defattr(-,root,root,0755)