Hello community,
here is the log from the commit of package conky for openSUSE:Factory
checked in at Tue Oct 11 18:24:21 CEST 2011.
--------
New Changes file:
--- /dev/null 2010-08-26 16:28:41.000000000 +0200
+++ /mounts/work_src_done/STABLE/conky/conky.changes 2011-09-29 07:19:33.000000000 +0200
@@ -0,0 +1,205 @@
+-------------------------------------------------------------------
+Thu Sep 29 05:15:35 UTC 2011 - pascal.bleser@opensuse.org
+
+- add cairo and imlib support where tolua++ is available,
+ built as subpackages (conky-cairo and conky-imlib2)
+
+- add patch to add -lm when linking against libiw, which is required by some
+ more recent versions of libiw
+
+-------------------------------------------------------------------
+Mon Sep 26 08:10:40 UTC 2011 - pascal.bleser@opensuse.org
+
+- fix build issue with files in conky-doc
+
+-------------------------------------------------------------------
+Mon Sep 26 00:42:04 UTC 2011 - nmarques@opensuse.org
+
+- Add conky-fix-curl-FTBFS.patch: remove deprecated curl/types.h
+ to fix FTBFS with newer versions of curl.
+ Upstream: http://tinyurl.com/4x76bbx
+
+-------------------------------------------------------------------
+Fri Oct 8 20:44:31 UTC 2010 - pascal.bleser@opensuse.org
+
+- dropped conky-getaddrinfo.patch, was merged upstream
+ (PATCH-FIX-OPENSUSE conky-getaddrinfo.patch fix-for-opensuse-specific-things.patch sf#3045085 pascal.bleser@opensuse.org)
+
+- update to 1.8.1:
+ * allow method to pass execgraph arguments containing spaces
+ * abort curl transfers if they drop below 1000B/s for more than 60s
+ * fix short_units for below kilo values
+ * when we have a failure in mail thread, sleep for a bit
+ * improve failure handling in mail threads
+ * when we have a failure in the mail thread, lookup the hostname again in
+ case the failure is due odd to DNS changes, or some other madness
+ * fix segfault in ccurl_thread.c
+ * fix crash in mail stuff due to bad free()
+ * fix segfault in i8k (sf.net #3007167)
+ * use getaddrinfo instead of gethostbyname: patches conky to use getaddrinfo
+ instead of gethostbyname everywhere. gethostbyname is rather flawed and
+ doesn't support IPv6 properly. Patch contributed by Pascal Bleser.
+ * fix 'nvidia with ncurses segfaults' (sf.net #3006233)
+ * make $fs_used_perc and $fs_bar report used space correctly; they reported
+ fs->size - fs->avail, which is not correct if fs has super-user reserved
+ blocks; note that now $fs_used_perc and $fs_free_perc need not add up to
+ 100%, but that is consistent with what $fs_used and $fs_free do
+ * fix buffer overflows in eve.c (sf.net #3034056)
+ * fix bug where IMAP doesn't refresh counts after IDLE timeout
+ * fix segfault in mail folder (SF: 3007493)
+ * fix alignment ($align[rc]) issue for exec & lua objects
+ * small build fix & zero playtime and progress bars when XMMS2 playback is stopped
+ * fix tiny memleak when $top is used wrong
+ * ${top}, ${top_mem} and ${top_time} are now recognized as variables; the
+ parts of code doing this were in a #ifdef __linux__; the total CPU time of
+ processes (${top} with "time" argument) is now printable, and ${top_time}
+ works
+ * fix battery_bar not parsing arguments correctly (sf: #2998034, lp: #569195)
+ * bugfix: RSS interval was in secs instead of mins
+ * bugfix: $alignr only worked on the first line of $execp, $execpi, $lua and $lua_parse
+ * bugfix: memory and thread-deleting problems
+ * bugfix: read_tcp treated a succesfull connection as failed and vice versa
+ * add $nodename_short
+ * bugfix: adding/removing use_xft in the config had no effect unless you
+ restarted conky, reloading the config was not enough
+ * fix building with Audacious >= 2.3
+ * bugfix: mixerbar showed wrong values
+ * bugfix: ac-adapter is sometimes called ADP1 in sysfs instead of AC
+ * bugfix: battery_bar should also work without argument
+ * bugfix: When the first line behind TEXT was a comment, the start of the
+ second line wasn't parsed
+ * fix X error when border_width is <1
+ * fix device name parsing for diskio variables
+ * fix bug in $if_existing
+
+-------------------------------------------------------------------
+Sun Jul 4 10:46:16 UTC 2010 - pascal.bleser@opensuse.org
+
+- update to 1.8.0
+- split out -doc subpackage
+- package vim and nano syntax highlighting configuration files into subpackages
+ (instead of packaging them under the docdir)
+
+-------------------------------------------------------------------
+Wed Sep 30 00:00:00 UTC 2009 - pascal.bleser@opensuse.org
+
+- update to 1.7.2:
+ * fixed minor memleak in pop3/imap code on config reload
+ * fix crash when using $if_match with objects that may return a null pointer
+ (like $rss, $weather, or $curl before data is available)
+ * removed alias config option due to brokenness
+ * changed xoap parsing method to xpath, in preparation to include forecast
+ data
+ * update MPD elapsed/progress when stopped (sf.net #2792113)
+ * overhauled RSS and weather, added $curl
+ * added support for X alignment across multi-lined objects (i.e., using
+ $alignr with $exec)
+ * www.weather.com can now be used as well as a source of weather dataµ
+ * added support for $desktop, $desktop_number and $desktop_name (sf.net
+ #2040528)
+ * added support for $swapfree
+ * improved Lua API (lua_read_parse has been removed in favour of the
+ conky_parse() Lua API call)
+ * introduced new Lua Cairo and Imlib2 bindings
+ * added support for $weather (experimental)
+ * remove newline with comment only lines in TEXT
+ * improved parsing of graph arguments, removed "log"|"normal" arguments in
+ favour of -l switch
+ * fix escaping of comments in TEXT (sf.net #2813390)
+ * fix segfault in to_real_path, it's sometimes called with the same source
+ and dest without checking the length, causing a segfault
+ * use the internal process list for if_running on Linux
+
+
+-------------------------------------------------------------------
+Sat Jun 13 00:00:00 UTC 2009 - pascal.bleser@opensuse.org
+
+- update to 1.7.1.1:
+ * fixed a regression which causes fonts to not be rendered properly with
+ certain types of windows
+ * fix bug in comments within TEXT (where the line contains just '#') (sf.net
+ #2803586)
+ * fix bug in $mails (sf.net #2802529)
+
+
+-------------------------------------------------------------------
+Tue Jun 9 00:00:00 UTC 2009 - pascal.bleser@opensuse.org
+
+- update to 1.7.1
+
+
+-------------------------------------------------------------------
+Sun May 3 00:00:00 UTC 2009 - pascal.bleser@opensuse.org
+
+- update to 1.7.0
+
+
+-------------------------------------------------------------------
+Tue Oct 7 00:00:00 UTC 2008 - bwalle@suse.de
+
+- fix build on Factory
+
+
+-------------------------------------------------------------------
+Wed Sep 17 00:00:00 UTC 2008 - guru@unixtech.be
+
+- update to 1.6.1
+
+
+-------------------------------------------------------------------
+Tue Jul 22 00:00:00 UTC 2008 - guru@unixtech.be
+
+- new upstream version
+
+
+-------------------------------------------------------------------
+Sun Mar 23 00:00:00 UTC 2008 - guru@unixtech.be
+
+- new upstream version
+
+
+-------------------------------------------------------------------
+Thu Dec 6 00:00:00 UTC 2007 - guru@unixtech.be
+
+- new upstream version
+
+
+-------------------------------------------------------------------
+Wed Oct 3 00:00:00 UTC 2007 - guru@unixtech.be
+
+- update to 1.4.7
+- moved to openSUSE Build Service
+
+
+-------------------------------------------------------------------
+Wed Jan 3 00:00:00 UTC 2007 - guru@unixtech.be
+
+- new upstream version
+
+
+-------------------------------------------------------------------
+Sat Sep 2 00:00:00 UTC 2006 - guru@unixtech.be
+
+- new upstream version
+
+
+-------------------------------------------------------------------
+Wed Feb 15 00:00:00 UTC 2006 - guru@unixtech.be
+
+- new upstream version
+
+
+-------------------------------------------------------------------
+Mon Jan 2 00:00:00 UTC 2006 - guru@unixtech.be
+
+- removed cairo flags, as removed from conky codebase
+- new upstream version
+- rewrote spec file
++++ 8 more lines (skipped)
++++ between /dev/null
++++ and /mounts/work_src_done/STABLE/conky/conky.changes
calling whatdependson for head-i586
New:
----
conky-1.8.1.tar.bz2
conky-fix-curl-FTBFS.patch
conky-libiw_with_libm.patch
conky-rpmlintrc
conky.changes
conky.desktop
conky.spec
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ conky.spec ++++++
#
# spec file for package conky
#
# 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
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# 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/
#
%if 0%{?suse_version} >= 1100
%define with_lua_extra 1
%else
%define with_lua_extra 0
%endif
Name: conky
Version: 1.8.1
Release: 0
Summary: Lightweight System Monitor
Source: http://prdownloads.sourceforge.net/conky/conky-%{version}.tar.bz2
Source1: conky.desktop
# PATCH-FIX-UPSTREAM - conky-fix-curl-FTBFS.patch - remove deprecated curl/types.h to fix FTBFS in newer versions of curl, http://tinyurl.com/4x76bbx
%if 0%{?suse_version} >= 1210
Patch0: %{name}-fix-curl-FTBFS.patch
%endif
# PATCH-FIX - add -lm when linking against -liw
Patch1: conky-libiw_with_libm.patch
Source99: conky-rpmlintrc
Url: http://conky.sourceforge.net
Group: System/Monitoring
License: BSD license (revised)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: fontconfig-devel freetype2-devel gcc make
BuildRequires: xorg-x11-devel
%if 0%{?suse_version} >= 1120
BuildRequires: libiw-devel
%else
BuildRequires: wireless-tools
%endif
BuildRequires: glib2-devel libpng-devel zlib-devel
BuildRequires: xorg-x11-devel
BuildRequires: cairo-devel
BuildRequires: update-desktop-files
BuildRequires: autoconf automake libtool
BuildRequires: docbook2x
BuildRequires: alsa-devel
%if %with_lua_extra
BuildRequires: tolua++
%endif
%if 0%{?sles_version} == 0 || 0%{?sles_version} >= 11
%define with_imlib2 1
BuildRequires: imlib2-devel
%endif
BuildRequires: libxml2-devel
BuildRequires: ncurses-devel
%if 0%{?suse_version} >= 1020
%define with_lua 1
BuildRequires: lua-devel
%endif
%if 0%{?suse_version} >= 1020 || 0%{?fedora_version} > 0
%if 0%{?sles_version} < 11
BuildRequires: vim-enhanced
%else
BuildRequires: vim
%endif
%else
BuildRequires: vim
%endif
%if %suse_version >= 1030
BuildRequires: libcurl-devel
%else
BuildRequires: curl-devel
%endif
%if 0%{?packman_bs}
BuildRequires: audacious-devel
BuildRequires: libXNVCtrl
%endif
%description
Conky is an advanced, highly configurable system monitor for X.
%if 0%{?packman_bs}
This package is built with support for audacious and nVidia GPUs.
%endif
%if %with_lua_extra
%package cairo
Summary: Cairo Rendering Backend for %{name}
Group: System/Monitoring
Requires: %{name} = %{version}
%description cairo
Conky is an advanced, highly configurable system monitor for X.
This package contains the Cairo rendering backend plugin
for %{name}.
%package imlib2
Summary: Imlib2 Rendering Backend for %{name}
Group: System/Monitoring
Requires: %{name} = %{version}
%description imlib2
Conky is an advanced, highly configurable system monitor for X.
This package contains the Imlib2 rendering backend plugin
for %{name}.
%endif
%package doc
Summary: Documentation for conky
Group: System/Monitoring
%description doc
Conky is an advanced, highly configurable system monitor for X.
This package provides additional documentation about conky in
the following directory:
%{_docdir}/%{name}/
%package vim
Summary: Conky Configuration File Support for Vim
Requires: vim-base
Group: Productivity/Editors/Vi
%description vim
Conky is an advanced, highly configurable system monitor for X.
This package provides syntax highlighting support for conky
configuration files in vim.
%package nano
Summary: Conky Configuration File Support for nano
Requires: nano
Group: Productivity/Editors/Other
%description nano
Conky is an advanced, highly configurable system monitor for X.
This package provides syntax highlighting support for conky
configuration files in nano.
%if 0%{?packman_bs}
%package feature-audacious
Summary: Pseudo Package for %{name} with Audacious Support
Group: System/Monitoring
Requires: %{name} = %{version}-%{release}
%description feature-audacious
This is a pseudo-package that doesn't contain any files but
requires the Packman build of %{name}, which includes support
for the Audacious player.
%package feature-nvidia
Summary: Pseudo Package for %{name} with nVidia Support
Group: System/Monitoring
Requires: %{name} = %{version}-%{release}
%description feature-nvidia
This is a pseudo-package that doesn't contain any files but
requires the Packman build of %{name}, which includes support
for nVidia GPU statistics.
%endif
%prep
%setup -q
%if 0%{?suse_version} >= 1210
%patch0 -p1
%endif
%patch1
for i in AUTHORS ChangeLog; do
%__mv "${i}" "${i}.orig" && \
iconv -f iso8859-1 -t utf8 -o "${i}" "${i}.orig" && \
%__rm "${i}.orig"
done
%build
test -e ./configure || ./autogen.sh
LIBS="-lm"
export LIBS
# to link X11 libs on SLE < 11:
LIBS="$LIBS -L/usr/X11R6/%{_lib}"
LDFLAGS="-lm" \
%configure \
--enable-xft \
--enable-own-window \
--enable-double-buffer \
--enable-x11 \
--enable-xdamage \
--enable-portmon \
--enable-rss \
--enable-eve \
--%{?with_imlib2:enable}%{!?with_imlib2:disable}-imlib2 \
%if 0%{?with_lua}
--enable-lua \
%if %with_lua_extra
--enable-lua-imlib2 \
--enable-lua-cairo \
%endif #with_lua_extra
%else
--disable-lua \
--disable-lua-imlib2 \
--disable-lua-cairo \
%endif #with_lua
--enable-alsa \
--enable-wlan \
%if 0%{?packman_bs}
--enable-audacious=yes \
--enable-nvidia=yes
%else
--enable-audacious=no \
--enable-nvidia=no
%endif #packman_bs
# inotify on SLE < 11 is too old
%if 0%{?sles_version} > 0 && 0%{?sles_version} < 11
%__sed -i '/^#define HAVE_SYS_INOTIFY_H/d' src/config.h
echo '#undef HAVE_SYS_INOTIFY_H' >> src/config.h
%endif
%__make %{?jobs:-j%{jobs}}
%install
%makeinstall
%__install -D -m 0644 "%{SOURCE1}" "%{buildroot}%{_datadir}/applications/%{name}.desktop"
%suse_update_desktop_file -r "%{name}" System Monitor
for feature in audacious nvidia; do
cat<<EOF >README.feature-"$feature"
This package acts as a placeholder for %{name} with
support for ${feature}, to avoid accidential removal
of that functionality through upgrading to a package
from a different repository.
EOF
done
%__install -D -m0644 extras/vim/ftdetect/conkyrc.vim "%{buildroot}%{_datadir}/vim/site/ftdetect/conkyrc.vim"
%__install -D -m0644 extras/vim/syntax/conkyrc.vim "%{buildroot}%{_datadir}/vim/site/syntax/conkyrc.vim"
%__install -D -m0644 extras/nano/conky.nanorc "%{buildroot}%{_datadir}/nano/conky.nanorc"
%__install -d "%{buildroot}%{_docdir}/%{name}"
MAINDOCFILES="$PWD/doc.main.lst"
echo -n >"$MAINDOCFILES"
for f in AUTHORS ChangeLog COPYING NEWS README TODO data/conky.conf; do
ff=$(basename "$f")
%__install -D -m0644 "$f" "%{buildroot}%{_docdir}/%{name}/$ff"
echo "%doc %{_docdir}/%{name}/$ff" >>"$MAINDOCFILES"
done
DOCDOCFILES="$PWD/doc.doc.lst"
echo -n >"$DOCDOCFILES"
for f in doc/*.html; do
ff=$(basename "$f")
%__install -D -m0644 "$f" "%{buildroot}%{_docdir}/%{name}/$ff"
echo "%doc %{_docdir}/%{name}/$ff" >>"$DOCDOCFILES"
done
%if %with_lua_extra
%__rm -rf "%{buildroot}%{_libdir}/conky"/*.{a,la}
%else
%__install -d "%{buildroot}%{_libdir}/conky"
%endif
%clean
%{?buildroot:%__rm -rf "%{buildroot}"}
%files -f doc.main.lst
%defattr(-,root,root)
%doc %dir %{_docdir}/%{name}
%dir %{_sysconfdir}/conky
%config(noreplace) %{_sysconfdir}/conky/conky.conf
%config(noreplace) %{_sysconfdir}/conky/conky_no_x11.conf
%{_bindir}/conky
%doc %{_mandir}/man1/conky.1%{ext_man}
%{_datadir}/applications/%{name}.desktop
%dir %{_libdir}/conky
%if %with_lua_extra
%files cairo
%defattr(-,root,root)
%{_libdir}/conky/libcairo.so
%{_libdir}/conky/libcairo.so.*
%files imlib2
%defattr(-,root,root)
%{_libdir}/conky/libimlib2.so
%{_libdir}/conky/libimlib2.so.*
%endif #with_lua_extra
%files doc -f doc.doc.lst
%defattr(-,root,root)
%doc %dir %{_docdir}/%{name}
%files vim
%defattr(-,root,root)
%dir %{_datadir}/vim/site
%dir %{_datadir}/vim/site/ftdetect
%{_datadir}/vim/site/ftdetect/conkyrc.vim
%dir %{_datadir}/vim/site/syntax
%{_datadir}/vim/site/syntax/conkyrc.vim
%files nano
%defattr(-,root,root)
%dir %{_datadir}/nano
%{_datadir}/nano/conky.nanorc
%if 0%{?packman_bs}
%files feature-audacious
%defattr(-,root,root)
%doc README.feature-audacious
%files feature-nvidia
%defattr(-,root,root)
%doc README.feature-nvidia
%endif
%changelog
++++++ conky-fix-curl-FTBFS.patch ++++++
diff -urN conky-1.8.1.old/src/ccurl_thread.c conky-1.8.1/src/ccurl_thread.c
--- conky-1.8.1.old/src/ccurl_thread.c 2010-10-05 22:29:36.000000000 +0100
+++ conky-1.8.1/src/ccurl_thread.c 2011-09-26 01:12:27.867919138 +0100
@@ -33,7 +33,6 @@
#endif /* DEBUG */
#include