From 0288c670829840a27de05c8add8d8935a719f4c37868ee8a0bfc95d7efd1a25c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Thu, 5 Apr 2012 12:12:42 +0000 Subject: [PATCH 1/2] Accepting request 112696 from home:k0da:ppc - fix libdir for ppc64 OBS-URL: https://build.opensuse.org/request/show/112696 OBS-URL: https://build.opensuse.org/package/show/network:telephony/libzrtpcpp?expand=0&rev=18 --- libzrtpcpp-ppc64.patch | 11 +++++++++++ libzrtpcpp.changes | 5 +++++ libzrtpcpp.spec | 6 ++++-- 3 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 libzrtpcpp-ppc64.patch diff --git a/libzrtpcpp-ppc64.patch b/libzrtpcpp-ppc64.patch new file mode 100644 index 0000000..b0d727e --- /dev/null +++ b/libzrtpcpp-ppc64.patch @@ -0,0 +1,11 @@ +--- libzrtpcpp-2.0.0/CMakeLists.txt.orig 2012-04-05 13:55:16.254447000 +0200 ++++ libzrtpcpp-2.0.0/CMakeLists.txt 2012-04-05 13:55:42.722086000 +0200 +@@ -52,7 +52,7 @@ + # 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" ) ++ if ( "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64" OR "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "ppc64" ) + set(LIBDIRNAME "lib64") + endif() + endif() diff --git a/libzrtpcpp.changes b/libzrtpcpp.changes index d98b630..1e692d5 100644 --- a/libzrtpcpp.changes +++ b/libzrtpcpp.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Apr 5 11:59:40 UTC 2012 - dvaleev@suse.com + +- fix libdir for ppc64 + ------------------------------------------------------------------- Tue Sep 27 08:02:08 UTC 2011 - coolo@suse.com diff --git a/libzrtpcpp.spec b/libzrtpcpp.spec index 27b6895..6682e22 100644 --- a/libzrtpcpp.spec +++ b/libzrtpcpp.spec @@ -21,7 +21,7 @@ Name: libzrtpcpp %define lname libzrtpcpp2 Version: 2.0.0 Release: 0 -License: GPLv3+ +License: GPL-3.0+ Summary: A ccrtp extension for ZRTP support Url: http://www.gnu.org/software/commoncpp/commoncpp.html Group: Development/Libraries/Other @@ -31,6 +31,7 @@ BuildRequires: gcc-c++ BuildRequires: ccrtp-devel >= 2.0.0 BuildRequires: libopenssl-devel >= 0.9.8 BuildRequires: pkgconfig +Patch0: libzrtpcpp-ppc64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -49,7 +50,7 @@ encryption, and which can be directly embedded into telephony applications. %package devel -License: GPLv3+ +License: GPL-3.0+ Summary: Headers and link library for libzrtpcpp Group: Development/Libraries/Other Requires: ccrtp-devel >= 2.0.0 @@ -61,6 +62,7 @@ documentation for building applications that use libzrtpcpp. %prep %setup -q +%patch0 -p1 %build mkdir build From dd03bc4feabce2593347a7c6174ce3f70aa0eb1d3aaad952835e3efe2017bc69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Thu, 5 Apr 2012 13:44:30 +0000 Subject: [PATCH 2/2] Accepting request 112706 from home:k0da:ppc - better libdir handling OBS-URL: https://build.opensuse.org/request/show/112706 OBS-URL: https://build.opensuse.org/package/show/network:telephony/libzrtpcpp?expand=0&rev=19 --- libzrtpcpp-libdir.patch | 16 ++++++++++++++++ libzrtpcpp-ppc64.patch | 11 ----------- libzrtpcpp.changes | 5 +++++ libzrtpcpp.spec | 5 ++++- 4 files changed, 25 insertions(+), 12 deletions(-) create mode 100644 libzrtpcpp-libdir.patch delete mode 100644 libzrtpcpp-ppc64.patch diff --git a/libzrtpcpp-libdir.patch b/libzrtpcpp-libdir.patch new file mode 100644 index 0000000..373ba76 --- /dev/null +++ b/libzrtpcpp-libdir.patch @@ -0,0 +1,16 @@ +--- 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-ppc64.patch b/libzrtpcpp-ppc64.patch deleted file mode 100644 index b0d727e..0000000 --- a/libzrtpcpp-ppc64.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- libzrtpcpp-2.0.0/CMakeLists.txt.orig 2012-04-05 13:55:16.254447000 +0200 -+++ libzrtpcpp-2.0.0/CMakeLists.txt 2012-04-05 13:55:42.722086000 +0200 -@@ -52,7 +52,7 @@ - # 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" ) -+ if ( "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64" OR "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "ppc64" ) - set(LIBDIRNAME "lib64") - endif() - endif() diff --git a/libzrtpcpp.changes b/libzrtpcpp.changes index 1e692d5..3c069c6 100644 --- a/libzrtpcpp.changes +++ b/libzrtpcpp.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Apr 5 13:28:26 UTC 2012 - dvaleev@suse.com + +- better libdir handling + ------------------------------------------------------------------- Thu Apr 5 11:59:40 UTC 2012 - dvaleev@suse.com diff --git a/libzrtpcpp.spec b/libzrtpcpp.spec index 6682e22..e19af79 100644 --- a/libzrtpcpp.spec +++ b/libzrtpcpp.spec @@ -31,7 +31,7 @@ BuildRequires: gcc-c++ BuildRequires: ccrtp-devel >= 2.0.0 BuildRequires: libopenssl-devel >= 0.9.8 BuildRequires: pkgconfig -Patch0: libzrtpcpp-ppc64.patch +Patch0: libzrtpcpp-libdir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -74,6 +74,9 @@ 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 + -DLIB_SUFFIX=64 \ +%endif .. make %{?_smp_mflags} V=1