commit conky for openSUSE:Factory

2020-07-28 Thread root 
Hello community,

here is the log from the commit of package conky for openSUSE:Factory checked 
in at 2020-07-28 17:26:10

Comparing /work/SRC/openSUSE:Factory/conky (Old)
 and  /work/SRC/openSUSE:Factory/.conky.new.3592 (New)


Package is "conky"

Tue Jul 28 17:26:10 2020 rev:31 rq:823080 version:1.11.6

Changes:

--- /work/SRC/openSUSE:Factory/conky/conky.changes  2020-04-14 
16:17:44.535401286 +0200
+++ /work/SRC/openSUSE:Factory/.conky.new.3592/conky.changes2020-07-28 
17:27:17.430037624 +0200
@@ -1,0 +2,12 @@
+Tue Jul 28 06:55:32 UTC 2020 - Michael Vetter 
+
+- Update to 1.11.6:
+  * Fix negative RAM usage (#878)
+  * Add nvidia driverversion variable (#889)
+  * properly format PIDs longer than 5 digits
+  * linux: update statistics based on newer kernel interface (#859)
+  * Fix segfault on pulseaudio tunnel sinks 
+  * Added lower_case and upper_case commands
+- Remove fix-negative-memory.patch: upstreamed
+
+---

Old:

  conky-1.11.5.tar.gz
  fix-negative-memory.patch

New:

  conky-1.11.6.tar.gz



Other differences:
--
++ conky.spec ++
--- /var/tmp/diff_new_pack.F4P3og/_old  2020-07-28 17:27:20.342040928 +0200
+++ /var/tmp/diff_new_pack.F4P3og/_new  2020-07-28 17:27:20.342040928 +0200
@@ -25,7 +25,7 @@
 %bcond_withxmms2
 %endif
 Name:   conky
-Version:1.11.5
+Version:1.11.6
 Release:0
 Summary:A System Monitor
 License:GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT
@@ -37,7 +37,6 @@
 Source3:README.SUSE
 Patch1: conky-1.10.1-avoid-git.patch
 Patch2: conky.timestamp.patch
-Patch3: fix-negative-memory.patch
 BuildRequires:  cmake
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  docbook2x

++ conky-1.10.1-avoid-git.patch ++
--- /var/tmp/diff_new_pack.F4P3og/_old  2020-07-28 17:27:20.378040970 +0200
+++ /var/tmp/diff_new_pack.F4P3og/_new  2020-07-28 17:27:20.378040970 +0200
@@ -1,6 +1,6 @@
-diff -urEbw conky-1.11.3/cmake/Conky.cmake conky-1.11.3.new/cmake/Conky.cmake
 conky-1.11.3/cmake/Conky.cmake 2019-02-23 03:12:15.0 +0100
-+++ conky-1.11.3.new/cmake/Conky.cmake 2019-05-27 13:28:10.901251709 +0200
+diff -urEbw conky-1.11.6/cmake/Conky.cmake conky-1.11.6.new/cmake/Conky.cmake
+--- conky-1.11.6/cmake/Conky.cmake 2020-07-27 14:01:52.0 +0200
 conky-1.11.6.new/cmake/Conky.cmake 2020-07-28 09:01:36.198586808 +0200
 @@ -18,7 +18,7 @@
  # along with this program.  If not, see .
  #

++ conky-1.11.5.tar.gz -> conky-1.11.6.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/conky-1.11.5/bin/clang-tidy-diff.py 
new/conky-1.11.6/bin/clang-tidy-diff.py
--- old/conky-1.11.5/bin/clang-tidy-diff.py 2019-08-12 23:53:54.0 
+0200
+++ new/conky-1.11.6/bin/clang-tidy-diff.py 2020-07-27 14:01:52.0 
+0200
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 #===- clang-tidy-diff.py - ClangTidy Diff Checker *- python 
-*--===#
 #
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/conky-1.11.5/bin/run-clang-format.py 
new/conky-1.11.6/bin/run-clang-format.py
--- old/conky-1.11.5/bin/run-clang-format.py2019-08-12 23:53:54.0 
+0200
+++ new/conky-1.11.6/bin/run-clang-format.py2020-07-27 14:01:52.0 
+0200
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """A wrapper script around clang-format, suitable for linting multiple files
 and to use for continuous integration.
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/conky-1.11.5/cmake/Conky.cmake 
new/conky-1.11.6/cmake/Conky.cmake
--- old/conky-1.11.5/cmake/Conky.cmake  2019-08-12 23:53:54.0 +0200
+++ new/conky-1.11.6/cmake/Conky.cmake  2020-07-27 14:01:52.0 +0200
@@ -125,7 +125,7 @@
 # Do version stuff
 set(VERSION_MAJOR "1")
 set(VERSION_MINOR "11")
-set(VERSION_PATCH "5")
+set(VERSION_PATCH "6")
 
 find_program(APP_AWK awk)
 if(NOT APP_AWK)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/conky-1.11.5/cmake/scripts/clang-format-check-changed.py 
new/conky-1.11.6/cmake/scripts/clang-format-check-changed.py
--- old/conky-1.11.5/cmake/scripts/clang-format-check-changed.py
2019-08-12 23:53:54.0 +0200
+++ new/conky-1.11.6/cmake/scripts/clang-format-check-changed.py
2020-07-27 14:01:52.0 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import argparse
 import os
@@ -116,7 +116,7 @@
 
 def run_clang_format(clang_format_bin, changed_files):

commit conky for openSUSE:Factory

2020-04-14 Thread root 
Hello community,

here is the log from the commit of package conky for openSUSE:Factory checked 
in at 2020-04-14 15:11:35

Comparing /work/SRC/openSUSE:Factory/conky (Old)
 and  /work/SRC/openSUSE:Factory/.conky.new.2738 (New)


Package is "conky"

Tue Apr 14 15:11:35 2020 rev:30 rq:793766 version:1.11.5

Changes:

--- /work/SRC/openSUSE:Factory/conky/conky.changes  2020-04-08 
19:56:35.197119140 +0200
+++ /work/SRC/openSUSE:Factory/.conky.new.2738/conky.changes2020-04-14 
16:17:44.535401286 +0200
@@ -1,0 +2,6 @@
+Tue Apr 14 08:17:05 UTC 2020 - Simon Lees 
+
+- Don't require nano with the nano completions, conky shouldn't 
+  pull in nano just for completions.
+
+---



Other differences:
--
++ conky.spec ++
--- /var/tmp/diff_new_pack.x8BUzg/_old  2020-04-14 16:17:45.299401833 +0200
+++ /var/tmp/diff_new_pack.x8BUzg/_new  2020-04-14 16:17:45.299401833 +0200
@@ -125,7 +125,6 @@
 %package -n nano-plugin-conky
 Summary:Conky Configuration File Support for nano
 Group:  Productivity/Text/Editors
-Requires:   nano
 Provides:   conky-nano = %{version}
 Obsoletes:  conky-nano < %{version}

commit conky for openSUSE:Factory

2020-04-08 Thread root 
Hello community,

here is the log from the commit of package conky for openSUSE:Factory checked 
in at 2020-04-08 19:56:34

Comparing /work/SRC/openSUSE:Factory/conky (Old)
 and  /work/SRC/openSUSE:Factory/.conky.new.3248 (New)


Package is "conky"

Wed Apr  8 19:56:34 2020 rev:29 rq:792354 version:1.11.5

Changes:

--- /work/SRC/openSUSE:Factory/conky/conky.changes  2020-02-25 
16:06:29.256525800 +0100
+++ /work/SRC/openSUSE:Factory/.conky.new.3248/conky.changes2020-04-08 
19:56:35.197119140 +0200
@@ -1,0 +2,5 @@
+Fri Apr  3 09:24:53 UTC 2020 - Simon Lees 
+
+- Fix negative ram reporting #877 #878 #909 fix-negative-memory.patch
+
+---
@@ -504,2 +508,0 @@
-
-

New:

  fix-negative-memory.patch



Other differences:
--
++ conky.spec ++
--- /var/tmp/diff_new_pack.SyyqC6/_old  2020-04-08 19:56:36.125119818 +0200
+++ /var/tmp/diff_new_pack.SyyqC6/_new  2020-04-08 19:56:36.125119818 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package tempspec
+# spec file for package conky
 #
 # Copyright (c) 2020 SUSE LLC
 #
@@ -37,6 +37,7 @@
 Source3:README.SUSE
 Patch1: conky-1.10.1-avoid-git.patch
 Patch2: conky.timestamp.patch
+Patch3: fix-negative-memory.patch
 BuildRequires:  cmake
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  docbook2x

++ fix-negative-memory.patch ++
commit 0d449029eaee689da88fcf1d0d572188f4e757d6
Author: Shark-Teeth <50938330+ctrlseque...@users.noreply.github.com>
Date:   Tue Aug 27 13:03:41 2019 -0400

Fix negative RAM usage (#878)

This seems to be causing some issues with clobbering memory values, and
since there is callback functionality already working, this seems
unnecessary.

* Make all calculations local to function

I moved from making the assignments and calculations of certain memory
values to doing the calculations on local variables and assigning them
at the end of the function for update_meminfo().

This is to keep the info.memX variables from having 'intermediary'
values that may give wrong values to other functions if the structure is
read from while the function is currently executing.

As a matter of keeping the variables consistent across function calls, I
removed the zeroing out of certain info struct variables so that if they
are read from, they'll still report a sane value. Since the only change
to the value a direct assignment at the end of the function, they
shouldn't need zeroing out in the first place.

diff --git a/src/linux.cc b/src/linux.cc
index 57760fac..c1e0634e 100644
--- a/src/linux.cc
+++ b/src/linux.cc
@@ -179,11 +179,18 @@ int update_meminfo(void) {
   /* unsigned int a; */
   char buf[256];
 
-  unsigned long long shmem = 0, sreclaimable = 0;
-
-  info.mem = info.memwithbuffers = info.memmax = info.memdirty = info.swap =
-  info.swapfree = info.swapmax = info.bufmem = info.buffers = info.cached =
-  info.memfree = info.memeasyfree = 0;
+  /* With multi-threading, calculations that require
+   * multple steps to reach a final result can cause havok
+   * if the intermediary calculations are directly assigned to the
+   * information struct (they may be read by other functions in the meantime).
+   * These variables keep the calculations local to the function and finish off
+   * the function by assigning the results to the information struct */
+  unsigned long long shmem = 0, sreclaimable = 0, curmem = 0, curbufmem = 0,
+ cureasyfree = 0;
+
+  info.memmax = info.memdirty = info.swap = info.swapfree = info.swapmax =
+  info.memwithbuffers = info.buffers = info.cached = info.memfree =
+  info.memeasyfree = 0;
 
   if (!(meminfo_fp = open_file("/proc/meminfo", ))) { return 0; }
 
@@ -211,8 +218,8 @@ int update_meminfo(void) {
 }
   }
 
-  info.mem = info.memwithbuffers = info.memmax - info.memfree;
-  info.memeasyfree = info.memfree;
+  curmem = info.memwithbuffers = info.memmax - info.memfree;
+  cureasyfree = info.memfree;
   info.swap = info.swapmax - info.swapfree;
 
   /* Reclaimable memory: does not include shared memory, which is part of 
cached
@@ -220,17 +227,24 @@ int update_meminfo(void) {
  Note: when shared memory is swapped out, shmem decreases and swapfree
  decreases - we want this.
   */
-  info.bufmem = (info.cached - shmem) + info.buffers + sreclaimable;
+  curbufmem = (info.cached - shmem) + info.buffers + sreclaimable;
 
-  /* Now (info.mem - info.bufmem) is the *really used* (aka unreclaimable)
+  /* Now ('info.mem' - 'info.bufmem') is the *really used* (aka unreclaimable)
  memory. When this value reaches the size of the physical

commit conky for openSUSE:Factory

2020-02-25 Thread root 
Hello community,

here is the log from the commit of package conky for openSUSE:Factory checked 
in at 2020-02-25 16:05:57

Comparing /work/SRC/openSUSE:Factory/conky (Old)
 and  /work/SRC/openSUSE:Factory/.conky.new.26092 (New)


Package is "conky"

Tue Feb 25 16:05:57 2020 rev:28 rq:778910 version:1.11.5

Changes:

--- /work/SRC/openSUSE:Factory/conky/conky.changes  2019-12-10 
22:42:25.317809144 +0100
+++ /work/SRC/openSUSE:Factory/.conky.new.26092/conky.changes   2020-02-25 
16:06:29.256525800 +0100
@@ -1,0 +2,8 @@
+Tue Feb 25 00:52:12 UTC 2020 - Simon Lees 
+
+- IRC support was not correctly disabled on SLE
+- Re add imlib2, librsvg + cairo support on SLE (we still ship it and I'd like 
to
+  use it in configs) it also means we don't need a second Leap package.
+- Run spec-cleaner
+
+---



Other differences:
--
++ conky.spec ++
--- /var/tmp/diff_new_pack.igN4tS/_old  2020-02-25 16:06:30.464528328 +0100
+++ /var/tmp/diff_new_pack.igN4tS/_new  2020-02-25 16:06:30.468528335 +0100
@@ -1,7 +1,7 @@
 #
-# spec file for package conky
+# spec file for package tempspec
 #
-# Copyright (c) 2019 SUSE LLC
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -53,17 +53,25 @@
 BuildRequires:  ninja
 BuildRequires:  pkgconfig
 BuildRequires:  update-desktop-files
+BuildRequires:  pkgconfig(cairo)
+BuildRequires:  pkgconfig(cairo-xlib)
 BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(imlib2)
 BuildRequires:  pkgconfig(libcurl)
 BuildRequires:  pkgconfig(libical)
 BuildRequires:  pkgconfig(libpulse)
+BuildRequires:  pkgconfig(librsvg-2.0)
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(xdamage)
 BuildRequires:  pkgconfig(xft)
 BuildRequires:  pkgconfig(xinerama)
 Requires:   fontawesome-fonts
+# This is required for imlib2 function properly.
+Requires:   imlib2-loaders
 Provides:   conky-cairo = %{version}
 Obsoletes:  conky-cairo < %{version}
+Provides:   conky-imlib2 = %{version}
+Obsoletes:  conky-imlib2 < %{version}
 %if %{with audacious}
 BuildRequires:  pkgconfig(audacious)
 BuildRequires:  pkgconfig(audclient)
@@ -77,14 +85,6 @@
 Obsoletes:  conky-feature-nvidia < %{version}
 %endif
 %if 0%{?is_opensuse}
-BuildRequires:  pkgconfig(cairo)
-BuildRequires:  pkgconfig(cairo-xlib)
-BuildRequires:  pkgconfig(imlib2)
-BuildRequires:  pkgconfig(librsvg-2.0)
-# This is required for imlib2 function properly.
-Requires:   imlib2-loaders
-Provides:   conky-imlib2 = %{version}
-Obsoletes:  conky-imlib2 < %{version}
 %if 0%{?suse_version} >= 1315
 BuildRequires:  libircclient-devel
 BuildRequires:  libtolua++-5_1-devel
@@ -161,17 +161,14 @@
-DBUILD_IBM=ON \
-DBUILD_ICAL=ON \
-DBUILD_ICONV=ON \
-%if 0%{?is_opensuse}
-DBUILD_LUA_CAIRO=ON \
-DBUILD_IMLIB2=ON \
 -DBUILD_LUA_IMLIB2=ON \
-DBUILD_LUA_RSVG=ON \
+%if 0%{?is_opensuse}
+-DBUILD_IRC=ON \
 %else
-   -DBUILD_LUA_CAIRO=OFF \
-   -DBUILD_IMLIB2=OFF \
--DBUILD_LUA_IMLIB2=OFF \
 -DBUILD_IRC=OFF \
-   -DBUILD_LUA_RSVG=OFF \
 %endif
 %if %{with xmms2}
-DBUILD_XMMS2=ON \
@@ -180,7 +177,6 @@
 %endif
-DBUILD_IOSTATS=ON \
-DBUILD_IPV6=ON \
--DBUILD_IRC=ON \
-DBUILD_MATH=ON \
-DBUILD_MOC=ON \
-DBUILD_MPD=ON \
@@ -259,13 +255,11 @@
 %{_bindir}/conky
 %{_bindir}/conkyconf
 %{_mandir}/man1/conky.1%{?ext_man}
-%if 0%{?is_opensuse}
 %dir %{_libdir}/conky
 %{_libdir}/conky/libcairo.so
-%{_libdir}/conky/librsvg.so
 %{_libdir}/conky/libcairo_imlib2_helper.so
 %{_libdir}/conky/libimlib2.so
-%endif
+%{_libdir}/conky/librsvg.so
 %{_datadir}/applications/conky.desktop
 %{_datadir}/icons/hicolor/scalable/apps/conky-logomark-violet.svg
 %{_libdir}/libtcp-portmon.so

commit conky for openSUSE:Factory

2019-12-10 Thread root 
Hello community,

here is the log from the commit of package conky for openSUSE:Factory checked 
in at 2019-12-10 22:42:12

Comparing /work/SRC/openSUSE:Factory/conky (Old)
 and  /work/SRC/openSUSE:Factory/.conky.new.4691 (New)


Package is "conky"

Tue Dec 10 22:42:12 2019 rev:27 rq:755405 version:1.11.5

Changes:

--- /work/SRC/openSUSE:Factory/conky/conky.changes  2019-08-20 
11:00:19.732644560 +0200
+++ /work/SRC/openSUSE:Factory/.conky.new.4691/conky.changes2019-12-10 
22:42:25.317809144 +0100
@@ -1,0 +2,5 @@
+Mon Dec  9 22:10:54 UTC 2019 - Christophe Giboudeaux 
+
+- Remove the xmms2 dependency on openSUSE Factory.
+
+---



Other differences:
--
++ conky.spec ++
--- /var/tmp/diff_new_pack.HzETyQ/_old  2019-12-10 22:42:27.941808170 +0100
+++ /var/tmp/diff_new_pack.HzETyQ/_new  2019-12-10 22:42:27.969808160 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package conky
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,14 +12,14 @@
 # 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/
 #
 
 
 %bcond_withaudacious
 %bcond_withcmus
 %bcond_withlibXNVCtrl
-%if 0%{?is_opensuse}
+%if 0%{?is_opensuse} && 0%{?suse_version} <= 1500
 %bcond_without xmms2
 %else
 %bcond_withxmms2

commit conky for openSUSE:Factory

2019-08-20 Thread root 
Hello community,

here is the log from the commit of package conky for openSUSE:Factory checked 
in at 2019-08-20 11:00:10

Comparing /work/SRC/openSUSE:Factory/conky (Old)
 and  /work/SRC/openSUSE:Factory/.conky.new.22127 (New)


Package is "conky"

Tue Aug 20 11:00:10 2019 rev:26 rq:724715 version:1.11.5

Changes:

--- /work/SRC/openSUSE:Factory/conky/conky.changes  2019-07-02 
10:39:31.850685444 +0200
+++ /work/SRC/openSUSE:Factory/.conky.new.22127/conky.changes   2019-08-20 
11:00:19.732644560 +0200
@@ -1,0 +2,12 @@
+Tue Aug 20 07:10:49 UTC 2019 - mvet...@suse.com
+
+- Update to 1.11.5:
+  * Fix graph leak and the uninitialized values (#858) 
+  * Fix `link_qual_max` getting updated with bad value 
+  * Fix heap use-after-free with setlocale 
+  * Refactorings and cleanups
+  * For details see:
+https://github.com/brndnmtthws/conky/compare/v1.11.4...v1.11.5
+- Remove conky-memory-leak-fix.patch: upstreamed
+
+---

Old:

  conky-1.11.4.tar.gz
  conky-memory-leak-fix.patch

New:

  conky-1.11.5.tar.gz



Other differences:
--
++ conky.spec ++
--- /var/tmp/diff_new_pack.1kb7sW/_old  2019-08-20 11:00:20.444644412 +0200
+++ /var/tmp/diff_new_pack.1kb7sW/_new  2019-08-20 11:00:20.448644411 +0200
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via https://bugs.opensuse.org/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
 
@@ -25,7 +25,7 @@
 %bcond_withxmms2
 %endif
 Name:   conky
-Version:1.11.4
+Version:1.11.5
 Release:0
 Summary:A System Monitor
 License:GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT
@@ -37,7 +37,6 @@
 Source3:README.SUSE
 Patch1: conky-1.10.1-avoid-git.patch
 Patch2: conky.timestamp.patch
-Patch3: conky-memory-leak-fix.patch
 BuildRequires:  cmake
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  docbook2x

++ conky-1.11.4.tar.gz -> conky-1.11.5.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/conky-1.11.4/cmake/Conky.cmake 
new/conky-1.11.5/cmake/Conky.cmake
--- old/conky-1.11.4/cmake/Conky.cmake  2019-06-23 16:50:35.0 +0200
+++ new/conky-1.11.5/cmake/Conky.cmake  2019-08-12 23:53:54.0 +0200
@@ -125,7 +125,7 @@
 # Do version stuff
 set(VERSION_MAJOR "1")
 set(VERSION_MINOR "11")
-set(VERSION_PATCH "4")
+set(VERSION_PATCH "5")
 
 find_program(APP_AWK awk)
 if(NOT APP_AWK)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/conky-1.11.4/cmake/ConkyPlatformChecks.cmake 
new/conky-1.11.5/cmake/ConkyPlatformChecks.cmake
--- old/conky-1.11.4/cmake/ConkyPlatformChecks.cmake2019-06-23 
16:50:35.0 +0200
+++ new/conky-1.11.5/cmake/ConkyPlatformChecks.cmake2019-08-12 
23:53:54.0 +0200
@@ -216,6 +216,7 @@
 endif(BUILD_HTTP)
 
 if(BUILD_NCURSES)
+  set(CURSES_NEED_NCURSES TRUE)
   include(FindCurses)
   if(NOT CURSES_FOUND)
 message(FATAL_ERROR "Unable to find ncurses library")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/conky-1.11.4/src/common.cc 
new/conky-1.11.5/src/common.cc
--- old/conky-1.11.4/src/common.cc  2019-06-23 16:50:35.0 +0200
+++ new/conky-1.11.5/src/common.cc  2019-08-12 23:53:54.0 +0200
@@ -293,12 +293,6 @@
 
   /* if you registered a callback with conky::register_cb, this will run it */
   conky::run_all_callbacks();
-
-  /* XXX: move the following into the update_meminfo() functions? */
-  if (no_buffers.get(*state)) {
-info.mem -= info.bufmem;
-info.memeasyfree += info.bufmem;
-  }
 }
 
 /* Ohkie to return negative values for temperatures */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/conky-1.11.4/src/linux.cc 
new/conky-1.11.5/src/linux.cc
--- old/conky-1.11.4/src/linux.cc   2019-06-23 16:50:35.0 +0200
+++ new/conky-1.11.5/src/linux.cc   2019-08-12 23:53:54.0 +0200
@@ -133,10 +133,10 @@
   } else
 #endif
   {
-static int rep = 0;
+static int reported = 0;
 FILE *fp;
 
-if (!(fp = open_file("/proc/uptime", ))) {
+if (!(fp = open_file("/proc/uptime", ))) {
   info.uptime = 0.0;
   return 0;
 }
@@ -174,7 +174,7 @@
 
 int update_meminfo(void) {
   FILE *meminfo_fp;
-  static int rep = 0;
+  static int reported = 0;
 
   /* unsigned int a; */
   char buf[256];
@@ -185,7 +185,7 @@
   info.swapfree = info.swapmax = info.bufmem = info.buffers = info.cached =
   info.memfree =

commit conky for openSUSE:Factory

2019-07-02 Thread root 
Hello community,

here is the log from the commit of package conky for openSUSE:Factory checked 
in at 2019-07-02 10:39:29

Comparing /work/SRC/openSUSE:Factory/conky (Old)
 and  /work/SRC/openSUSE:Factory/.conky.new.4615 (New)


Package is "conky"

Tue Jul  2 10:39:29 2019 rev:25 rq:712925 version:1.11.4

Changes:

--- /work/SRC/openSUSE:Factory/conky/conky.changes  2019-06-24 
21:54:03.712138397 +0200
+++ /work/SRC/openSUSE:Factory/.conky.new.4615/conky.changes2019-07-02 
10:39:31.850685444 +0200
@@ -1,0 +2,5 @@
+Fri Jun 28 09:31:44 UTC 2019 - Dead Mozay 
+
+- Add conky-memory-leak-fix.patch Fixes a memory leak in Conky 
+
+---

New:

  conky-memory-leak-fix.patch



Other differences:
--
++ conky.spec ++
--- /var/tmp/diff_new_pack.dGcWy2/_old  2019-07-02 10:39:32.470686388 +0200
+++ /var/tmp/diff_new_pack.dGcWy2/_new  2019-07-02 10:39:32.470686388 +0200
@@ -12,7 +12,7 @@
 # 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/
 #
 
 
@@ -37,6 +37,7 @@
 Source3:README.SUSE
 Patch1: conky-1.10.1-avoid-git.patch
 Patch2: conky.timestamp.patch
+Patch3: conky-memory-leak-fix.patch
 BuildRequires:  cmake
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  docbook2x
@@ -50,6 +51,7 @@
 BuildRequires:  libxslt-tools
 BuildRequires:  lua53-devel
 BuildRequires:  ncurses-devel
+BuildRequires:  ninja
 BuildRequires:  pkgconfig
 BuildRequires:  update-desktop-files
 BuildRequires:  pkgconfig(glib-2.0)
@@ -138,7 +140,7 @@
 %autopatch -p1
 
 %build
-%cmake \
+%cmake -G Ninja \
-DBUILD_APCUPSD=ON \
-DBUILD_ARGB=ON \
 %if %{with audacious}
@@ -205,7 +207,7 @@
-DOWN_WINDOW=ON \
-DBUILD_XMMS2=OFF
 
-%cmake_build
+%ninja_build
 
 # build doc
 cd ../doc
@@ -224,7 +226,7 @@
 gzip conky.1
 
 %install
-%cmake_install
+%ninja_install -C build
 
 # not doc
 rm -rf %{buildroot}%{_datadir}/doc/%{name}-%{version}

++ conky-memory-leak-fix.patch ++
diff --git a/src/specials.cc b/src/specials.cc
index 70ac491b..3ddcf505 100644
--- a/src/specials.cc
+++ b/src/specials.cc
@@ -508,7 +508,7 @@ graph_buf_end:
 }
 
 double *copy_graph(double *original_graph, int graph_width) {
-  double *new_graph = new double[graph_width];
+  double *new_graph = static_cast(malloc(graph_width * 
sizeof(double)));
 
   memcpy(new_graph, original_graph, graph_width * sizeof(double));
 
@@ -517,7 +517,7 @@ double *copy_graph(double *original_graph, int graph_width) 
{
 
 double *retrieve_graph(int graph_id, int graph_width) {
   if (graphs.find(graph_id) == graphs.end()) {
-return new double[graph_width];
+return static_cast(calloc(1, graph_width * sizeof(double)));
   } else {
 return copy_graph(graphs[graph_id], graph_width);
   }
@@ -527,7 +527,10 @@ void store_graph(int graph_id, struct special_t *s) {
   if (s->graph == nullptr) {
 graphs[graph_id] = nullptr;
   } else {
-graphs[graph_id] = copy_graph(s->graph, s->graph_width);
+if (graphs.find(graph_id)!=graphs.end()) {
+  free(graphs[graph_id]);
+}
+graphs[graph_id] = s->graph;
   }
 }
 
@@ -572,6 +575,7 @@ void new_graph(struct text_object *obj, char *buf, int 
buf_max_size,
 }
 s->graph = graph;
 s->graph_allocated = s->graph_width;
+graphs[g->id] = graph;
   }
   s->height = g->height;
   s->first_colour = adjust_colours(g->first_colour);

commit conky for openSUSE:Factory

2019-06-24 Thread root 
Hello community,

here is the log from the commit of package conky for openSUSE:Factory checked 
in at 2019-06-24 21:53:08

Comparing /work/SRC/openSUSE:Factory/conky (Old)
 and  /work/SRC/openSUSE:Factory/.conky.new.4615 (New)


Package is "conky"

Mon Jun 24 21:53:08 2019 rev:24 rq:711640 version:1.11.4

Changes:

--- /work/SRC/openSUSE:Factory/conky/conky.changes  2018-03-08 
10:58:03.744114871 +0100
+++ /work/SRC/openSUSE:Factory/.conky.new.4615/conky.changes2019-06-24 
21:54:03.712138397 +0200
@@ -1,0 +2,34 @@
+Mon Jun 24 06:07:34 UTC 2019 - mvet...@suse.com
+
+- Update to 1.11.4:
+  * Added option to disable redraw on desktop change 
+  * Synchronize access to kstat 
+  * Fix various issues
+  * For details see:
+https://github.com/brndnmtthws/conky/compare/v1.11.3...v1.11.4
+
+---
+Tue May 28 08:41:38 UTC 2019 - Simon Lees 
+
+- Clean up cmake macro's and paramaters further
+- Drop unneeded conky-1.10.4-ncurses.patch
+
+---
+Tue May 28 06:33:42 UTC 2019 - Jan Engelhardt 
+
+- Use %cmake macro to resolve FIXMEs.
+- Trim bias from descriptions.
+
+---
+Mon May 27 11:37:12 UTC 2019 - mvet...@suse.com
+
+- Update to 1.11.3:
+  * Allow hwmon command to accept hwmon device name
+  * For details see:
+https://github.com/brndnmtthws/conky/compare/v1.11.2...v1.11.3
+- Update conky.timestamp.patch and conky-1.10.1-avoid-git.patch
+- Remove libical3.patch: upstreamed
+- Use lua 5.3
+- Install desktop file
+
+---

Old:

  conky-1.10.4-ncurses.patch
  conky-1.10.8.tar.gz
  libical3.patch

New:

  conky-1.11.4.tar.gz



Other differences:
--
++ conky.spec ++
--- /var/tmp/diff_new_pack.HsNCXZ/_old  2019-06-24 21:54:04.252138813 +0200
+++ /var/tmp/diff_new_pack.HsNCXZ/_new  2019-06-24 21:54:04.260138819 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package conky
 #
-# 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
@@ -24,36 +24,33 @@
 %else
 %bcond_withxmms2
 %endif
-
 Name:   conky
-Version:1.10.8
+Version:1.11.4
 Release:0
-Summary:Lightweight System Monitor
+Summary:A System Monitor
 License:GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT
 Group:  System/Monitoring
-Url:https://github.com/brndnmtthws/conky
+URL:https://github.com/brndnmtthws/conky
 Source: 
https://github.com/brndnmtthws/conky/archive/v%{version}.tar.gz#/conky-%{version}.tar.gz
 Source1:conkyconf.SUSE
 Source2:conky.conf.SUSE
 Source3:README.SUSE
 Patch1: conky-1.10.1-avoid-git.patch
-# our ncurses doesn't supply a .pc file
-Patch2: conky-1.10.4-ncurses.patch
-Patch3: conky.timestamp.patch
-Patch4: libical3.patch
+Patch2: conky.timestamp.patch
 BuildRequires:  cmake
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  docbook2x
 BuildRequires:  freetype2-devel
 BuildRequires:  gcc-c++
+BuildRequires:  hicolor-icon-theme
 BuildRequires:  libiw-devel
 BuildRequires:  libmicrohttpd-devel
 BuildRequires:  libmysqld-devel
 BuildRequires:  libtool
 BuildRequires:  libxslt-tools
-BuildRequires:  lua51-devel
+BuildRequires:  lua53-devel
 BuildRequires:  ncurses-devel
-BuildRequires:  pkg-config
+BuildRequires:  pkgconfig
 BuildRequires:  update-desktop-files
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(libcurl)
@@ -63,6 +60,9 @@
 BuildRequires:  pkgconfig(xdamage)
 BuildRequires:  pkgconfig(xft)
 BuildRequires:  pkgconfig(xinerama)
+Requires:   fontawesome-fonts
+Provides:   conky-cairo = %{version}
+Obsoletes:  conky-cairo < %{version}
 %if %{with audacious}
 BuildRequires:  pkgconfig(audacious)
 BuildRequires:  pkgconfig(audclient)
@@ -75,53 +75,35 @@
 Provides:   conky-feature-nvidia = %{version}
 Obsoletes:  conky-feature-nvidia < %{version}
 %endif
-Provides:   conky-cairo = %{version}
-Obsoletes:  conky-cairo < %{version}
 %if 0%{?is_opensuse}
+BuildRequires:  pkgconfig(cairo)
+BuildRequires:  pkgconfig(cairo-xlib)
+BuildRequires:  pkgconfig(imlib2)
+BuildRequires:  pkgconfig(librsvg-2.0)
+# This is required for imlib2 function properly.
+Requires:   imlib2-loaders
+Provides:   conky-imlib2 = %{version}
+Obsoletes:  conky-imlib2 < %{version}
 %if 0%{?suse_version} >= 1315
 BuildRequires:

commit conky for openSUSE:Factory

2018-03-08 Thread root 
Hello community,

here is the log from the commit of package conky for openSUSE:Factory checked 
in at 2018-03-08 10:58:02

Comparing /work/SRC/openSUSE:Factory/conky (Old)
 and  /work/SRC/openSUSE:Factory/.conky.new (New)


Package is "conky"

Thu Mar  8 10:58:02 2018 rev:23 rq:583730 version:1.10.8

Changes:

--- /work/SRC/openSUSE:Factory/conky/conky.changes  2018-01-02 
16:35:12.388098187 +0100
+++ /work/SRC/openSUSE:Factory/.conky.new/conky.changes 2018-03-08 
10:58:03.744114871 +0100
@@ -1,0 +2,21 @@
+Mon Mar  5 08:46:59 UTC 2018 - adam.ma...@suse.de
+
+- New upstream version 1.10.8
+  + fixed segfault when HOME is unset
+  + Fix segfault when kernel reports non-sequential SMP CPU indices
+  + Provide support to query active port on PulseAudio's default sink
+  + enable persistent view of irc messages
+  + Fix SEGV in a CPU hotplug environment
+  + GPLv3 is the default license
+  + Support multiple include paths for libbircclient
+- conky-1.10.4-ncurses.patch: comment out - doesn't seem to be needed
+- conky-1.10.0-libircclient.patch: removed, upstreamed.
+- conky.luamm.patch: removed, upstreamed.
+- libical3.patch: adds support for libical 3.x
+
+---
+Sat Mar  3 11:55:29 UTC 2018 - jeng...@inai.de
+
+- Explicitly request old libical
+
+---

Old:

  conky-1.10.0-libircclient.patch
  conky-1.10.6.tar.gz
  conky.luamm.patch

New:

  conky-1.10.8.tar.gz
  libical3.patch



Other differences:
--
++ conky.spec ++
--- /var/tmp/diff_new_pack.42jQpc/_old  2018-03-08 10:58:04.528086533 +0100
+++ /var/tmp/diff_new_pack.42jQpc/_new  2018-03-08 10:58:04.536086244 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package conky
 #
-# Copyright (c) 2017 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
@@ -26,28 +26,26 @@
 %endif
 
 Name:   conky
-Version:1.10.6
+Version:1.10.8
 Release:0
 Summary:Lightweight System Monitor
-License:GPL-3.0+ and LGPL-3.0+ and MIT
+License:GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT
 Group:  System/Monitoring
 Url:https://github.com/brndnmtthws/conky
-Source: 
https://github.com/brndnmtthws/conky/archive/v%{version}/conky-%{version}.tar.gz
+Source: 
https://github.com/brndnmtthws/conky/archive/v%{version}.tar.gz#/conky-%{version}.tar.gz
 Source1:conkyconf.SUSE
 Source2:conky.conf.SUSE
 Source3:README.SUSE
-Patch0: conky-1.10.0-libircclient.patch
 Patch1: conky-1.10.1-avoid-git.patch
 # our ncurses doesn't supply a .pc file
 Patch2: conky-1.10.4-ncurses.patch
 Patch3: conky.timestamp.patch
-Patch4: conky.luamm.patch
+Patch4: libical3.patch
 BuildRequires:  cmake
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  docbook2x
 BuildRequires:  freetype2-devel
 BuildRequires:  gcc-c++
-BuildRequires:  libical-devel
 BuildRequires:  libiw-devel
 BuildRequires:  libmicrohttpd-devel
 BuildRequires:  libmysqld-devel
@@ -59,6 +57,7 @@
 BuildRequires:  update-desktop-files
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(libcurl)
+BuildRequires:  pkgconfig(libical)
 BuildRequires:  pkgconfig(libpulse)
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(xdamage)
@@ -154,11 +153,8 @@
 
 %prep
 %setup -q
-%if 0%{?is_opensuse}
-%patch0 -p1
-%endif
 %patch1 -p1
-%patch2 -p1
+#%patch2 -p1
 %patch3 -p1
 %patch4 -p1
 

++ conky-1.10.6.tar.gz -> conky-1.10.8.tar.gz ++
 4616 lines of diff (skipped)

++ libical3.patch ++
Author: Adam Majer 
Date: Mon Mar  5 10:59:09 CET 2018
PR: https://github.com/brndnmtthws/conky/pull/465

This patch adds support for libical 3.x

Index: conky-1.10.8/src/ical.cc
===
--- conky-1.10.8.orig/src/ical.cc
+++ conky-1.10.8/src/ical.cc
@@ -49,13 +49,13 @@ struct ical_event *add_event(struct ical
icaltimetype start;
 
start = icalcomponent_get_dtstart(new_ev);
-   if(icaltime_compare(start, icaltime_from_timet(time(NULL), 0)) <= 0) {
+   if(icaltime_compare(start, icaltime_from_timet_with_zone(time(NULL), 0, 
NULL)) <= 0) {
icalproperty *rrule = icalcomponent_get_first_property(new_ev, 
ICAL_RRULE_PROPERTY);
if(rrule) {
icalrecur_iterator* ritr = 
icalrecur_iterator_new(icalproperty_get_rrule(rrule), start);

commit conky for openSUSE:Factory

2018-01-02 Thread root 
Hello community,

here is the log from the commit of package conky for openSUSE:Factory checked 
in at 2018-01-02 16:35:10

Comparing /work/SRC/openSUSE:Factory/conky (Old)
 and  /work/SRC/openSUSE:Factory/.conky.new (New)


Package is "conky"

Tue Jan  2 16:35:10 2018 rev:22 rq:561066 version:1.10.6

Changes:

--- /work/SRC/openSUSE:Factory/conky/conky.changes  2017-12-11 
18:56:49.281651770 +0100
+++ /work/SRC/openSUSE:Factory/.conky.new/conky.changes 2018-01-02 
16:35:12.388098187 +0100
@@ -1,0 +2,10 @@
+Tue Dec 12 09:29:41 UTC 2017 - pgaj...@suse.com
+
+- fix build for SLE 15: buildrequire also Xdamage
+- make more clear when xmms2 support is compiled in
+- use pkgconfig()-style buildrequires for X libraries, package
+  is build for suse_version >= 1315, so they are defined
+- fix 0%{is_opensuse} to 0%{?is_opensuse} on one placeand remove 
+  is_opensuse definition, which is in my opinion useless afterwards
+
+---



Other differences:
--
++ conky.spec ++
--- /var/tmp/diff_new_pack.03aqUL/_old  2018-01-02 16:35:13.131850165 +0100
+++ /var/tmp/diff_new_pack.03aqUL/_new  2018-01-02 16:35:13.131850165 +0100
@@ -19,8 +19,11 @@
 %bcond_withaudacious
 %bcond_withcmus
 %bcond_withlibXNVCtrl
+%if 0%{?is_opensuse}
 %bcond_without xmms2
-%{!?is_opensuse: %global is_opensuse 0}
+%else
+%bcond_withxmms2
+%endif
 
 Name:   conky
 Version:1.10.6
@@ -54,16 +57,13 @@
 BuildRequires:  ncurses-devel
 BuildRequires:  pkg-config
 BuildRequires:  update-desktop-files
-%if 0%{?suse_version} <= 1320
-BuildRequires: xorg-x11-devel
-%else
-BuildRequires:  libXft-devel
-BuildRequires: libXinerama-devel
-%endif
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(libcurl)
 BuildRequires:  pkgconfig(libpulse)
 BuildRequires:  pkgconfig(libxml-2.0)
+BuildRequires:  pkgconfig(xdamage)
+BuildRequires:  pkgconfig(xft)
+BuildRequires:  pkgconfig(xinerama)
 %if %{with audacious}
 BuildRequires:  pkgconfig(audacious)
 BuildRequires:  pkgconfig(audclient)
@@ -113,11 +113,9 @@
 %if %{with libXNVCtrl}
 - nVidia GPUs
 %endif
-%if 0%{?is_opensuse}
 %if %{with xmms2}
 - xmms2
 %endif
-%endif
 
 %package doc
 Summary:Documentation for conky
@@ -190,15 +188,16 @@
 -DBUILD_IRC=OFF \
 %endif
-DBUILD_LUA_RSVG=ON \
-%if %{with xmms2}
-   -DBUILD_XMMS2=ON \
-%endif
 %else
-DBUILD_LUA_CAIRO=OFF \
-DBUILD_IMLIB2=OFF \
 -DBUILD_LUA_IMLIB2=OFF \
 -DBUILD_IRC=OFF \
-DBUILD_LUA_RSVG=OFF \
+%endif
+%if %{with xmms2}
+   -DBUILD_XMMS2=ON \
+%else
-DBUILD_XMMS2=OFF \
 %endif
-DBUILD_IOSTATS=ON \
@@ -291,7 +290,7 @@
 %{_bindir}/conky
 %{_bindir}/conkyconf
 %doc %{_mandir}/man1/conky.1%{ext_man}
-%if 0%{is_opensuse}
+%if 0%{?is_opensuse}
 %dir %{_libdir}/conky
 %{_libdir}/conky/libcairo.so
 %{_libdir}/conky/librsvg.so

commit conky for openSUSE:Factory

2017-12-11 Thread root 
Hello community,

here is the log from the commit of package conky for openSUSE:Factory checked 
in at 2017-12-11 18:56:47

Comparing /work/SRC/openSUSE:Factory/conky (Old)
 and  /work/SRC/openSUSE:Factory/.conky.new (New)


Package is "conky"

Mon Dec 11 18:56:47 2017 rev:21 rq:555669 version:1.10.6

Changes:

--- /work/SRC/openSUSE:Factory/conky/conky.changes  2017-11-22 
11:21:56.870386619 +0100
+++ /work/SRC/openSUSE:Factory/.conky.new/conky.changes 2017-12-11 
18:56:49.281651770 +0100
@@ -1,0 +2,11 @@
+Sun Dec 10 13:21:35 UTC 2017 - i...@marguerite.su
+
+- use modular Xorg libaries if possible
+- make suse is_opensuse is defined
+
+---
+Wed Nov 29 13:24:16 UTC 2017 - pgaj...@suse.com
+
+- build with SLE 15
+
+---



Other differences:
--
++ conky.spec ++
--- /var/tmp/diff_new_pack.qzLLj7/_old  2017-12-11 18:56:49.829625669 +0100
+++ /var/tmp/diff_new_pack.qzLLj7/_new  2017-12-11 18:56:49.833625479 +0100
@@ -20,6 +20,7 @@
 %bcond_withcmus
 %bcond_withlibXNVCtrl
 %bcond_without xmms2
+%{!?is_opensuse: %global is_opensuse 0}
 
 Name:   conky
 Version:1.10.6
@@ -32,7 +33,7 @@
 Source1:conkyconf.SUSE
 Source2:conky.conf.SUSE
 Source3:README.SUSE
-Patch:  conky-1.10.0-libircclient.patch
+Patch0: conky-1.10.0-libircclient.patch
 Patch1: conky-1.10.1-avoid-git.patch
 # our ncurses doesn't supply a .pc file
 Patch2: conky-1.10.4-ncurses.patch
@@ -52,20 +53,17 @@
 BuildRequires:  lua51-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  pkg-config
-BuildRequires:  pkgconfig(cairo)
-BuildRequires:  pkgconfig(cairo-xlib)
+BuildRequires:  update-desktop-files
+%if 0%{?suse_version} <= 1320
+BuildRequires: xorg-x11-devel
+%else
+BuildRequires:  libXft-devel
+BuildRequires: libXinerama-devel
+%endif
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(libcurl)
 BuildRequires:  pkgconfig(libpulse)
-BuildRequires:  pkgconfig(librsvg-2.0)
 BuildRequires:  pkgconfig(libxml-2.0)
-%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315
-BuildRequires:  libtolua++-5_1-devel
-%else
-BuildRequires:  tolua++
-%endif
-BuildRequires:  update-desktop-files
-BuildRequires:  xorg-x11-devel
 %if %{with audacious}
 BuildRequires:  pkgconfig(audacious)
 BuildRequires:  pkgconfig(audclient)
@@ -78,14 +76,22 @@
 Provides:   conky-feature-nvidia = %{version}
 Obsoletes:  conky-feature-nvidia < %{version}
 %endif
-%if %{with xmms2}
-BuildRequires:  pkgconfig(xmms2-client)
-%endif
 Provides:   conky-cairo = %{version}
 Obsoletes:  conky-cairo < %{version}
-%if 0%{?suse_version} != 1315 || 0%{?is_opensuse} == 1
+%if 0%{?is_opensuse}
+%if 0%{?suse_version} >= 1315
 BuildRequires:  libircclient-devel
+BuildRequires:  libtolua++-5_1-devel
+%else
+BuildRequires:  tolua++
+%endif
+BuildRequires:  pkgconfig(cairo)
+BuildRequires:  pkgconfig(cairo-xlib)
 BuildRequires:  pkgconfig(imlib2)
+BuildRequires:  pkgconfig(librsvg-2.0)
+%if %{with xmms2}
+BuildRequires:  pkgconfig(xmms2-client)
+%endif
 # This is required for imlib2 function properly.
 Requires:   imlib2-loaders
 Provides:   conky-imlib2 = %{version}
@@ -107,9 +113,11 @@
 %if %{with libXNVCtrl}
 - nVidia GPUs
 %endif
+%if 0%{?is_opensuse}
 %if %{with xmms2}
 - xmms2
 %endif
+%endif
 
 %package doc
 Summary:Documentation for conky
@@ -122,7 +130,7 @@
 
 %package -n vim-plugin-conky
 Summary:Conky Configuration File Support for Vim
-Group:  Productivity/Editors/Vi
+Group:  Productivity/Text/Editors
 Requires:   vim-base
 Provides:   conky-vim = %{version}
 Obsoletes:  conky-vim < %{version}
@@ -135,7 +143,7 @@
 
 %package -n nano-plugin-conky
 Summary:Conky Configuration File Support for nano
-Group:  Productivity/Editors/Other
+Group:  Productivity/Text/Editors
 Requires:   nano
 Provides:   conky-nano = %{version}
 Obsoletes:  conky-nano < %{version}
@@ -148,7 +156,9 @@
 
 %prep
 %setup -q
-%patch -p1
+%if 0%{?is_opensuse}
+%patch0 -p1
+%endif
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@@ -170,20 +180,29 @@
-DBUILD_IBM=ON \
-DBUILD_ICAL=ON \
-DBUILD_ICONV=ON \
-%if 0%{?suse_version} == 1315 && 0%{?is_opensuse} != 1
-   -DBUILD_IMLIB2=OFF \
--DBUILD_LUA_IMLIB2=OFF \
-%else
+%if 0%{?is_opensuse}
+   -DBUILD_LUA_CAIRO=ON \
-DBUILD_IMLIB2=ON \
 -DBUILD_LUA_IMLIB2=ON \
-%endif
-   -DBUILD_IOSTATS=ON \
-   -DBUILD_IPV6=ON \
-%if 0%{?suse_version} > 1320
+%if 0%{?suse_version} >= 1315
-DBUILD_IRC=ON \
 %else
 -DBUILD_IRC=OFF \
 %endif
+

commit conky for openSUSE:Factory

2017-11-22 Thread root 
Hello community,

here is the log from the commit of package conky for openSUSE:Factory checked 
in at 2017-11-22 11:21:50

Comparing /work/SRC/openSUSE:Factory/conky (Old)
 and  /work/SRC/openSUSE:Factory/.conky.new (New)


Package is "conky"

Wed Nov 22 11:21:50 2017 rev:20 rq:542824 version:1.10.6

Changes:

--- /work/SRC/openSUSE:Factory/conky/conky.changes  2017-08-01 
09:25:21.983806473 +0200
+++ /work/SRC/openSUSE:Factory/.conky.new/conky.changes 2017-11-22 
11:21:56.870386619 +0100
@@ -1,0 +2,9 @@
+Wed Nov 15 11:59:18 UTC 2017 - pgaj...@suse.com
+
+- change default system configuration
+- add /usr/bin/conkyconf
+- add README.SUSE
+- require fontawesome-fonts for icons
+- fate: #323638
+
+---

New:

  README.SUSE
  conky.conf.SUSE
  conkyconf.SUSE



Other differences:
--
++ conky.spec ++
--- /var/tmp/diff_new_pack.tE6gNv/_old  2017-11-22 11:21:58.354332697 +0100
+++ /var/tmp/diff_new_pack.tE6gNv/_new  2017-11-22 11:21:58.354332697 +0100
@@ -29,6 +29,9 @@
 Group:  System/Monitoring
 Url:https://github.com/brndnmtthws/conky
 Source: 
https://github.com/brndnmtthws/conky/archive/v%{version}/conky-%{version}.tar.gz
+Source1:conkyconf.SUSE
+Source2:conky.conf.SUSE
+Source3:README.SUSE
 Patch:  conky-1.10.0-libircclient.patch
 Patch1: conky-1.10.1-avoid-git.patch
 # our ncurses doesn't supply a .pc file
@@ -88,6 +91,7 @@
 Provides:   conky-imlib2 = %{version}
 Obsoletes:  conky-imlib2 < %{version}
 %endif
+Requires:   fontawesome-fonts
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -248,6 +252,9 @@
 install -m 0644 doc/conky.1.gz %{buildroot}%{_mandir}/man1
 # config
 mkdir -p %{buildroot}%{_sysconfdir}/conky
+install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/conky/conky.conf
+install -m 755 %{SOURCE1} %{buildroot}%{_bindir}/conkyconf
+cp %{SOURCE3} .
 sed -i "1d" extras/convert.lua
 sed -i "1s/^/#!\/usr\/bin\/lua5.1\\n/" extras/convert.lua
 install -m 0755 extras/convert.lua %{buildroot}%{_sysconfdir}/conky/
@@ -262,12 +269,13 @@
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS ChangeLog COPYING NEWS README.md TODO
+%doc AUTHORS ChangeLog COPYING NEWS README.md TODO README.SUSE
 %dir %{_sysconfdir}/conky
 %{_sysconfdir}/conky/convert.lua
 %config(noreplace) %{_sysconfdir}/conky/conky.conf
 %config(noreplace) %{_sysconfdir}/conky/conky_no_x11.conf
 %{_bindir}/conky
+%{_bindir}/conkyconf
 %doc %{_mandir}/man1/conky.1%{ext_man}
 %dir %{_libdir}/conky
 %{_libdir}/conky/libcairo.so

++ README.SUSE ++
Dear SUSE user,

conky is highly customizable monitor. It has to
be configured for given system, though. Please
refer to conky documentation at:

https://github.com/brndnmtthws/conky
http://conky.sourceforge.net/config_settings.html
http://conky.sourceforge.net/variables.html

As a start, you can generate basic configuration
with `conkyconf' script provided with the package.

See conkyconf --help.
++ conky.conf.SUSE ++
conky.config = {
background = true,
update_interval = 1.5,
cpu_avg_samples = 2,
net_avg_samples = 2,
out_to_console = false,
override_utf8_locale = true,
double_buffer = true,
no_buffers = true,
text_buffer_size = 32768,
imlib_cache_size = 0,
own_window = true,
own_window_type = 'desktop',
own_window_argb_visual = true,
own_window_argb_value = 120,
own_window_hints = 'undecorated,below,sticky,skip_taskbar,skip_pager',
border_inner_margin = 20,
border_outer_margin = 0,
alignment = 'bottom_right',
gap_x = 70,
gap_y = 70,
draw_shades = true,
draw_outline = false,
draw_borders = false,
draw_graph_borders = false,
use_xft = true,
font = 'monospace:size=9',
xftalpha = 0.8,
uppercase = false,
default_color = '#FF',
own_window_colour = '#00',
maximum_width = 375
};
conky.text = [[
${color #00}${goto 20}Name ${goto 200}Pid${goto 255}Cpu%${goto 
310}Mem%${color}
${goto 20}${top name 1} ${goto 180}${top pid 1}${goto 235}${top cpu 
1}${goto 290}${top mem 1}
${goto 20}${top name 2} ${goto 180}${top pid 2}${goto 235}${top cpu 
2}${goto 290}${top mem 2}
${goto 20}${top name 3} ${goto 180}${top pid 3}${goto 235}${top cpu 
3}${goto 290}${top mem 3}
${goto 20}${top name 4} ${goto 180}${top pid 4}${goto 235}${top cpu 
4}${goto 290}${top mem 4}
${goto 20}${top name 5} ${goto 180}${top pid 5}${goto 235}${top cpu 
5}${goto 290}${top mem 5}
${goto 20}${hr}
${goto

commit conky for openSUSE:Factory

2017-08-01 Thread root 
Hello community,

here is the log from the commit of package conky for openSUSE:Factory checked 
in at 2017-08-01 09:25:21

Comparing /work/SRC/openSUSE:Factory/conky (Old)
 and  /work/SRC/openSUSE:Factory/.conky.new (New)


Package is "conky"

Tue Aug  1 09:25:21 2017 rev:19 rq:513106 version:1.10.6

Changes:

--- /work/SRC/openSUSE:Factory/conky/conky.changes  2017-06-26 
15:53:29.217308125 +0200
+++ /work/SRC/openSUSE:Factory/.conky.new/conky.changes 2017-08-01 
09:25:21.983806473 +0200
@@ -1,0 +2,5 @@
+Thu Jul 27 19:49:23 UTC 2017 - joerg.loren...@ki.tng.de
+
+- BuildRequires libtolua++-5_1-devel on Leap.
+
+---



Other differences:
--
++ conky.spec ++
--- /var/tmp/diff_new_pack.J20vVl/_old  2017-08-01 09:25:22.695706143 +0200
+++ /var/tmp/diff_new_pack.J20vVl/_new  2017-08-01 09:25:22.707704452 +0200
@@ -56,7 +56,7 @@
 BuildRequires:  pkgconfig(libpulse)
 BuildRequires:  pkgconfig(librsvg-2.0)
 BuildRequires:  pkgconfig(libxml-2.0)
-%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 && 0%{?is_opensuse} 
!= 1
+%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315
 BuildRequires:  libtolua++-5_1-devel
 %else
 BuildRequires:  tolua++

commit conky for openSUSE:Factory

2017-06-26 Thread root 
Hello community,

here is the log from the commit of package conky for openSUSE:Factory checked 
in at 2017-06-26 15:53:22

Comparing /work/SRC/openSUSE:Factory/conky (Old)
 and  /work/SRC/openSUSE:Factory/.conky.new (New)


Package is "conky"

Mon Jun 26 15:53:22 2017 rev:18 rq:505862 version:1.10.6

Changes:

--- /work/SRC/openSUSE:Factory/conky/conky.changes  2017-03-21 
22:51:54.774732206 +0100
+++ /work/SRC/openSUSE:Factory/.conky.new/conky.changes 2017-06-26 
15:53:29.217308125 +0200
@@ -1,0 +2,5 @@
+Tue Jun 20 09:18:31 UTC 2017 - o...@aepfle.de
+
+- Fix build with conky.luamm.patch
+
+---

New:

  conky.luamm.patch



Other differences:
--
++ conky.spec ++
--- /var/tmp/diff_new_pack.sFjRTD/_old  2017-06-26 15:53:32.032911093 +0200
+++ /var/tmp/diff_new_pack.sFjRTD/_new  2017-06-26 15:53:32.036910529 +0200
@@ -34,6 +34,7 @@
 # our ncurses doesn't supply a .pc file
 Patch2: conky-1.10.4-ncurses.patch
 Patch3: conky.timestamp.patch
+Patch4: conky.luamm.patch
 BuildRequires:  cmake
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  docbook2x
@@ -147,6 +148,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 mkdir build && cd build

++ conky.luamm.patch ++
--- a/src/luamm.hh
+++ b/src/luamm.hh
@@ -28,6 +28,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include

commit conky for openSUSE:Factory

2017-03-21 Thread root 
Hello community,

here is the log from the commit of package conky for openSUSE:Factory checked 
in at 2017-03-21 22:51:54

Comparing /work/SRC/openSUSE:Factory/conky (Old)
 and  /work/SRC/openSUSE:Factory/.conky.new (New)


Package is "conky"

Tue Mar 21 22:51:54 2017 rev:17 rq:481822 version:1.10.6

Changes:

--- /work/SRC/openSUSE:Factory/conky/conky.changes  2017-03-12 
20:04:44.403473795 +0100
+++ /work/SRC/openSUSE:Factory/.conky.new/conky.changes 2017-03-21 
22:51:54.774732206 +0100
@@ -1,0 +2,5 @@
+Tue Mar 21 11:48:43 UTC 2017 - o...@aepfle.de
+
+- Remove more timestamps from binaries
+
+---



Other differences:
--
++ conky.timestamp.patch ++
--- /var/tmp/diff_new_pack.j6NUyW/_old  2017-03-21 22:51:55.538624214 +0100
+++ /var/tmp/diff_new_pack.j6NUyW/_new  2017-03-21 22:51:55.542623648 +0100
@@ -11,7 +11,7 @@
  if(RELEASE)
 --- a/src/llua.cc
 +++ b/src/llua.cc
-@@ -161,7 +161,7 @@ void llua_init(void)
+@@ -161,15 +161,12 @@ void llua_init(void)
free(old_path);
free(new_path);
  
@@ -20,3 +20,33 @@
lua_setglobal(lua_L, "conky_build_info");
  
lua_pushstring(lua_L, VERSION);
+   lua_setglobal(lua_L, "conky_version");
+ 
+-  lua_pushstring(lua_L, BUILD_DATE);
+-  lua_setglobal(lua_L, "conky_build_date");
+-
+   lua_pushstring(lua_L, BUILD_ARCH);
+   lua_setglobal(lua_L, "conky_build_arch");
+ 
+--- a/src/conky.cc
 b/src/conky.cc
+@@ -246,7 +246,7 @@ static void reload_config(void);
+ 
+ static void print_version(void)
+ {
+-std::cout << _(PACKAGE_NAME" " VERSION" compiled " BUILD_DATE" for " 
BUILD_ARCH"\n"
++std::cout << _(PACKAGE_NAME" " VERSION" compiled for " BUILD_ARCH"\n"
+ "\nCompiled in features:\n\n"
+ "System config file: " SYSTEM_CONFIG_FILE"\n"
+ "Package library path: " PACKAGE_LIBDIR"\n\n")
+--- a/src/core.cc
 b/src/core.cc
+@@ -706,8 +706,6 @@ struct text_object *construct_text_objec
+ #endif /* BUILD_X11 */
+   END OBJ(conky_version, 0)
+   obj_be_plain_text(obj, VERSION);
+-  END OBJ(conky_build_date, 0)
+-  obj_be_plain_text(obj, BUILD_DATE);
+   END OBJ(conky_build_arch, 0)
+   obj_be_plain_text(obj, BUILD_ARCH);
+   END OBJ(downspeed, _net_stats)

commit conky for openSUSE:Factory

2017-03-12 Thread root 
Hello community,

here is the log from the commit of package conky for openSUSE:Factory checked 
in at 2017-03-12 20:04:44

Comparing /work/SRC/openSUSE:Factory/conky (Old)
 and  /work/SRC/openSUSE:Factory/.conky.new (New)


Package is "conky"

Sun Mar 12 20:04:44 2017 rev:16 rq:477978 version:1.10.6

Changes:

--- /work/SRC/openSUSE:Factory/conky/conky.changes  2017-02-20 
13:15:13.355382070 +0100
+++ /work/SRC/openSUSE:Factory/.conky.new/conky.changes 2017-03-12 
20:04:44.403473795 +0100
@@ -1,0 +2,6 @@
+Thu Mar  2 08:28:06 UTC 2017 - o...@aepfle.de
+
+- Add buildconditional for audacious, cmus, libXNVCtrl, xmms2
+- Remove unused BuildRequires, convert to pkgconfig()
+
+---



Other differences:
--
++ conky.spec ++
--- /var/tmp/diff_new_pack.ylgQKn/_old  2017-03-12 20:04:45.087377021 +0100
+++ /var/tmp/diff_new_pack.ylgQKn/_new  2017-03-12 20:04:45.095375888 +0100
@@ -16,6 +16,11 @@
 #
 
 
+%bcond_withaudacious
+%bcond_withcmus
+%bcond_withlibXNVCtrl
+%bcond_without xmms2
+
 Name:   conky
 Version:1.10.6
 Release:0
@@ -29,55 +34,54 @@
 # our ncurses doesn't supply a .pc file
 Patch2: conky-1.10.4-ncurses.patch
 Patch3: conky.timestamp.patch
-BuildRequires:  alsa-devel
-BuildRequires:  cairo-devel
 BuildRequires:  cmake
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  docbook2x
-BuildRequires:  fontconfig-devel
 BuildRequires:  freetype2-devel
 BuildRequires:  gcc-c++
-BuildRequires:  glib2-devel
-BuildRequires:  libcurl-devel
 BuildRequires:  libical-devel
 BuildRequires:  libiw-devel
 BuildRequires:  libmicrohttpd-devel
 BuildRequires:  libmysqld-devel
-BuildRequires:  libpng-devel
-BuildRequires:  libpulse-devel
-BuildRequires:  librsvg-devel
 BuildRequires:  libtool
 BuildRequires:  libxslt-tools
 BuildRequires:  lua51-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  pkg-config
+BuildRequires:  pkgconfig(cairo)
+BuildRequires:  pkgconfig(cairo-xlib)
+BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(libcurl)
+BuildRequires:  pkgconfig(libpulse)
+BuildRequires:  pkgconfig(librsvg-2.0)
+BuildRequires:  pkgconfig(libxml-2.0)
 %if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 && 0%{?is_opensuse} 
!= 1
 BuildRequires:  libtolua++-5_1-devel
 %else
 BuildRequires:  tolua++
 %endif
 BuildRequires:  update-desktop-files
-BuildRequires:  vim
 BuildRequires:  xorg-x11-devel
-BuildRequires:  zlib-devel
-BuildRequires:  pkgconfig(libxml-2.0)
-%if 0%{?packman_bs}
-BuildRequires:  audacious-devel
-# fix dbus-glib-1 no found for audacious
-BuildRequires:  dbus-1-glib-devel
+%if %{with audacious}
+BuildRequires:  pkgconfig(audacious)
+BuildRequires:  pkgconfig(audclient)
+BuildRequires:  pkgconfig(dbus-glib-1)
+Provides:   conky-feature-audacious = %{version}
+Obsoletes:  conky-feature-audacious < %{version}
+%endif
+%if %{with libXNVCtrl}
 BuildRequires:  libXNVCtrl
-BuildRequires:  libaudclient-devel
-BuildRequires:  xmms2-devel
 Provides:   conky-feature-nvidia = %{version}
 Obsoletes:  conky-feature-nvidia < %{version}
-Provides:   conky-feature-audacious = %{version}
-Obsoletes:  conky-feature-audacious < %{version}
+%endif
+%if %{with xmms2}
+BuildRequires:  pkgconfig(xmms2-client)
 %endif
 Provides:   conky-cairo = %{version}
 Obsoletes:  conky-cairo < %{version}
 %if 0%{?suse_version} != 1315 || 0%{?is_opensuse} == 1
-BuildRequires:  imlib2-devel
 BuildRequires:  libircclient-devel
+BuildRequires:  pkgconfig(imlib2)
 # This is required for imlib2 function properly.
 Requires:   imlib2-loaders
 Provides:   conky-imlib2 = %{version}
@@ -88,8 +92,18 @@
 %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.
+This package is built with support for:
+%if %{with audacious}
+- audacious
+%endif
+%if %{with cmus}
+- cmus
+%endif
+%if %{with libXNVCtrl}
+- nVidia GPUs
+%endif
+%if %{with xmms2}
+- xmms2
 %endif
 
 %package doc
@@ -184,17 +198,22 @@
-DOWN_WINDOW=ON \
-DBUILD_LUA_CAIRO=ON \
-DBUILD_LUA_RSVG=ON \
-%if 0%{?packman_bs}
-   -DBUILD_AUDACIOUS=ON \
-   -DBUILD_CMUS=ON \
-   -DBUILD_NVIDIA=ON \
-   -DBUILD_XMMS2=ON \
-%else
-DBUILD_AUDACIOUS=OFF \
-DBUILD_CMUS=OFF \
-DBUILD_NVIDIA=OFF \
-DBUILD_XMMS2=OFF \
-%endif #packman_bs
+%if %{with audacious}
+   -DBUILD_AUDACIOUS=ON \
+%endif
+%if %{with cmus}
+   -DBUILD_CMUS=ON \
+%endif
+%if %{with libXNVCtrl}
+   -DBUILD_NVIDIA=ON \
+%endif
+%if %{with xmms2}
+   -DBUILD_XMMS2=ON \
+%endif
..
 
 make %{?_smp_mflags}
@@

commit conky for openSUSE:Factory

2017-02-20 Thread root 
Hello community,

here is the log from the commit of package conky for openSUSE:Factory checked 
in at 2017-02-20 13:15:12

Comparing /work/SRC/openSUSE:Factory/conky (Old)
 and  /work/SRC/openSUSE:Factory/.conky.new (New)


Package is "conky"

Changes:

--- /work/SRC/openSUSE:Factory/conky/conky.changes  2017-01-09 
10:47:51.202683702 +0100
+++ /work/SRC/openSUSE:Factory/.conky.new/conky.changes 2017-02-20 
13:15:13.355382070 +0100
@@ -1,0 +2,6 @@
+Wed Jan  4 13:16:57 UTC 2017 - o...@aepfle.de
+
+- Remove timestamp from binaries
+- add conky.timestamp.patch
+
+---

New:

  conky.timestamp.patch



Other differences:
--
++ conky.spec ++
--- /var/tmp/diff_new_pack.IzKpEC/_old  2017-02-20 13:15:14.155269608 +0100
+++ /var/tmp/diff_new_pack.IzKpEC/_new  2017-02-20 13:15:14.159269046 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package conky
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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
@@ -28,6 +28,7 @@
 Patch1: conky-1.10.1-avoid-git.patch
 # our ncurses doesn't supply a .pc file
 Patch2: conky-1.10.4-ncurses.patch
+Patch3: conky.timestamp.patch
 BuildRequires:  alsa-devel
 BuildRequires:  cairo-devel
 BuildRequires:  cmake
@@ -131,6 +132,7 @@
 %patch -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 mkdir build && cd build

++ conky.timestamp.patch ++
--- a/cmake/Conky.cmake
+++ b/cmake/Conky.cmake
@@ -105,7 +105,7 @@ mark_as_advanced(APP_AWK APP_WC APP_DATE
 #BUILD_ARCH="$(uname -sr) ($(uname -m))"
 execute_process(COMMAND ${APP_DATE} RESULT_VARIABLE RETVAL OUTPUT_VARIABLE
BUILD_DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
-execute_process(COMMAND ${APP_UNAME} -srm RESULT_VARIABLE RETVAL
+execute_process(COMMAND ${APP_UNAME} -sm RESULT_VARIABLE RETVAL
OUTPUT_VARIABLE BUILD_ARCH OUTPUT_STRIP_TRAILING_WHITESPACE)
 
 if(RELEASE)
--- a/src/llua.cc
+++ b/src/llua.cc
@@ -161,7 +161,7 @@ void llua_init(void)
free(old_path);
free(new_path);
 
-   lua_pushstring(lua_L, PACKAGE_NAME" " VERSION" compiled " BUILD_DATE" 
for " BUILD_ARCH);
+   lua_pushstring(lua_L, PACKAGE_NAME" " VERSION" compiled for " 
BUILD_ARCH);
lua_setglobal(lua_L, "conky_build_info");
 
lua_pushstring(lua_L, VERSION);

commit conky for openSUSE:Factory

2016-10-01 Thread h_root 
Hello community,

here is the log from the commit of package conky for openSUSE:Factory checked 
in at 2016-10-02 00:07:56

Comparing /work/SRC/openSUSE:Factory/conky (Old)
 and  /work/SRC/openSUSE:Factory/.conky.new (New)


Package is "conky"

Changes:

--- /work/SRC/openSUSE:Factory/conky/conky.changes  2016-06-07 
23:47:59.0 +0200
+++ /work/SRC/openSUSE:Factory/.conky.new/conky.changes 2016-10-02 
00:08:25.0 +0200
@@ -1,0 +2,7 @@
+Sat Sep 24 11:52:54 UTC 2016 - aloi...@gmx.com
+
+- Update to version 1.10.4
+- Enabled pulseaudio
+- Added conky-1.10.4-ncurses.patch
+
+---

Old:

  conky-1.10.2.tar.gz

New:

  conky-1.10.4-ncurses.patch
  conky-1.10.4.tar.gz



Other differences:
--
++ conky.spec ++
--- /var/tmp/diff_new_pack.A7bXpl/_old  2016-10-02 00:08:27.0 +0200
+++ /var/tmp/diff_new_pack.A7bXpl/_new  2016-10-02 00:08:27.0 +0200
@@ -17,7 +17,7 @@
 
 
 Name:   conky
-Version:1.10.2
+Version:1.10.4
 Release:0
 Summary:Lightweight System Monitor
 License:GPL-3.0+ and LGPL-3.0+ and MIT
@@ -26,6 +26,8 @@
 Source: 
https://github.com/brndnmtthws/conky/archive/v%{version}/conky-%{version}.tar.gz
 Patch:  conky-1.10.0-libircclient.patch
 Patch1: conky-1.10.1-avoid-git.patch
+# our ncurses doesn't supply a .pc file
+Patch2: conky-1.10.4-ncurses.patch
 BuildRequires:  alsa-devel
 BuildRequires:  cairo-devel
 BuildRequires:  cmake
@@ -41,6 +43,7 @@
 BuildRequires:  libmicrohttpd-devel
 BuildRequires:  libmysqld-devel
 BuildRequires:  libpng-devel
+BuildRequires:  libpulse-devel
 BuildRequires:  librsvg-devel
 BuildRequires:  libtool
 BuildRequires:  libxslt-tools
@@ -127,6 +130,7 @@
 %setup -q
 %patch -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 mkdir build && cd build
@@ -159,12 +163,12 @@
 -DBUILD_IRC=OFF \
 %endif
-DBUILD_MATH=ON \
-   -DBUILD_MIXER_ALSA=ON \
-DBUILD_MOC=ON \
-DBUILD_MPD=ON \
-DBUILD_MYSQL=ON \
-DBUILD_NCURSES=ON \
-DBUILD_PORT_MONITORS=ON \
+   -DBUILD_PULSEAUDIO=ON \
-DBUILD_RSS=ON \
-DBUILD_OLD_CONFIG=ON \
-DBUILD_WEATHER_METAR=ON \
@@ -178,7 +182,6 @@
-DOWN_WINDOW=ON \
-DBUILD_LUA_CAIRO=ON \
-DBUILD_LUA_RSVG=ON \
-   -DBUILD_LUA_EXTRAS=ON \
 %if 0%{?packman_bs}
-DBUILD_AUDACIOUS=ON \
-DBUILD_CMUS=ON \

++ conky-1.10.4-ncurses.patch ++
Index: conky-1.10.4/cmake/ConkyPlatformChecks.cmake
===
--- conky-1.10.4.orig/cmake/ConkyPlatformChecks.cmake
+++ conky-1.10.4/cmake/ConkyPlatformChecks.cmake
@@ -119,12 +119,12 @@ if(BUILD_HTTP)
 endif(BUILD_HTTP)
 
 if(BUILD_NCURSES)
-   pkg_check_modules(NCURSES ncurses)
-   if(NOT NCURSES_FOUND)
-   message(FATAL_ERROR "Unable to find ncurses library")
-   endif(NOT NCURSES_FOUND)
-   set(conky_libs ${conky_libs} ${NCURSES_LIBRARIES})
-   set(conky_includes ${conky_includes} ${NCURSES_INCLUDE_DIRS})
+check_include_files(ncurses.h NCURSES_H)
+find_library(NCURSES_LIB NAMES ncurses)
+if(NOT NCURSES_H OR NOT NCURSES_LIB)
+message(FATAL_ERROR "Unable to find ncurses library")
+endif(NOT NCURSES_H OR NOT NCURSES_LIB)
+set(conky_libs ${conky_libs} ${NCURSES_LIB})
 endif(BUILD_NCURSES)
 
 if(BUILD_MYSQL)
++ conky-1.10.2.tar.gz -> conky-1.10.4.tar.gz ++
 2649 lines of diff (skipped)

commit conky for openSUSE:Factory

2016-06-07 Thread h_root 
Hello community,

here is the log from the commit of package conky for openSUSE:Factory checked 
in at 2016-06-07 23:47:54

Comparing /work/SRC/openSUSE:Factory/conky (Old)
 and  /work/SRC/openSUSE:Factory/.conky.new (New)


Package is "conky"

Changes:

--- /work/SRC/openSUSE:Factory/conky/conky.changes  2016-02-11 
12:37:18.0 +0100
+++ /work/SRC/openSUSE:Factory/.conky.new/conky.changes 2016-06-07 
23:47:59.0 +0200
@@ -1,0 +2,9 @@
+Mon May 23 14:44:45 UTC 2016 - roni...@gmail.com
+
+- Update version 1.10.2.
+  * Bugfix release.
+- Drop patches already applied by upstream:
+  * conky-libdir.patch
+  * conky-1.10.1-check_include_file.patch
+
+---

Old:

  conky-1.10.1-check_include_file.patch
  conky-1.10.1.tar.gz
  conky-libdir.patch

New:

  conky-1.10.2.tar.gz



Other differences:
--
++ conky.spec ++
--- /var/tmp/diff_new_pack.WXQBG4/_old  2016-06-07 23:48:00.0 +0200
+++ /var/tmp/diff_new_pack.WXQBG4/_new  2016-06-07 23:48:00.0 +0200
@@ -17,7 +17,7 @@
 
 
 Name:   conky
-Version:1.10.1
+Version:1.10.2
 Release:0
 Summary:Lightweight System Monitor
 License:GPL-3.0+ and LGPL-3.0+ and MIT
@@ -25,11 +25,7 @@
 Url:https://github.com/brndnmtthws/conky
 Source: 
https://github.com/brndnmtthws/conky/archive/v%{version}/conky-%{version}.tar.gz
 Patch:  conky-1.10.0-libircclient.patch
-# PATCH-FIX-UPSTREAM marguer...@opensuse.org - respect LIB_INSTALL_DIR
-Patch1: conky-libdir.patch
-Patch2: conky-1.10.1-avoid-git.patch
-# PATCH-FIX-UPSTREAM check_include_file not found.
-Patch3: conky-1.10.1-check_include_file.patch
+Patch1: conky-1.10.1-avoid-git.patch
 BuildRequires:  alsa-devel
 BuildRequires:  cairo-devel
 BuildRequires:  cmake
@@ -131,8 +127,6 @@
 %setup -q
 %patch -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
 mkdir build && cd build

++ conky-1.10.1.tar.gz -> conky-1.10.2.tar.gz ++
 3329 lines of diff (skipped)

commit conky for openSUSE:Factory

2016-02-11 Thread h_root 
Hello community,

here is the log from the commit of package conky for openSUSE:Factory checked 
in at 2016-02-11 12:37:16

Comparing /work/SRC/openSUSE:Factory/conky (Old)
 and  /work/SRC/openSUSE:Factory/.conky.new (New)


Package is "conky"

Changes:

--- /work/SRC/openSUSE:Factory/conky/conky.changes  2015-10-06 
13:26:11.0 +0200
+++ /work/SRC/openSUSE:Factory/.conky.new/conky.changes 2016-02-11 
12:37:18.0 +0100
@@ -1,0 +2,41 @@
+Thu Jan  7 06:21:15 UTC 2016 - i...@marguerite.su
+
+- update version 1.10.1
+  * bugfix release
+  * If BUILD_IPV6=ON (default), but the user has disabled ipv6
+support in the kernel using the parameter ipv6.disable=1,
+then conky fails to open /proc/net/if_inet6. This leads to
+a segfault when conky calls fclose(file) regardless. This
+fix simply moves the fclose call into the preceding if
+statement. (boo#958897)
+- drop patch: conky-1.10.0-libdir.patch
+- add patch: conky-libdir.patch
+- add patch: conky-1.10.1-avoid-git.patch
+- add patch: conky-1.10.1-check_include_file.patch
+  * fix check_include_file not found
+- enable builds for sles 12
+
+---
+Thu Jan  7 00:54:33 UTC 2016 - norm...@linux.vnet.ibm.com
+
+- for suse_version after 1320
+  add BuildRequires:   libtolua++-5_1-devel
+
+---
+Fri Dec 18 07:44:47 UTC 2015 - si...@simotek.net
+
+- Add conky-1.10.0-fix-upstream-issue-187-IPV6-crash.patch fixing
+  upstream issue #187 and (boo#958897) patch taken from upstream
+  
https://github.com/brndnmtthws/conky/commit/ee08a9e1b045e8d2f4f13a0e60c2f603b66b0d69?diff=unified
+
+---
+Sat Nov 21 13:23:07 UTC 2015 - o...@aepfle.de
+
+- Its always /usr/bin/lua5.1
+
+---
+Thu Oct 29 08:22:28 UTC 2015 - dims...@opensuse.org
+
+- Also use /usr/bin/lua5.1 on Leap 42.1 (boo#952599).
+
+---

Old:

  conky-1.10.0-libdir.patch
  conky-1.10.0.tar.gz

New:

  conky-1.10.1-avoid-git.patch
  conky-1.10.1-check_include_file.patch
  conky-1.10.1.tar.gz
  conky-libdir.patch



Other differences:
--
++ conky.spec ++
--- /var/tmp/diff_new_pack.fRS5EL/_old  2016-02-11 12:37:18.0 +0100
+++ /var/tmp/diff_new_pack.fRS5EL/_new  2016-02-11 12:37:18.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package conky
 #
-# Copyright (c) 2015 SUSE LINUX 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
@@ -17,7 +17,7 @@
 
 
 Name:   conky
-Version:1.10.0
+Version:1.10.1
 Release:0
 Summary:Lightweight System Monitor
 License:GPL-3.0+ and LGPL-3.0+ and MIT
@@ -26,7 +26,10 @@
 Source: 
https://github.com/brndnmtthws/conky/archive/v%{version}/conky-%{version}.tar.gz
 Patch:  conky-1.10.0-libircclient.patch
 # PATCH-FIX-UPSTREAM marguer...@opensuse.org - respect LIB_INSTALL_DIR
-Patch1: conky-1.10.0-libdir.patch
+Patch1: conky-libdir.patch
+Patch2: conky-1.10.1-avoid-git.patch
+# PATCH-FIX-UPSTREAM check_include_file not found.
+Patch3: conky-1.10.1-check_include_file.patch
 BuildRequires:  alsa-devel
 BuildRequires:  cairo-devel
 BuildRequires:  cmake
@@ -36,10 +39,8 @@
 BuildRequires:  freetype2-devel
 BuildRequires:  gcc-c++
 BuildRequires:  glib2-devel
-BuildRequires:  imlib2-devel
 BuildRequires:  libcurl-devel
 BuildRequires:  libical-devel
-BuildRequires:  libircclient-devel
 BuildRequires:  libiw-devel
 BuildRequires:  libmicrohttpd-devel
 BuildRequires:  libmysqld-devel
@@ -50,7 +51,11 @@
 BuildRequires:  lua51-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  pkg-config
+%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 && 0%{?is_opensuse} 
!= 1
+BuildRequires:  libtolua++-5_1-devel
+%else
 BuildRequires:  tolua++
+%endif
 BuildRequires:  update-desktop-files
 BuildRequires:  vim
 BuildRequires:  xorg-x11-devel
@@ -68,12 +73,16 @@
 Provides:   conky-feature-audacious = %{version}
 Obsoletes:  conky-feature-audacious < %{version}
 %endif
-# This is required for imlib2 function properly.
-Requires:   imlib2-loaders
 Provides:   conky-cairo = %{version}
 Obsoletes:  conky-cairo < %{version}
+%if 0%{?suse_version} != 1315 || 0%{?is_opensuse} == 1
+BuildRequires:  imlib2-devel
+BuildRequires:  libircclient-devel
+# This is required for imlib2 function properly.
+Requires:

commit conky for openSUSE:Factory

2015-10-06 Thread h_root 
Hello community,

here is the log from the commit of package conky for openSUSE:Factory checked 
in at 2015-10-06 13:26:09

Comparing /work/SRC/openSUSE:Factory/conky (Old)
 and  /work/SRC/openSUSE:Factory/.conky.new (New)


Package is "conky"

Changes:

--- /work/SRC/openSUSE:Factory/conky/conky.changes  2015-06-10 
09:16:30.0 +0200
+++ /work/SRC/openSUSE:Factory/.conky.new/conky.changes 2015-10-06 
13:26:11.0 +0200
@@ -1,0 +2,39 @@
+Sat Oct  3 07:51:50 UTC 2015 - i...@marguerite.su
+
+- fix /usr/bin/lua51, it's now /usr/bin/lua5.1 in TW.
+
+---
+Sat Aug 29 15:33:16 UTC 2015 - i...@marguerite.su
+
+- update version 1.10.0  
+  * Partial rewrite in C++ (from C)
+  * New Lua-based config system
+  * New CMake-based build system
+  * Support for newer GCC versions
+- drop patch: conky-1.9.0-libiw_with_libm.patch
+  * upstream changed from autotools to cmake
+- drop patch: fix-CVE-2011-3616.patch, upstreamed
+- drop patch: fix-apcupsd.patch.
+  * problematic, invalid conversion from void* to int*
+- add patch: conky-1.10.0-libircclient.patch
+  * fix includedir
+- add patch: conky-1.10.0-libdir.patch
+  * respect LIB_INSTALL_DIR
+- remove old-time conditional checks:
+  * lua/imlib2 are always enabled
+- drop conky-cairo/imlib2 sub-packages
+  * they're always enabled, no need to split
+  * add Provides/Obsoletes in main package
+- rename conky-vim/nano sub-packages to vim/nano-plugin-conky
+- remove pseudo sub-packages:
+  * there are more "features" now, we can not create more and more
+dummy packages
+  * keeping packages from being switched among repositories should
+be done by users via package management system, not this way
+  * add Provides/Obsoletes in main package
+- drop conky-rpmlintrc
+  * the error it filtered doesn't exist anymore
+- drop conky.desktop
+  * conky is not a desktop application. a desktop file is useless
+
+---

Old:

  conky-1.9.0-libiw_with_libm.patch
  conky-1.9.0.tar.bz2
  conky-rpmlintrc
  conky.desktop
  fix-CVE-2011-3616.patch
  fix-apcupsd.patch

New:

  conky-1.10.0-libdir.patch
  conky-1.10.0-libircclient.patch
  conky-1.10.0.tar.gz



Other differences:
--
++ conky.spec ++
--- /var/tmp/diff_new_pack.u4w8Su/_old  2015-10-06 13:26:12.0 +0200
+++ /var/tmp/diff_new_pack.u4w8Su/_new  2015-10-06 13:26:12.0 +0200
@@ -16,84 +16,46 @@
 #
 
 
-%if 0%{?suse_version} >= 1100
-%define with_lua_extra 1
-%else
-%define with_lua_extra 0
-%endif
-
 Name:   conky
-Version:1.9.0
+Version:1.10.0
 Release:0
 Summary:Lightweight System Monitor
 License:GPL-3.0+ and LGPL-3.0+ and MIT
 Group:  System/Monitoring
-Url:http://conky.sourceforge.net
-Source: 
http://prdownloads.sourceforge.net/conky/conky-%{version}.tar.bz2
-Source1:conky.desktop
-# PATCH-FIX - add -lm when linking against -liw
-Patch1: conky-1.9.0-libiw_with_libm.patch
-# PATCH-FIX-UPSTREAM - revert broken apcupsd to previous working version.
-Patch2: fix-apcupsd.patch
-# PATCH-FIX-UPSTREAM - avoid rewriting an arbitrary user file. remove next 
release
-Patch3: fix-CVE-2011-3616.patch
-Source99:   conky-rpmlintrc
-BuildRequires:  fontconfig-devel
-BuildRequires:  freetype2-devel
-BuildRequires:  gcc
-BuildRequires:  make
-BuildRequires:  pkgconfig
-%if 0%{?suse_version} >= 1000
-BuildRequires:  xorg-x11-devel
-%else
-BuildRequires:  XFree86-devel
-%endif
-%if 0%{?suse_version} >= 1120
-BuildRequires:  libiw-devel
-%else
-BuildRequires:  wireless-tools
-%endif
+Url:https://github.com/brndnmtthws/conky
+Source: 
https://github.com/brndnmtthws/conky/archive/v%{version}/conky-%{version}.tar.gz
+Patch:  conky-1.10.0-libircclient.patch
+# PATCH-FIX-UPSTREAM marguer...@opensuse.org - respect LIB_INSTALL_DIR
+Patch1: conky-1.10.0-libdir.patch
 BuildRequires:  alsa-devel
-BuildRequires:  autoconf
-BuildRequires:  automake
 BuildRequires:  cairo-devel
+BuildRequires:  cmake
+BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  docbook2x
+BuildRequires:  fontconfig-devel
+BuildRequires:  freetype2-devel
+BuildRequires:  gcc-c++
 BuildRequires:  glib2-devel
+BuildRequires:  imlib2-devel
+BuildRequires:  libcurl-devel
+BuildRequires:  libical-devel
+BuildRequires:  libircclient-devel
+BuildRequires:  libiw-devel
+BuildRequires:  libmicrohttpd-devel
+BuildRequires:  libmysqld-devel
 BuildRequires:  libpng-devel
+BuildRequires:  librsvg-devel
 BuildRequires:  libtool
+BuildRequires:  libxslt-tools
+BuildRequires:  lua51-devel
+BuildRequires:  ncurses-devel
+BuildRequires:

commit conky for openSUSE:Factory

2015-06-10 Thread h_root 
Hello community,

here is the log from the commit of package conky for openSUSE:Factory checked 
in at 2015-06-10 09:16:26

Comparing /work/SRC/openSUSE:Factory/conky (Old)
 and  /work/SRC/openSUSE:Factory/.conky.new (New)


Package is conky

Changes:

--- /work/SRC/openSUSE:Factory/conky/conky.changes  2013-07-22 
16:39:36.0 +0200
+++ /work/SRC/openSUSE:Factory/.conky.new/conky.changes 2015-06-10 
09:16:30.0 +0200
@@ -1,0 +2,10 @@
+Tue May 26 08:01:26 UTC 2015 - dg...@suse.com
+
+- Removed conky-libiw_with_libm.patch because it's not used anywhere 
+
+---
+Fri Jan 16 17:31:43 UTC 2015 - aloi...@gmx.com
+
+- Merged back changes for the packman section
+
+---

Old:

  conky-libiw_with_libm.patch



Other differences:
--
++ conky.spec ++
--- /var/tmp/diff_new_pack.mEiVe3/_old  2015-06-10 09:16:30.0 +0200
+++ /var/tmp/diff_new_pack.mEiVe3/_new  2015-06-10 09:16:30.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package conky
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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
@@ -70,8 +70,8 @@
 %define with_imlib2 1
 BuildRequires:  imlib2-devel
 %endif
-BuildRequires:  libxml2-devel
 BuildRequires:  ncurses-devel
+BuildRequires:  pkgconfig(libxml-2.0)
 %if 0%{?suse_version} = 1020
 %define with_lua 1
 %if 0%{?suse_version} = 1220
@@ -99,7 +99,8 @@
 # fix dbus-glib-1 no found for audacious
 BuildRequires:  dbus-1-glib-devel
 BuildRequires:  libXNVCtrl
-BuildRequires:  xmm2-devel
+BuildRequires:  libaudclient-devel
+BuildRequires:  xmms2-devel
 %endif
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build

commit conky for openSUSE:Factory

2013-07-22 Thread h_root 
Hello community,

here is the log from the commit of package conky for openSUSE:Factory checked 
in at 2013-07-22 16:39:35

Comparing /work/SRC/openSUSE:Factory/conky (Old)
 and  /work/SRC/openSUSE:Factory/.conky.new (New)


Package is conky

Changes:

--- /work/SRC/openSUSE:Factory/conky/conky.changes  2012-03-06 
13:37:46.0 +0100
+++ /work/SRC/openSUSE:Factory/.conky.new/conky.changes 2013-07-22 
16:39:36.0 +0200
@@ -1,0 +2,26 @@
+Fri Nov  9 08:06:23 UTC 2012 - i...@marguerite.su
+
+- merged PMBS changes here. enabled more options.(OBS compatible)
+- add dependency imlib2-loaders for conky-imlib2.
+  or conky will keep warning can't load images.
+- add two patches from debian which also confirmed by user
+  please_try_again.
+  * fix-apcupsd.patch, revert broken apcupsd code to previous
+working version.
+  * fix-CVE-2011-3616.patch. avoid rewriting an arbitrary user file
+already upstreamed. but not in 1.9.0. remove next release.
+
+---
+Sun Oct 21 00:31:29 UTC 2012 - pascal.ble...@opensuse.org
+
+- merged back with my changes for SLES build compatibility
+
+---
+Thu Jun 21 09:23:47 UTC 2012 - tog...@opensuse.org
+
+- Update to 1.9.0 for changes please see
+  http://conky.sourceforge.net/changelog.html
+  * reworked conky-libiw_with_libm.patch as conky-1.9.0-libiw_with_libm.patch
+  * removed conky-fix-curl-FTBFS.patch as fixed by upstream  
+
+---

Old:

  conky-1.8.1.tar.bz2
  conky-fix-curl-FTBFS.patch

New:

  conky-1.9.0-libiw_with_libm.patch
  conky-1.9.0.tar.bz2
  fix-CVE-2011-3616.patch
  fix-apcupsd.patch



Other differences:
--
++ conky.spec ++
--- /var/tmp/diff_new_pack.csGV7v/_old  2013-07-22 16:39:37.0 +0200
+++ /var/tmp/diff_new_pack.csGV7v/_new  2013-07-22 16:39:37.0 +0200
@@ -1,4 +1,3 @@
-# vim: set sw=4 ts=4 et:
 #
 # spec file for package conky
 #
@@ -15,7 +14,8 @@
 
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
-#
+
+
 %if 0%{?suse_version} = 1100
 %define with_lua_extra 1
 %else
@@ -23,43 +23,46 @@
 %endif
 
 Name:   conky
-Version:1.8.1
+Version:1.9.0
 Release:0
 Summary:Lightweight System Monitor
-License:GPL-3.0+
+License:GPL-3.0+ and LGPL-3.0+ and MIT
 Group:  System/Monitoring
+Url:http://conky.sourceforge.net
 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
+Patch1: conky-1.9.0-libiw_with_libm.patch
+# PATCH-FIX-UPSTREAM - revert broken apcupsd to previous working version.
+Patch2: fix-apcupsd.patch
+# PATCH-FIX-UPSTREAM - avoid rewriting an arbitrary user file. remove next 
release
+Patch3: fix-CVE-2011-3616.patch
 Source99:   conky-rpmlintrc
-Url:http://conky.sourceforge.net
-BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  fontconfig-devel
 BuildRequires:  freetype2-devel
 BuildRequires:  gcc
 BuildRequires:  make
+BuildRequires:  pkgconfig
+%if 0%{?suse_version} = 1000
 BuildRequires:  xorg-x11-devel
+%else
+BuildRequires:  XFree86-devel
+%endif
 %if 0%{?suse_version} = 1120
 BuildRequires:  libiw-devel
 %else
 BuildRequires:  wireless-tools
 %endif
-BuildRequires:  glib2-devel
-BuildRequires:  libpng-devel
-BuildRequires:  zlib-devel
-BuildRequires:  xorg-x11-devel
-BuildRequires:  cairo-devel
-BuildRequires:  update-desktop-files
+BuildRequires:  alsa-devel
 BuildRequires:  autoconf
 BuildRequires:  automake
-BuildRequires:  libtool
+BuildRequires:  cairo-devel
 BuildRequires:  docbook2x
-BuildRequires:  alsa-devel
+BuildRequires:  glib2-devel
+BuildRequires:  libpng-devel
+BuildRequires:  libtool
+BuildRequires:  update-desktop-files
+BuildRequires:  zlib-devel
 %if %with_lua_extra
 BuildRequires:  tolua++
 %endif
@@ -86,15 +89,19 @@
 %else
 BuildRequires:  vim
 %endif
-%if %suse_version = 1030
+%if 0%{?suse_version} = 1030
 BuildRequires:  libcurl-devel
 %else
 BuildRequires:  curl-devel
 %endif
 %if 0%{?packman_bs}
 BuildRequires:  audacious-devel
+# fix dbus-glib-1 no found for audacious
+BuildRequires:  dbus-1-glib-devel
 BuildRequires:  libXNVCtrl
+BuildRequires:  xmm2-devel
 %endif
+BuildRoot:

commit conky for openSUSE:Factory

2011-10-11 Thread h_root 

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.0 +0200
+++ /mounts/work_src_done/STABLE/conky/conky.changes2011-09-29 
07:19:33.0 +0200
@@ -0,0 +1,205 @@
+---
+Thu Sep 29 05:15:35 UTC 2011 - pascal.ble...@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.ble...@opensuse.org
+
+- fix build issue with files in conky-doc
+
+---
+Mon Sep 26 00:42:04 UTC 2011 - nmarq...@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.ble...@opensuse.org
+
+- dropped conky-getaddrinfo.patch, was merged upstream
+  (PATCH-FIX-OPENSUSE conky-getaddrinfo.patch 
fix-for-opensuse-specific-things.patch sf#3045085 pascal.ble...@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.ble...@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.ble...@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