Hello community, here is the log from the commit of package icecream-monitor for openSUSE:Factory checked in at 2013-06-19 14:44:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/icecream-monitor (Old) and /work/SRC/openSUSE:Factory/.icecream-monitor.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "icecream-monitor" Changes: -------- --- /work/SRC/openSUSE:Factory/icecream-monitor/icecream-monitor.changes 2011-09-23 02:03:12.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.icecream-monitor.new/icecream-monitor.changes 2013-06-19 14:44:04.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Apr 8 10:06:57 UTC 2013 - llu...@suse.com + +- link also to -lcap-ng if icecream library needs it (cap-ng-link.patch) + +------------------------------------------------------------------- New: ---- cap-ng-link.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ icecream-monitor.spec ++++++ --- /var/tmp/diff_new_pack.4mJ0ca/_old 2013-06-19 14:44:05.000000000 +0200 +++ /var/tmp/diff_new_pack.4mJ0ca/_new 2013-06-19 14:44:05.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package icecream-monitor # -# 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 @@ -15,18 +15,19 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: icecream-monitor -BuildRequires: libicecream-devel libkde4-devel +BuildRequires: libicecream-devel +BuildRequires: libkde4-devel +Summary: Monitor Program for the icecream Compile Farm License: GPL-2.0+ Group: Development/Tools/Building -Summary: Monitor Program for the icecream Compile Farm Version: 1.0 -Release: 289 +Release: 0 Source0: icemon.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build +# fd2f9df6e1b40e15451d4e1fc576d374d580cc8f +Patch1: cap-ng-link.patch %description icecream is the next generation distcc. This package provides a monitor @@ -34,6 +35,7 @@ %prep %setup -q -n icemon +%patch1 -p1 %build %cmake_kde4 -d build ++++++ cap-ng-link.patch ++++++ commit fd2f9df6e1b40e15451d4e1fc576d374d580cc8f Author: Luboš Luňák <l.lu...@suse.cz> Date: Mon Apr 8 11:45:43 2013 +0200 if icecc.a needs -lcap-ng, dig it somehow out of the pkgconfig data diff --git a/cmake/modules/FindIcecream.cmake b/cmake/modules/FindIcecream.cmake index fb2e656..b0f1315 100644 --- a/cmake/modules/FindIcecream.cmake +++ b/cmake/modules/FindIcecream.cmake @@ -11,11 +11,25 @@ if (LIBICECREAM_INCLUDE_DIR AND LIBICECREAM_LIBRARIES) set(LIBICECREAM_FOUND TRUE) else (LIBICECREAM_INCLUDE_DIR AND LIBICECREAM_LIBRARIES) + + set( LIBICECREAM_LIB_EXTRA ) + if(NOT WIN32) # use pkg-config to get the directories and then use these values # in the FIND_PATH() and FIND_LIBRARY() calls find_package(PkgConfig) pkg_check_modules(PC_ICECC icecc) + # The icecream lib may optionally need linking to -lcap-ng, so dig it out + # of pkg-config data. + # Somewhat hackish, but I can't find a simpler way to do this with CMake. + foreach(lib ${PC_ICECC_STATIC_LIBRARIES}) + message(STATUS "A ${lib}") + if(NOT ${lib} STREQUAL "icecc") + list(APPEND LIBICECREAM_LIB_EXTRA "-l${lib}") + message(STATUS "B ${lib}") + endif(NOT ${lib} STREQUAL "icecc") + endforeach(lib ${PC_ICECC_STATIC_LIBRARIES}) + message(STATUS "C ${LIBICECREAM_LIB_EXTRA}") endif(NOT WIN32) find_path(LIBICECREAM_INCLUDE_DIR icecc/comm.h @@ -32,7 +46,7 @@ else (LIBICECREAM_INCLUDE_DIR AND LIBICECREAM_LIBRARIES) /opt/icecream/lib ) - set( LIBICECREAM_LIBRARIES ${LIBICECREAM_LIBRARY} CACHE INTERNAL "The libraries for libicecream" ) + set( LIBICECREAM_LIBRARIES ${LIBICECREAM_LIBRARY} ${LIBICECREAM_LIB_EXTRA} CACHE INTERNAL "The libraries for libicecream" ) if (LIBICECREAM_INCLUDE_DIR AND LIBICECREAM_LIBRARIES) set( LIBICECREAM_FOUND TRUE) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
