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.changes 2019-06-24 21:54:03.712138397 +0200
@@ -1,0 +2,34 @@
+Mon Jun 24 06:07:34 UTC 2019 - mvetter@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 - mvetter@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_with xmms2
%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: 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}
-Obsoletes: conky-imlib2 < %{version}
%endif
-Requires: fontawesome-fonts
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
-Conky is an advanced, highly configurable system monitor for X.
-
-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
+Conky is an configurable system monitor.
%package doc
Summary: Documentation for conky
Group: Documentation/HTML
%description doc
-Conky is an advanced, highly configurable system monitor for X.
+Conky is an configurable system monitor for X.
This package provides additional documentation about conky.
@@ -133,7 +115,7 @@
Obsoletes: conky-vim < %{version}
%description -n vim-plugin-conky
-Conky is an advanced, highly configurable system monitor for X.
+Conky is an configurable system monitor for X.
This package provides syntax highlighting support for conky
configuration files in vim.
@@ -146,26 +128,30 @@
Obsoletes: conky-nano < %{version}
%description -n nano-plugin-conky
-Conky is an advanced, highly configurable system monitor for X.
+Conky is an configurable system monitor for X.
This package provides syntax highlighting support for conky
configuration files in nano.
%prep
%setup -q
-%patch1 -p1
-#%patch2 -p1
-%patch3 -p1
-%patch4 -p1
+%autopatch -p1
%build
-mkdir build && cd build
-cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
- -DLIB_INSTALL_DIR=%{_libdir} \
- -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+%cmake \
-DBUILD_APCUPSD=ON \
-DBUILD_ARGB=ON \
+%if %{with audacious}
+ -DBUILD_AUDACIOUS=ON \
+%else
+ -DBUILD_AUDACIOUS=OFF \
+%endif
-DBUILD_BMPX=OFF \
+%if %{with cmus}
+ -DBUILD_CMUS=ON \
+%else
+ -DBUILD_CMUS=OFF \
+%endif
-DBUILD_CURL=ON \
-DBUILD_EVE=ON \
-DBUILD_HDDTEMP=ON \
@@ -178,11 +164,6 @@
-DBUILD_LUA_CAIRO=ON \
-DBUILD_IMLIB2=ON \
-DBUILD_LUA_IMLIB2=ON \
-%if 0%{?suse_version} >= 1315
- -DBUILD_IRC=ON \
-%else
- -DBUILD_IRC=OFF \
-%endif
-DBUILD_LUA_RSVG=ON \
%else
-DBUILD_LUA_CAIRO=OFF \
@@ -198,11 +179,17 @@
%endif
-DBUILD_IOSTATS=ON \
-DBUILD_IPV6=ON \
+ -DBUILD_IRC=ON \
-DBUILD_MATH=ON \
-DBUILD_MOC=ON \
-DBUILD_MPD=ON \
-DBUILD_MYSQL=ON \
-DBUILD_NCURSES=ON \
+%if %{with libXNVCtrl}
+ -DBUILD_NVIDIA=ON \
+%else
+ -DBUILD_NVIDIA=OFF \
+%endif
-DBUILD_PORT_MONITORS=ON \
-DBUILD_PULSEAUDIO=ON \
-DBUILD_RSS=ON \
@@ -216,22 +203,9 @@
-DBUILD_XFT=ON \
-DBUILD_XSHAPE=ON \
-DOWN_WINDOW=ON \
- -DBUILD_AUDACIOUS=OFF \
- -DBUILD_CMUS=OFF \
- -DBUILD_NVIDIA=OFF \
- -DBUILD_XMMS2=OFF \
-%if %{with audacious}
- -DBUILD_AUDACIOUS=ON \
-%endif
-%if %{with cmus}
- -DBUILD_CMUS=ON \
-%endif
-%if %{with libXNVCtrl}
- -DBUILD_NVIDIA=ON \
-%endif
- ..
+ -DBUILD_XMMS2=OFF
-make %{?_smp_mflags}
+%cmake_build
# build doc
cd ../doc
@@ -250,9 +224,7 @@
gzip conky.1
%install
-cd build
-make DESTDIR=%{buildroot} install %{?_smp_mflags}
-cd ..
+%cmake_install
# not doc
rm -rf %{buildroot}%{_datadir}/doc/%{name}-%{version}
@@ -277,15 +249,15 @@
rm -rf %{buildroot}%{_libdir}/conky/*.{a,la}
%files
-%defattr(-,root,root)
-%doc AUTHORS ChangeLog COPYING NEWS README.md TODO README.SUSE
+%license COPYING
+%doc AUTHORS README.md 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}
+%{_mandir}/man1/conky.1%{?ext_man}
%if 0%{?is_opensuse}
%dir %{_libdir}/conky
%{_libdir}/conky/libcairo.so
@@ -293,13 +265,14 @@
%{_libdir}/conky/libcairo_imlib2_helper.so
%{_libdir}/conky/libimlib2.so
%endif
+%{_datadir}/applications/conky.desktop
+%{_datadir}/icons/hicolor/scalable/apps/conky-logomark-violet.svg
+%{_libdir}/libtcp-portmon.so
%files doc
-%defattr(-,root,root)
%doc doc/*.html
%files -n vim-plugin-conky
-%defattr(-,root,root)
%dir %{_datadir}/vim
%dir %{_datadir}/vim/site
%dir %{_datadir}/vim/site/syntax
@@ -308,7 +281,6 @@
%{_datadir}/vim/site/syntax/conkyrc.vim
%files -n nano-plugin-conky
-%defattr(-,root,root)
%dir %{_datadir}/nano
%{_datadir}/nano/conky.nanorc
++++++ conky-1.10.1-avoid-git.patch ++++++
--- /var/tmp/diff_new_pack.HsNCXZ/_old 2019-06-24 21:54:04.324138868 +0200
+++ /var/tmp/diff_new_pack.HsNCXZ/_new 2019-06-24 21:54:04.324138868 +0200
@@ -1,12 +1,11 @@
-Index: conky-1.10.1/cmake/Conky.cmake
-===================================================================
---- conky-1.10.1.orig/cmake/Conky.cmake
-+++ conky-1.10.1/cmake/Conky.cmake
-@@ -20,7 +20,7 @@
+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.000000000 +0100
++++ conky-1.11.3.new/cmake/Conky.cmake 2019-05-27 13:28:10.901251709 +0200
+@@ -18,7 +18,7 @@
# along with this program. If not, see http://www.gnu.org/licenses/.
#
--#set(RELEASE true)
+-# set(RELEASE true)
+set(RELEASE true)
# Set system vars
++++++ conky-1.10.8.tar.gz -> conky-1.11.4.tar.gz ++++++
++++ 290179 lines of diff (skipped)
++++++ conky.timestamp.patch ++++++
--- /var/tmp/diff_new_pack.HsNCXZ/_old 2019-06-24 21:54:04.724139176 +0200
+++ /var/tmp/diff_new_pack.HsNCXZ/_new 2019-06-24 21:54:04.724139176 +0200
@@ -1,52 +1,57 @@
---- 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,15 +161,12 @@ 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");
+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.000000000 +0100
++++ conky-1.11.3.new/cmake/Conky.cmake 2019-05-27 13:33:30.002789694 +0200
+@@ -155,7 +155,7 @@
+ RESULT_VARIABLE RETVAL
+ OUTPUT_VARIABLE BUILD_DATE
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+-execute_process(COMMAND ${APP_UNAME} -srm
++execute_process(COMMAND ${APP_UNAME} -sm
+ RESULT_VARIABLE RETVAL
+ OUTPUT_VARIABLE BUILD_ARCH
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+diff -urEbw conky-1.11.3/src/core.cc conky-1.11.3.new/src/core.cc
+--- conky-1.11.3/src/core.cc 2019-02-23 03:12:15.000000000 +0100
++++ conky-1.11.3.new/src/core.cc 2019-05-27 13:36:05.839543761 +0200
+@@ -823,7 +823,6 @@
+ obj->callbacks.free = &gen_free_opaque;
+ #endif /* BUILD_X11 */
+ END OBJ(conky_version, nullptr) obj_be_plain_text(obj, VERSION);
+- END OBJ(conky_build_date, nullptr) obj_be_plain_text(obj, BUILD_DATE);
+ END OBJ(conky_build_arch, nullptr) obj_be_plain_text(obj, BUILD_ARCH);
+ END OBJ(downspeed, &update_net_stats)
+ parse_net_stat_arg(obj, arg, free_at_crash);
+diff -urEbw conky-1.11.3/src/llua.cc conky-1.11.3.new/src/llua.cc
+--- conky-1.11.3/src/llua.cc 2019-02-23 03:12:15.000000000 +0100
++++ conky-1.11.3.new/src/llua.cc 2019-05-27 13:33:30.034789848 +0200
+@@ -154,16 +154,12 @@
+ lua_setfield(lua_L, -3, "cpath");
+ lua_pop(lua_L, 2);
+
+- 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);
- lua_setglobal(lua_L, "conky_version");
+ 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_DATE);
+- lua_setglobal(lua_L, "conky_build_date");
-
- lua_pushstring(lua_L, BUILD_ARCH);
- lua_setglobal(lua_L, "conky_build_arch");
+ 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, &update_net_stats)
+diff -urEbw conky-1.11.3/src/main.cc conky-1.11.3.new/src/main.cc
+--- conky-1.11.3/src/main.cc 2019-02-23 03:12:15.000000000 +0100
++++ conky-1.11.3.new/src/main.cc 2019-05-27 13:35:28.959365326 +0200
+@@ -56,8 +56,7 @@
+ #endif /* BUILD_BUILTIN_CONFIG */
+
+ static void print_version() {
+- std::cout << _(PACKAGE_NAME " " VERSION " compiled " BUILD_DATE
+- " for " BUILD_ARCH
++ std::cout << _(PACKAGE_NAME " " VERSION " compiled for " BUILD_ARCH
+ "\n"
+ "\nCompiled in features:\n\n"
+ "System config file: " SYSTEM_CONFIG_FILE