From dd12556344a44629f1522894a296b3fc3f9a6e5d25ac30c33d554acac1986b1d Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Wed, 12 Jun 2013 11:13:48 +0000 Subject: [PATCH] Accepting request 177839 from home:jengelh:branches:network:telephony - Update to new upstream release 2.3.2 * Upstream has not provided a NEWS/changelog entry - Do signature verification - Remove redundant %clean section; more robust make install call - Remove libzrtpcpp-libdir.patch (no longer required) OBS-URL: https://build.opensuse.org/request/show/177839 OBS-URL: https://build.opensuse.org/package/show/network:telephony/libzrtpcpp?expand=0&rev=23 --- libzrtpcpp-2.0.0.tar.bz2 | 3 -- libzrtpcpp-2.3.2.tar.gz | 3 ++ libzrtpcpp-2.3.2.tar.gz.sig | Bin 0 -> 543 bytes libzrtpcpp-libdir.patch | 16 ----------- libzrtpcpp.changes | 9 ++++++ libzrtpcpp.keyring | 55 ++++++++++++++++++++++++++++++++++++ libzrtpcpp.spec | 35 +++++++++++------------ 7 files changed, 83 insertions(+), 38 deletions(-) delete mode 100644 libzrtpcpp-2.0.0.tar.bz2 create mode 100644 libzrtpcpp-2.3.2.tar.gz create mode 100644 libzrtpcpp-2.3.2.tar.gz.sig delete mode 100644 libzrtpcpp-libdir.patch create mode 100644 libzrtpcpp.keyring diff --git a/libzrtpcpp-2.0.0.tar.bz2 b/libzrtpcpp-2.0.0.tar.bz2 deleted file mode 100644 index 5ffb5e4..0000000 --- a/libzrtpcpp-2.0.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:87d1372207eda4f583fa9623d54d62a5d8d777fa00584d5f9d20e5e23be092d1 -size 162336 diff --git a/libzrtpcpp-2.3.2.tar.gz b/libzrtpcpp-2.3.2.tar.gz new file mode 100644 index 0000000..422b062 --- /dev/null +++ b/libzrtpcpp-2.3.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a008f749b83653b06a24e889f23569abce8caf6fe4d324a9fbf43e933bd7dec1 +size 256951 diff --git a/libzrtpcpp-2.3.2.tar.gz.sig b/libzrtpcpp-2.3.2.tar.gz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..0f99a8ef8e866c5f85869cdc3fbdedb0628bf246c99a01d57a04fe63745de782 GIT binary patch literal 543 zcmV+)0^t3L0vrSY0SEvF1p-j3%8&pG2@tV!Dx9-?hq_!P5B@!qr)dK$9Fgy00zrK7 zL-TSp^w8?JoA1}gzqQP%R6xkH_Ed0>km4WB>361Dh`FBwhY5P^$KVu|dZu@lA5!8` z7;{9#pDho@c}D}n6%2r)VFw0W^3$HbL=ioqsr8Rqdv`jTCGCS)gbRhn;;D`)O|d*7 z>xd;)G=??xr>>`I2a69mbS<`-Fk5G6LIB*Za?gC)J1FnbcZqy#r2iuu??w0dPO*C) zjcv{>9*c9tw(%SmdNUx|gksJ@#N^gD=uR)pJ7)!1YL!NQSmRoU@$BzLS7lNFDqu(x z|BUFK66LTN-6>XIhgnglGbjzAh!bgI20mcnYkyV|wJm>ZvvGTq-5S3n7Y@chFA#tL z-()=rQ{m_5f!Aa)6K(b0b?h4lV}4F11`Pl1r~08c9~+Jp4oqsjp4H~tpfd-xDaMF+ zSgrt_H%MyeXgQnQ2~Ni(sq2)m*GE6n2-0sl$cUS8)&wTrh{oolm_e!F}Zm(5RbIH4OP4_0^k4u literal 0 HcmV?d00001 diff --git a/libzrtpcpp-libdir.patch b/libzrtpcpp-libdir.patch deleted file mode 100644 index 373ba76..0000000 --- a/libzrtpcpp-libdir.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- libzrtpcpp-2.0.0/CMakeLists.txt.orig 2012-04-05 15:26:17.231590000 +0200 -+++ libzrtpcpp-2.0.0/CMakeLists.txt 2012-04-05 15:26:37.471769000 +0200 -@@ -50,12 +50,7 @@ - args_help() - - # this caused problems in debian where it has to always be lib.... --set(LIBDIRNAME "lib") --if (NOT EXISTS /etc/debian_version) -- if ( "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64" ) -- set(LIBDIRNAME "lib64") -- endif() --endif() -+set(LIBDIRNAME "lib${LIB_SUFFIX}") - - # setup the Thread include and lib - find_package(Threads) diff --git a/libzrtpcpp.changes b/libzrtpcpp.changes index 3d26799..e097a12 100644 --- a/libzrtpcpp.changes +++ b/libzrtpcpp.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Jun 5 22:43:00 UTC 2013 - jengelh@inai.de + +- Update to new upstream release 2.3.2 +* Upstream has not provided a NEWS/changelog entry +- Do signature verification +- Remove redundant %clean section; more robust make install call +- Remove libzrtpcpp-libdir.patch (no longer required) + ------------------------------------------------------------------- Sat Mar 23 22:07:11 UTC 2013 - schwab@suse.de diff --git a/libzrtpcpp.keyring b/libzrtpcpp.keyring new file mode 100644 index 0000000..8ab9520 --- /dev/null +++ b/libzrtpcpp.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/libzrtpcpp.spec b/libzrtpcpp.spec index a138456..b53dbd2 100644 --- a/libzrtpcpp.spec +++ b/libzrtpcpp.spec @@ -18,19 +18,22 @@ Name: libzrtpcpp %define lname libzrtpcpp2 -Version: 2.0.0 +Version: 2.3.2 Release: 0 Summary: A ccrtp extension for ZRTP support License: GPL-3.0+ Group: Development/Libraries/Other -Url: http://www.gnu.org/software/commoncpp/commoncpp.html -Source0: libzrtpcpp-%{version}.tar.bz2 +Url: http://www.gnutelephony.org/index.php/GNU_ZRTP + +#Freecode-URL: http://freecode.com/projects/libzrtpcpp +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 BuildRequires: ccrtp-devel >= 2.0.0 BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: libopenssl-devel >= 0.9.8 BuildRequires: pkgconfig -Patch0: libzrtpcpp-libdir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -60,8 +63,8 @@ This package provides the header files, link libraries, and documentation for building applications that use libzrtpcpp. %prep +%{?gpg_verify: %gpg_verify %{S:2}} %setup -q -%patch0 -p1 %build mkdir build @@ -82,26 +85,20 @@ make %{?_smp_mflags} V=1 %install cd build -rm -rf %{buildroot} -%make_install +make install DESTDIR="%buildroot" -%clean -rm -rf %{buildroot} +%post -p /sbin/ldconfig -n %lname +%postun -p /sbin/ldconfig -n %lname %files -n %lname %defattr(-,root,root,0755) -%doc AUTHORS COPYING README -%{_libdir}/*.so.* +%doc AUTHORS COPYING README.md +%{_libdir}/libzrtpcpp.so.2* %files devel %defattr(-,root,root,0755) -%{_libdir}/*.so -%{_libdir}/pkgconfig/*.pc -%{_includedir}/libzrtpcpp/*.h -%dir %{_includedir}/libzrtpcpp - -%post -p /sbin/ldconfig -n %lname - -%postun -p /sbin/ldconfig -n %lname +%{_libdir}/libzrtpcpp.so +%{_libdir}/pkgconfig/libzrtpcpp.pc +%{_includedir}/libzrtpcpp/ %changelog