From 7ceb69a1b18427d46034f0aaca711c0dd5251e760655d4df420459449768271d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Sun, 24 Mar 2013 16:07:35 +0000 Subject: [PATCH] Accepting request 160737 from devel:ARM:AArch64:Factory - Properly determine LIB_SUFFIX OBS-URL: https://build.opensuse.org/request/show/160737 OBS-URL: https://build.opensuse.org/package/show/network:telephony/libzrtpcpp?expand=0&rev=21 --- libzrtpcpp.changes | 5 +++++ libzrtpcpp.spec | 15 +++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/libzrtpcpp.changes b/libzrtpcpp.changes index 3c069c6..3d26799 100644 --- a/libzrtpcpp.changes +++ b/libzrtpcpp.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Mar 23 22:07:11 UTC 2013 - schwab@suse.de + +- Properly determine LIB_SUFFIX + ------------------------------------------------------------------- Thu Apr 5 13:28:26 UTC 2012 - dvaleev@suse.com diff --git a/libzrtpcpp.spec b/libzrtpcpp.spec index e19af79..a138456 100644 --- a/libzrtpcpp.spec +++ b/libzrtpcpp.spec @@ -1,7 +1,7 @@ # # spec file for package libzrtpcpp # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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 @@ -16,19 +16,18 @@ # - Name: libzrtpcpp %define lname libzrtpcpp2 Version: 2.0.0 Release: 0 -License: GPL-3.0+ Summary: A ccrtp extension for ZRTP support -Url: http://www.gnu.org/software/commoncpp/commoncpp.html +License: GPL-3.0+ Group: Development/Libraries/Other +Url: http://www.gnu.org/software/commoncpp/commoncpp.html Source0: libzrtpcpp-%{version}.tar.bz2 +BuildRequires: ccrtp-devel >= 2.0.0 BuildRequires: cmake BuildRequires: gcc-c++ -BuildRequires: ccrtp-devel >= 2.0.0 BuildRequires: libopenssl-devel >= 0.9.8 BuildRequires: pkgconfig Patch0: libzrtpcpp-libdir.patch @@ -42,6 +41,7 @@ applications. %package -n %lname Summary: A ccrtp extension for ZRTP support +Group: Development/Libraries/Other %description -n %lname This library is a GPL licensed extension to the GNU RTP Stack, ccrtp, @@ -50,11 +50,10 @@ encryption, and which can be directly embedded into telephony applications. %package devel -License: GPL-3.0+ Summary: Headers and link library for libzrtpcpp Group: Development/Libraries/Other -Requires: ccrtp-devel >= 2.0.0 Requires: %{lname} = %{version} +Requires: ccrtp-devel >= 2.0.0 %description devel This package provides the header files, link libraries, and @@ -74,7 +73,7 @@ cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DCMAKE_VERBOSE_MAKEFILE=TRUE \ -DCMAKE_C_FLAGS_RELEASE:STRING="%{optflags}" \ -DCMAKE_CXX_FLAGS_RELEASE:STRING="%{optflags}" \ -%ifarch x86_64 ppc64 s390x +%if "%{_lib}" == "lib64" -DLIB_SUFFIX=64 \ %endif ..