commit icecream-monitor for openSUSE:Factory
Hello community,
here is the log from the commit of package icecream-monitor for
openSUSE:Factory checked in at 2019-09-18 13:09:29
Comparing /work/SRC/openSUSE:Factory/icecream-monitor (Old)
and /work/SRC/openSUSE:Factory/.icecream-monitor.new.7948 (New)
Package is "icecream-monitor"
Wed Sep 18 13:09:29 2019 rev:30 rq:730434 version:3.3
Changes:
--- /work/SRC/openSUSE:Factory/icecream-monitor/icecream-monitor.changes
2019-04-17 10:10:12.438903797 +0200
+++
/work/SRC/openSUSE:Factory/.icecream-monitor.new.7948/icecream-monitor.changes
2019-09-18 13:09:31.440714079 +0200
@@ -1,0 +2,14 @@
+Thu Sep 12 14:49:53 UTC 2019 - Lubos Lunak
+
+- Update to version 3.3:
+ - Display node protocol version and features in detailed host view
+ - Several more icecream flavors added
+ - Add --port option to specify the scheduler port
+ - Remote hardcoded background color (#39)
+ - Fix data loss when switching views
+ - Avoid a possible QSocketNotifier crash (#47)
+ - Improve column widths in views
+ - Require extra-cmake-modules for building
+ - Fix finding icecc pkgconfig file
+
+---
Old:
icemon-3.2.0.tar.xz
New:
icemon-3.3.tar.xz
Other differences:
--
++ icecream-monitor.spec ++
--- /var/tmp/diff_new_pack.XR42uk/_old 2019-09-18 13:09:32.836713786 +0200
+++ /var/tmp/diff_new_pack.XR42uk/_new 2019-09-18 13:09:32.876713778 +0200
@@ -17,7 +17,7 @@
Name: icecream-monitor
-Version:3.2.0
+Version:3.3
Release:0
Summary:Monitor Program for the icecream Compile Farm
License:GPL-2.0-or-later
@@ -26,6 +26,7 @@
Source0:icemon-%{version}.tar.xz
BuildRequires: cmake
BuildRequires: docbook2x
+BuildRequires: extra-cmake-modules
BuildRequires: hicolor-icon-theme
BuildRequires: lzo-devel
BuildRequires: pkgconfig
++ _service ++
--- /var/tmp/diff_new_pack.XR42uk/_old 2019-09-18 13:09:33.188713712 +0200
+++ /var/tmp/diff_new_pack.XR42uk/_new 2019-09-18 13:09:33.228713704 +0200
@@ -1,8 +1,8 @@
-3.2.0
+3.3
http://github.com/icecc/icemon.git
-refs/tags/v3.2.0
+refs/tags/v3.3
git
++ icemon-3.2.0.tar.xz -> icemon-3.3.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/icemon-3.2.0/.gitignore new/icemon-3.3/.gitignore
--- old/icemon-3.2.0/.gitignore 1970-01-01 01:00:00.0 +0100
+++ new/icemon-3.3/.gitignore 2019-09-11 19:37:46.0 +0200
@@ -0,0 +1,87 @@
+# This file is used to ignore files which are generated
+#
+
+*~
+*.a
+*.core
+*.moc
+*.o
+*.obj
+*.orig
+*.rej
+*.so
+*_pch.h.cpp
+*_resource.rc
+*.part
+*.qm
+.#*
+*.*#
+core
+!core/
+tags
+.DS_Store
+*.debug
+Makefile*
+*.prl
+*.app
+moc_*.cpp
+ui_*.h
+qrc_*.cpp
+Thumbs.db
+*.user*
+
+# xemacs temporary files
+# -
+*.flc
+
+# Vim temporary files
+# -
+.*.swp
+
+# KDevelop
+# -
+*.kdev4
+.kdev4/
+
+# Visual Studio generated files
+# -
+*.ib_pdb_index
+*.idb
+*.ilk
+*.pdb
+*.sln
+*.suo
+*.vcproj
+*vcproj.*.*.user
+*.ncb
+
+# MinGW generated files
+# -
+*.Debug
+*.Release
+
+# Directories to ignore
+# -
+debug
+lib/*
+lib64/*
+release
+doc/html/*
+doc/html-dev/*
+doc/api/html/*
+doc/pluginhowto/html/*
+.rcc
+.pch
+
+# Binaries
+#
+*.dll
+*.exe
+icemon
+
+# From Git merge
+# --
+*.BACKUP.*
+*.BASE.*
+*.LOCAL.*
+*.REMOTE.*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/icemon-3.2.0/.travis.yml new/icemon-3.3/.travis.yml
--- old/icemon-3.2.0/.travis.yml2018-12-10 10:04:43.0 +0100
+++ new/icemon-3.3/.travis.yml 2019-09-11 19:37:46.0 +0200
@@ -1,5 +1,5 @@
sudo: required
-dist: trusty
+dist: xenial
language: cpp
@@ -7,16 +7,32 @@
- gcc
- clang
-before_install:
-- sudo apt-get update -qq
-- sudo apt-get install -qq cmake qtbase5-dev libicecc-dev
-
before_script:
+- |
+git clone --depth=50 --branch=master https://github.com/icecc/icecream.git
icecream
+pushd icecream
+autoreconf -fiv
+./configure --prefix=$(pwd)
+make install -C services -s -j $(getconf _NPROCESSORS_ONLN)
+popd
+
- cmake --version
- qtchooser -run-tool=qmake -qt=qt5 --version
- mkdir build
- cd build
-- cmake ..
+- PKG_CONFIG_PATH=../icecream/lib/pkgconfig cmake ..
script: make
+
+addons:
+ apt:
+packages:
+- cmake
+- qtbase5-dev
+- extra-cmake-modules
+# for icecream
+- libcap-ng-dev
+- liblzo2-dev
+- libzstd1-dev
+-
commit icecream-monitor for openSUSE:Factory
Hello community,
here is the log from the commit of package icecream-monitor for
openSUSE:Factory checked in at 2019-04-17 10:09:53
Comparing /work/SRC/openSUSE:Factory/icecream-monitor (Old)
and /work/SRC/openSUSE:Factory/.icecream-monitor.new.17052 (New)
Package is "icecream-monitor"
Wed Apr 17 10:09:53 2019 rev:29 rq:694790 version:3.2.0
Changes:
--- /work/SRC/openSUSE:Factory/icecream-monitor/icecream-monitor.changes
2018-02-06 16:48:50.356952371 +0100
+++
/work/SRC/openSUSE:Factory/.icecream-monitor.new.17052/icecream-monitor.changes
2019-04-17 10:10:12.438903797 +0200
@@ -1,0 +2,13 @@
+Tue Apr 16 11:21:54 UTC 2019 - Martin Pluskal
+
+- Modernise spec file
+
+---
+Fri Apr 12 12:51:12 UTC 2019 - Tomas Novotny
+
+- Update to version 3.2.0:
+ - Fix broken scheduler discovery with newer Icecream
+ - Add some badges to README.md
+ - Coding style improvements
+
+---
Old:
icemon-3.1.0.tar.xz
New:
icemon-3.2.0.tar.xz
Other differences:
--
++ icecream-monitor.spec ++
--- /var/tmp/diff_new_pack.Mx2qUa/_old 2019-04-17 10:10:13.566904999 +0200
+++ /var/tmp/diff_new_pack.Mx2qUa/_new 2019-04-17 10:10:13.566904999 +0200
@@ -1,7 +1,7 @@
#
# spec file for package icecream-monitor
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,27 +12,27 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: icecream-monitor
+Version:3.2.0
+Release:0
+Summary:Monitor Program for the icecream Compile Farm
+License:GPL-2.0-or-later
+Group: Development/Tools/Building
+URL:https://github.com/icecc/icemon
+Source0:icemon-%{version}.tar.xz
BuildRequires: cmake
BuildRequires: docbook2x
BuildRequires: hicolor-icon-theme
-BuildRequires: libicecream-devel
BuildRequires: lzo-devel
+BuildRequires: pkgconfig
BuildRequires: update-desktop-files
BuildRequires: xsltproc
BuildRequires: cmake(Qt5Widgets)
-Summary:Monitor Program for the icecream Compile Farm
-License:GPL-2.0+
-Group: Development/Tools/Building
-Url:https://github.com/icecc/icemon
-Version:3.1.0
-Release:0
-Source0:icemon-%{version}.tar.xz
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: pkgconfig(icecc)
%description
icecream is the next generation distcc. This package provides a monitor
@@ -42,21 +42,14 @@
%setup -q -n icemon-%{version}
%build
- mkdir build
- cd build
- cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} ..
- make %{_smp_mflags}
+%cmake
+%make_jobs
%install
- cd build
- make install DESTDIR=%{buildroot}
- %suse_update_desktop_file icemon Development Building
-
-%clean
-rm -rf ${RPM_BUILD_ROOT}
+%cmake_install
+%suse_update_desktop_file icemon Development Building
%files
-%defattr(-,root,root)
%{_bindir}/icemon
%{_datadir}/applications/icemon.desktop
%{_datadir}/icons/hicolor/*/apps/icemon.*
++ _service ++
--- /var/tmp/diff_new_pack.Mx2qUa/_old 2019-04-17 10:10:13.638905076 +0200
+++ /var/tmp/diff_new_pack.Mx2qUa/_new 2019-04-17 10:10:13.638905076 +0200
@@ -1,8 +1,8 @@
-3.1.0
+3.2.0
http://github.com/icecc/icemon.git
-refs/tags/v3.1.0
+refs/tags/v3.2.0
git
++ icemon-3.1.0.tar.xz -> icemon-3.2.0.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/icemon-3.1.0/CHANGELOG.md
new/icemon-3.2.0/CHANGELOG.md
--- old/icemon-3.1.0/CHANGELOG.md 2017-04-07 00:20:44.0 +0200
+++ new/icemon-3.2.0/CHANGELOG.md 2018-12-10 10:04:43.0 +0100
@@ -1,3 +1,14 @@
+## 3.2.0 (2018-12-10)
+
+Bugfixes:
+
+- Fix broken scheduler discovery with newer Icecream (#40)
+
+Internal Changes:
+
+- Add some badges to README.md
+- Coding style improvements
+
## 3.1.0 (2017-04-07)
Features:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/icemon-3.1.0/CMakeLists.txt
new/icemon-3.2.0/CMakeLists.txt
--- old/icemon-3.1.0/CMakeLists.txt 2017-04-07 00:20:44.0 +0200
+++ new/icemon-3.2.0/CMakeLists.txt 2018-12-10 10:04:43.0 +0100
@@ -15,7 +15,7 @@
commit icecream-monitor for openSUSE:Factory
Hello community,
here is the log from the commit of package icecream-monitor for
openSUSE:Factory checked in at 2018-02-06 16:48:11
Comparing /work/SRC/openSUSE:Factory/icecream-monitor (Old)
and /work/SRC/openSUSE:Factory/.icecream-monitor.new (New)
Package is "icecream-monitor"
Tue Feb 6 16:48:11 2018 rev:28 rq:572528 version:3.1.0
Changes:
--- /work/SRC/openSUSE:Factory/icecream-monitor/icecream-monitor.changes
2016-07-12 23:51:38.0 +0200
+++ /work/SRC/openSUSE:Factory/.icecream-monitor.new/icecream-monitor.changes
2018-02-06 16:48:50.356952371 +0100
@@ -1,0 +2,8 @@
+Thu Dec 21 01:52:52 UTC 2017 - l.lu...@centrum.cz
+
+- Update to version 3.1.0:
+- added scheduler option
+- summary view improvements
+- bugfixes
+
+---
Old:
icemon-3.0.1.tar.xz
New:
icemon-3.1.0.tar.xz
Other differences:
--
++ icecream-monitor.spec ++
--- /var/tmp/diff_new_pack.5OHSSJ/_old 2018-02-06 16:48:51.112916999 +0100
+++ /var/tmp/diff_new_pack.5OHSSJ/_new 2018-02-06 16:48:51.112916999 +0100
@@ -1,7 +1,7 @@
#
# spec file for package icecream-monitor
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -29,7 +29,7 @@
License:GPL-2.0+
Group: Development/Tools/Building
Url:https://github.com/icecc/icemon
-Version:3.0.1
+Version:3.1.0
Release:0
Source0:icemon-%{version}.tar.xz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++ _service ++
--- /var/tmp/diff_new_pack.5OHSSJ/_old 2018-02-06 16:48:51.156914940 +0100
+++ /var/tmp/diff_new_pack.5OHSSJ/_new 2018-02-06 16:48:51.156914940 +0100
@@ -1,8 +1,8 @@
-3.0.1
+3.1.0
http://github.com/icecc/icemon.git
-refs/tags/v3.0.1
+refs/tags/v3.1.0
git
++ icemon-3.0.1.tar.xz -> icemon-3.1.0.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/icemon-3.0.1/CHANGELOG.md
new/icemon-3.1.0/CHANGELOG.md
--- old/icemon-3.0.1/CHANGELOG.md 2016-07-05 00:06:38.0 +0200
+++ new/icemon-3.1.0/CHANGELOG.md 2017-04-07 00:20:44.0 +0200
@@ -1,3 +1,22 @@
+## 3.1.0 (2017-04-07)
+
+Features:
+
+- Summary view: Multiple improvements (#23)
+- Displays average time for each submitted jobs
+- Added display of average build time for finished jobs
+- Added scheduler hostname option (#27)
+
+Bugfixes:
+
+- Fixed summary view stateWidget color not updated correctly (#23)
+- ListView: Sorted file sizes correctly
(643abfbbdeed806aa5a08f0c1cfcdaf7ba79d748)
+- Fixed filtering in detailed host view (#26)
+
+Internal Changes:
+
+- Lots of cleanups, more strict compiler flags, etc.
+
## 3.0.1 (2016-02-06)
Bugfixes:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/icemon-3.0.1/CMakeLists.txt
new/icemon-3.1.0/CMakeLists.txt
--- old/icemon-3.0.1/CMakeLists.txt 2016-07-05 00:06:38.0 +0200
+++ new/icemon-3.1.0/CMakeLists.txt 2017-04-07 00:20:44.0 +0200
@@ -15,7 +15,7 @@
# version info
set(ICEMON_VERSION_MAJOR "3")
-set(ICEMON_VERSION_MINOR "0")
+set(ICEMON_VERSION_MINOR "1")
set(ICEMON_VERSION_PATCH "0")
set(ICEMON_VERSION
"${ICEMON_VERSION_MAJOR}.${ICEMON_VERSION_MINOR}.${ICEMON_VERSION_PATCH}")
set(ICEMON_VERSION_STRING "${ICEMON_VERSION}")
@@ -71,7 +71,7 @@
if(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
check_cxx_compiler_flag(-Wunused-but-set-variable HAVE_GCC_UNUSED_BUT_SET)
check_cxx_compiler_flag(-Wlogical-op HAVE_GCC_LOGICAL_OP)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated -Wextra
-Woverloaded-virtual -Winit-self -Wmissing-include-dirs -Wunused
-Wno-div-by-zero -Wundef -Wpointer-arith -Wcast-qual -Wcast-align
-Wmissing-noreturn -Werror=return-type")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated -Wextra
-Woverloaded-virtual -Winit-self -Wmissing-include-dirs -Wunused
-Wno-div-by-zero -Wundef -Wpointer-arith -Wcast-qual -Wcast-align
-Wmissing-noreturn -Werror=return-type -pedantic")
if(HAVE_GCC_UNUSED_BUT_SET)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wunused-but-set-variable")
endif()
@@ -83,11 +83,13 @@
add_definitions(
-DQT_DEPRECATED_WARNINGS
-DQT_DISABLE_DEPRECATED_BEFORE=0x050400
+-DQT_NO_CAST_FROM_ASCII
+-DQT_NO_CAST_FROM_BYTEARRAY
+-DQT_NO_CAST_TO_ASCII
-DQT_NO_URL_CAST_FROM_STRING
-DQT_STRICT_ITERATORS
commit icecream-monitor for openSUSE:Factory
Hello community,
here is the log from the commit of package icecream-monitor for
openSUSE:Factory checked in at 2016-07-12 23:51:32
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
2014-02-18 20:24:43.0 +0100
+++ /work/SRC/openSUSE:Factory/.icecream-monitor.new/icecream-monitor.changes
2016-07-12 23:51:38.0 +0200
@@ -1,0 +2,5 @@
+Mon Jul 4 22:50:56 UTC 2016 - stefan.bru...@rwth-aachen.de
+
+- Update to Version 3.0.1, build against Qt5
+
+---
Old:
icemon.tar.bz2
New:
_service
icemon-3.0.1.tar.xz
Other differences:
--
++ icecream-monitor.spec ++
--- /var/tmp/diff_new_pack.xWjrCS/_old 2016-07-12 23:51:39.0 +0200
+++ /var/tmp/diff_new_pack.xWjrCS/_new 2016-07-12 23:51:39.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package icecream-monitor
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -21,16 +21,17 @@
BuildRequires: docbook2x
BuildRequires: hicolor-icon-theme
BuildRequires: libicecream-devel
-BuildRequires: libqt4-devel
-BuildRequires: libxslt
+BuildRequires: lzo-devel
BuildRequires: update-desktop-files
+BuildRequires: xsltproc
+BuildRequires: cmake(Qt5Widgets)
Summary:Monitor Program for the icecream Compile Farm
License:GPL-2.0+
Group: Development/Tools/Building
Url:https://github.com/icecc/icemon
-Version:1.0
+Version:3.0.1
Release:0
-Source0:icemon.tar.bz2
+Source0:icemon-%{version}.tar.xz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -38,7 +39,7 @@
program.
%prep
-%setup -q -n icemon
+%setup -q -n icemon-%{version}
%build
mkdir build
++ _service ++
3.0.1
http://github.com/icecc/icemon.git
refs/tags/v3.0.1
git
xz
*.tar
commit icecream-monitor for openSUSE:Factory
Hello community,
here is the log from the commit of package icecream-monitor for
openSUSE:Factory checked in at 2014-02-18 20:24:42
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
2013-06-19 14:44:04.0 +0200
+++ /work/SRC/openSUSE:Factory/.icecream-monitor.new/icecream-monitor.changes
2014-02-18 20:24:43.0 +0100
@@ -1,0 +2,8 @@
+Sat Feb 15 17:03:38 UTC 2014 - l.lu...@centrum.cz
+
+- update to latest upstream git snapshot
+- no longer depends on KDE4 libraries, only Qt4
+- various bugfixes
+- manpage included
+
+---
Old:
cap-ng-link.patch
Other differences:
--
++ icecream-monitor.spec ++
--- /var/tmp/diff_new_pack.XX87oi/_old 2014-02-18 20:24:44.0 +0100
+++ /var/tmp/diff_new_pack.XX87oi/_new 2014-02-18 20:24:44.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package icecream-monitor
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 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
@@ -17,17 +17,21 @@
Name: icecream-monitor
+BuildRequires: cmake
+BuildRequires: docbook2x
+BuildRequires: hicolor-icon-theme
BuildRequires: libicecream-devel
-BuildRequires: libkde4-devel
+BuildRequires: libqt4-devel
+BuildRequires: libxslt
+BuildRequires: update-desktop-files
Summary:Monitor Program for the icecream Compile Farm
License:GPL-2.0+
Group: Development/Tools/Building
+Url:https://github.com/icecc/icemon
Version:1.0
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
@@ -35,27 +39,26 @@
%prep
%setup -q -n icemon
-%patch1 -p1
%build
- %cmake_kde4 -d build
- %make_jobs
+ mkdir build
+ cd build
+ cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} ..
+ make %{_smp_mflags}
%install
cd build
- %makeinstall
+ make install DESTDIR=%{buildroot}
%suse_update_desktop_file icemon Development Building
- %kde_post_install
%clean
rm -rf ${RPM_BUILD_ROOT}
%files
%defattr(-,root,root)
-/usr/bin/icemon
-#%doc /usr/share/doc/kde/HTML/en/icemon
-/usr/share/applications/kde4/icemon.desktop
-/usr/share/icons/*/*/apps/icemon.*
-/usr/share/kde4/apps/icemon
+%{_bindir}/icemon
+%{_datadir}/applications/icemon.desktop
+%{_datadir}/icons/hicolor/*/apps/icemon.*
+%{_mandir}/man1/icemon.*
%changelog
++ icemon.tar.bz2 ++
8469 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit icecream-monitor for openSUSE:Factory
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.0 +0200
+++ /work/SRC/openSUSE:Factory/.icecream-monitor.new/icecream-monitor.changes
2013-06-19 14:44:04.0 +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.0 +0200
+++ /var/tmp/diff_new_pack.4mJ0ca/_new 2013-06-19 14:44:05.0 +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
commit icecream-monitor for openSUSE:Factory
Hello community, here is the log from the commit of package icecream-monitor for openSUSE:Factory checked in at 2011-12-06 18:18:56 Comparing /work/SRC/openSUSE:Factory/icecream-monitor (Old) and /work/SRC/openSUSE:Factory/.icecream-monitor.new (New) Package is icecream-monitor, Maintainer is co...@suse.com Changes: Other differences: -- ++ icecream-monitor.spec ++ --- /var/tmp/diff_new_pack.qT1dVC/_old 2011-12-06 18:33:05.0 +0100 +++ /var/tmp/diff_new_pack.qT1dVC/_new 2011-12-06 18:33:05.0 +0100 @@ -20,7 +20,7 @@ Name: icecream-monitor BuildRequires: libicecream-devel libkde4-devel -License:GPL v2 or later +License:GPL-2.0+ Group: Development/Tools/Building Summary:Monitor Program for the icecream Compile Farm Version:1.0 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit icecream-monitor for openSUSE:Factory
Hello community,
here is the log from the commit of package icecream-monitor for openSUSE:Factory
checked in at Fri Sep 9 12:04:02 CEST 2011.
--- icecream-monitor/icecream-monitor.changes 2009-08-21 08:36:31.0
+0200
+++ /mounts/work_src_done/STABLE/icecream-monitor/icecream-monitor.changes
2011-09-08 17:54:12.0 +0200
@@ -1,0 +2,5 @@
+Thu Sep 8 15:53:57 UTC 2011 - co...@suse.com
+
+- update from SVN to fix build
+
+---
calling whatdependson for head-i586
Old:
icemon.dif
Other differences:
--
++ icecream-monitor.spec ++
--- /var/tmp/diff_new_pack.Eawt92/_old 2011-09-09 12:03:58.0 +0200
+++ /var/tmp/diff_new_pack.Eawt92/_new 2011-09-09 12:03:58.0 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package icecream-monitor (Version 1.0)
+# spec file for package icecream-monitor
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 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
@@ -24,28 +24,16 @@
Group: Development/Tools/Building
Summary:Monitor Program for the icecream Compile Farm
Version:1.0
-Release:278
+Release:289
Source0:icemon.tar.bz2
-Patch: icemon.dif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
icecream is the next generation distcc. This package provides a monitor
program.
-
-
-Authors:
-
-Stephan Kulow co...@suse.de
-Michael Matz m...@suse.de
-Cornelius Schumacher csc...@suse.de
-Lubos Lunak llu...@suse.cz
-Frerich Raabe ra...@kde.org
-
%prep
-%setup -q -n %name
-%patch
+%setup -q -n icemon
%build
%cmake_kde4 -d build
@@ -56,8 +44,6 @@
%makeinstall
%suse_update_desktop_file icemon Development Building
%kde_post_install
- # no-one needs this
- rm $RPM_BUILD_ROOT/usr/share/kde4/apps/cmake/modules/FindIcecream.cmake
%clean
rm -rf ${RPM_BUILD_ROOT}
@@ -65,7 +51,7 @@
%files
%defattr(-,root,root)
/usr/bin/icemon
-%doc /usr/share/doc/kde/HTML/en/icemon
+#%doc /usr/share/doc/kde/HTML/en/icemon
/usr/share/applications/kde4/icemon.desktop
/usr/share/icons/*/*/apps/icemon.*
/usr/share/kde4/apps/icemon
++ icemon.tar.bz2 ++
6531 lines of diff (skipped)
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
