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_with audacious
%bcond_with cmus
%bcond_with libXNVCtrl
+%if 0%{?is_opensuse}
%bcond_without xmms2
-%{!?is_opensuse: %global is_opensuse 0}
+%else
+%bcond_with xmms2
+%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
