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 - [email protected] + +- 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_with audacious +%bcond_with cmus +%bcond_with libXNVCtrl +%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} @@ -262,6 +281,10 @@ %files -n vim-plugin-conky %defattr(-,root,root) +%dir %{_datadir}/vim +%dir %{_datadir}/vim/site +%dir %{_datadir}/vim/site/syntax +%dir %{_datadir}/vim/site/ftdetect %{_datadir}/vim/site/ftdetect/conkyrc.vim %{_datadir}/vim/site/syntax/conkyrc.vim
