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_with cmus
%bcond_with libXNVCtrl
%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
+ -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 \
+ -DBUILD_XMMS2=OFF \
+%endif
+ -DBUILD_IOSTATS=ON \
+ -DBUILD_IPV6=ON \
-DBUILD_MATH=ON \
-DBUILD_MOC=ON \
-DBUILD_MPD=ON \
@@ -202,8 +221,6 @@
-DBUILD_XFT=ON \
-DBUILD_XSHAPE=ON \
-DOWN_WINDOW=ON \
- -DBUILD_LUA_CAIRO=ON \
- -DBUILD_LUA_RSVG=ON \
-DBUILD_AUDACIOUS=OFF \
-DBUILD_CMUS=OFF \
-DBUILD_NVIDIA=OFF \
@@ -217,9 +234,6 @@
%if %{with libXNVCtrl}
-DBUILD_NVIDIA=ON \
%endif
-%if %{with xmms2}
- -DBUILD_XMMS2=ON \
-%endif
..
make %{?_smp_mflags}
@@ -277,10 +291,10 @@
%{_bindir}/conky
%{_bindir}/conkyconf
%doc %{_mandir}/man1/conky.1%{ext_man}
+%if 0%{is_opensuse}
%dir %{_libdir}/conky
%{_libdir}/conky/libcairo.so
%{_libdir}/conky/librsvg.so
-%if 0%{?suse_version} != 1315 || 0%{?is_opensuse} == 1
%{_libdir}/conky/libcairo_imlib2_helper.so
%{_libdir}/conky/libimlib2.so
%endif
