From c56404297c19279bebe4d4976dd1aed13c6c8dd4e1f4039a340adcae1b0c5824 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Fri, 16 Mar 2012 13:29:25 +0000 Subject: [PATCH 1/2] Accepting request 109538 from home:k0da:ppc - ppc64 should also install libs in /usr/lib64 OBS-URL: https://build.opensuse.org/request/show/109538 OBS-URL: https://build.opensuse.org/package/show/network:telephony/ccrtp?expand=0&rev=5 --- ccrtp-ppc64.patch | 13 +++++++++++++ ccrtp.changes | 5 +++++ ccrtp.spec | 2 ++ 3 files changed, 20 insertions(+) create mode 100644 ccrtp-ppc64.patch diff --git a/ccrtp-ppc64.patch b/ccrtp-ppc64.patch new file mode 100644 index 0000000..cfbb366 --- /dev/null +++ b/ccrtp-ppc64.patch @@ -0,0 +1,13 @@ +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" ) + set(LIB64 "64") + endif() + endif() diff --git a/ccrtp.changes b/ccrtp.changes index fc7e390..faf9b71 100644 --- a/ccrtp.changes +++ b/ccrtp.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Mar 15 14:30:25 UTC 2012 - dvaleev@suse.com + +- ppc64 should also install libs in /usr/lib64 + ------------------------------------------------------------------- Tue Sep 27 08:04:52 UTC 2011 - coolo@suse.com diff --git a/ccrtp.spec b/ccrtp.spec index 6758f8c..290b2c5 100644 --- a/ccrtp.spec +++ b/ccrtp.spec @@ -26,6 +26,7 @@ Summary: A Common C++ Class Framework for RTP Packets Url: http://www.gnu.org/software/ccrtp/ Group: System/Libraries Source0: %{name}-%{version}.tar.bz2 +Patch1: ccrtp-ppc64.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: libgcrypt-devel @@ -66,6 +67,7 @@ ccrtp %prep %setup -q -n ccrtp-%{version} +%patch1 -p1 %build mkdir build From d943a0d8c54cfe9aac1299b14218f1f4035805950dbf4c0373d8ce05a61fb74b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Fri, 23 Mar 2012 13:08:21 +0000 Subject: [PATCH 2/2] Accepting request 110807 from home:babelworx:ldig:branches:network:telephony license update: SUSE-GPL-2.0+-with-openssl-exception Use SUSE- proprietary prefix until license accepted upstream at spdx.org OBS-URL: https://build.opensuse.org/request/show/110807 OBS-URL: https://build.opensuse.org/package/show/network:telephony/ccrtp?expand=0&rev=6 --- ccrtp-ppc64.patch | 13 ------------- ccrtp.changes | 6 ++++++ ccrtp.spec | 4 ++-- 3 files changed, 8 insertions(+), 15 deletions(-) delete mode 100644 ccrtp-ppc64.patch diff --git a/ccrtp-ppc64.patch b/ccrtp-ppc64.patch deleted file mode 100644 index cfbb366..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" ) - set(LIB64 "64") - endif() - endif() diff --git a/ccrtp.changes b/ccrtp.changes index faf9b71..d2928e4 100644 --- a/ccrtp.changes +++ b/ccrtp.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 23 13:06:55 UTC 2012 - cfarrell@suse.com + +- license update: SUSE-GPL-2.0+-with-openssl-exception + Use SUSE- proprietary prefix until license accepted upstream at spdx.org + ------------------------------------------------------------------- Thu Mar 15 14:30:25 UTC 2012 - dvaleev@suse.com diff --git a/ccrtp.spec b/ccrtp.spec index 290b2c5..3b75481 100644 --- a/ccrtp.spec +++ b/ccrtp.spec @@ -21,7 +21,7 @@ Name: ccrtp %define lname libccrtp2 Version: 2.0.1 Release: 9 -License: GPL-2.0+ with exception +License: SUSE-GPL-2.0+-with-openssl-exception Summary: A Common C++ Class Framework for RTP Packets Url: http://www.gnu.org/software/ccrtp/ Group: System/Libraries @@ -50,7 +50,7 @@ real-time streaming data over UDP packets using sending and receiving packet queues. %package devel -License: GPL-2.0+ with exception +License: GPL-2.0+-with-openssl-exception Summary: Include-files and documentation for ccrtp Group: Development/Libraries/Other PreReq: %install_info_prereq