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 <[email protected]>
+
+- 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


Reply via email to