Hello community, here is the log from the commit of package conky for openSUSE:Factory checked in at 2015-10-06 13:26:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/conky (Old) and /work/SRC/openSUSE:Factory/.conky.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "conky" Changes: -------- --- /work/SRC/openSUSE:Factory/conky/conky.changes 2015-06-10 09:16:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.conky.new/conky.changes 2015-10-06 13:26:11.000000000 +0200 @@ -1,0 +2,39 @@ +Sat Oct 3 07:51:50 UTC 2015 - [email protected] + +- fix /usr/bin/lua51, it's now /usr/bin/lua5.1 in TW. + +------------------------------------------------------------------- +Sat Aug 29 15:33:16 UTC 2015 - [email protected] + +- update version 1.10.0 + * Partial rewrite in C++ (from C) + * New Lua-based config system + * New CMake-based build system + * Support for newer GCC versions +- drop patch: conky-1.9.0-libiw_with_libm.patch + * upstream changed from autotools to cmake +- drop patch: fix-CVE-2011-3616.patch, upstreamed +- drop patch: fix-apcupsd.patch. + * problematic, invalid conversion from void* to int* +- add patch: conky-1.10.0-libircclient.patch + * fix includedir +- add patch: conky-1.10.0-libdir.patch + * respect LIB_INSTALL_DIR +- remove old-time conditional checks: + * lua/imlib2 are always enabled +- drop conky-cairo/imlib2 sub-packages + * they're always enabled, no need to split + * add Provides/Obsoletes in main package +- rename conky-vim/nano sub-packages to vim/nano-plugin-conky +- remove pseudo sub-packages: + * there are more "features" now, we can not create more and more + dummy packages + * keeping packages from being switched among repositories should + be done by users via package management system, not this way + * add Provides/Obsoletes in main package +- drop conky-rpmlintrc + * the error it filtered doesn't exist anymore +- drop conky.desktop + * conky is not a desktop application. a desktop file is useless + +------------------------------------------------------------------- Old: ---- conky-1.9.0-libiw_with_libm.patch conky-1.9.0.tar.bz2 conky-rpmlintrc conky.desktop fix-CVE-2011-3616.patch fix-apcupsd.patch New: ---- conky-1.10.0-libdir.patch conky-1.10.0-libircclient.patch conky-1.10.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ conky.spec ++++++ --- /var/tmp/diff_new_pack.u4w8Su/_old 2015-10-06 13:26:12.000000000 +0200 +++ /var/tmp/diff_new_pack.u4w8Su/_new 2015-10-06 13:26:12.000000000 +0200 @@ -16,84 +16,46 @@ # -%if 0%{?suse_version} >= 1100 -%define with_lua_extra 1 -%else -%define with_lua_extra 0 -%endif - Name: conky -Version: 1.9.0 +Version: 1.10.0 Release: 0 Summary: Lightweight System Monitor License: GPL-3.0+ and LGPL-3.0+ and MIT Group: System/Monitoring -Url: http://conky.sourceforge.net -Source: http://prdownloads.sourceforge.net/conky/conky-%{version}.tar.bz2 -Source1: conky.desktop -# PATCH-FIX - add -lm when linking against -liw -Patch1: conky-1.9.0-libiw_with_libm.patch -# PATCH-FIX-UPSTREAM - revert broken apcupsd to previous working version. -Patch2: fix-apcupsd.patch -# PATCH-FIX-UPSTREAM - avoid rewriting an arbitrary user file. remove next release -Patch3: fix-CVE-2011-3616.patch -Source99: conky-rpmlintrc -BuildRequires: fontconfig-devel -BuildRequires: freetype2-devel -BuildRequires: gcc -BuildRequires: make -BuildRequires: pkgconfig -%if 0%{?suse_version} >= 1000 -BuildRequires: xorg-x11-devel -%else -BuildRequires: XFree86-devel -%endif -%if 0%{?suse_version} >= 1120 -BuildRequires: libiw-devel -%else -BuildRequires: wireless-tools -%endif +Url: https://github.com/brndnmtthws/conky +Source: https://github.com/brndnmtthws/conky/archive/v%{version}/conky-%{version}.tar.gz +Patch: conky-1.10.0-libircclient.patch +# PATCH-FIX-UPSTREAM [email protected] - respect LIB_INSTALL_DIR +Patch1: conky-1.10.0-libdir.patch BuildRequires: alsa-devel -BuildRequires: autoconf -BuildRequires: automake BuildRequires: cairo-devel +BuildRequires: cmake +BuildRequires: docbook-xsl-stylesheets BuildRequires: docbook2x +BuildRequires: fontconfig-devel +BuildRequires: freetype2-devel +BuildRequires: gcc-c++ BuildRequires: glib2-devel +BuildRequires: imlib2-devel +BuildRequires: libcurl-devel +BuildRequires: libical-devel +BuildRequires: libircclient-devel +BuildRequires: libiw-devel +BuildRequires: libmicrohttpd-devel +BuildRequires: libmysqld-devel BuildRequires: libpng-devel +BuildRequires: librsvg-devel BuildRequires: libtool +BuildRequires: libxslt-tools +BuildRequires: lua51-devel +BuildRequires: ncurses-devel +BuildRequires: pkg-config +BuildRequires: tolua++ BuildRequires: update-desktop-files +BuildRequires: vim +BuildRequires: xorg-x11-devel BuildRequires: zlib-devel -%if %with_lua_extra -BuildRequires: tolua++ -%endif -%if 0%{?sles_version} == 0 || 0%{?sles_version} >= 11 -%define with_imlib2 1 -BuildRequires: imlib2-devel -%endif -BuildRequires: ncurses-devel BuildRequires: pkgconfig(libxml-2.0) -%if 0%{?suse_version} >= 1020 -%define with_lua 1 -%if 0%{?suse_version} >= 1220 -BuildRequires: lua51-devel -%else -BuildRequires: lua-devel -%endif -%endif -%if 0%{?suse_version} >= 1020 || 0%{?fedora_version} > 0 -%if 0%{?sles_version} < 11 -BuildRequires: vim-enhanced -%else -BuildRequires: vim -%endif -%else -BuildRequires: vim -%endif -%if 0%{?suse_version} >= 1030 -BuildRequires: libcurl-devel -%else -BuildRequires: curl-devel -%endif %if 0%{?packman_bs} BuildRequires: audacious-devel # fix dbus-glib-1 no found for audacious @@ -101,7 +63,17 @@ 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 +# 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} BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -111,243 +83,176 @@ This package is built with support for audacious and nVidia GPUs. %endif -%if %with_lua_extra -%package cairo -Summary: Cairo Rendering Backend for %{name} -Group: System/Monitoring -Requires: %{name} = %{version} - -%description cairo -Conky is an advanced, highly configurable system monitor for X. -This package contains the Cairo rendering backend plugin -for %{name}. - -%package imlib2 -Summary: Imlib2 Rendering Backend for %{name} -Group: System/Monitoring -Requires: %{name} = %{version} -# This is required for imlib2 function properly. -Requires: imlib2-loaders - -%description imlib2 -Conky is an advanced, highly configurable system monitor for X. -This package contains the Imlib2 rendering backend plugin -for %{name}. -%endif - %package doc Summary: Documentation for conky -Group: System/Monitoring +Group: Documentation/HTML %description doc Conky is an advanced, highly configurable system monitor for X. -This package provides additional documentation about conky in -the following directory: - %{_docdir}/%{name}/ +This package provides additional documentation about conky. -%package vim +%package -n vim-plugin-conky Summary: Conky Configuration File Support for Vim Group: Productivity/Editors/Vi Requires: vim-base +Provides: conky-vim = %{version} +Obsoletes: conky-vim < %{version} -%description vim +%description -n vim-plugin-conky Conky is an advanced, highly configurable system monitor for X. This package provides syntax highlighting support for conky configuration files in vim. -%package nano +%package -n nano-plugin-conky Summary: Conky Configuration File Support for nano Group: Productivity/Editors/Other Requires: nano +Provides: conky-nano = %{version} +Obsoletes: conky-nano < %{version} -%description nano +%description -n nano-plugin-conky Conky is an advanced, highly configurable system monitor for X. This package provides syntax highlighting support for conky configuration files in nano. -%if 0%{?packman_bs} -%package feature-audacious -Summary: Pseudo Package for %{name} with Audacious Support -Group: System/Monitoring -Requires: %{name} = %{version} - -%description feature-audacious -This is a pseudo-package that doesn't contain any files but -requires the Packman build of %{name}, which includes support -for the Audacious player. - -%package feature-nvidia -Summary: Pseudo Package for %{name} with nVidia Support -Group: System/Monitoring -Requires: %{name} = %{version} - -%description feature-nvidia -This is a pseudo-package that doesn't contain any files but -requires the Packman build of %{name}, which includes support -for nVidia GPU statistics. - -%endif %prep %setup -q - -%patch1 -%patch2 -p1 -%patch3 -p1 - -for i in AUTHORS ChangeLog; do - mv "${i}" "${i}.orig" && \ - iconv -f iso8859-1 -t utf8 -o "${i}" "${i}.orig" && \ - rm "${i}.orig" -done +%patch -p1 +%patch1 -p1 %build -test -e ./configure || ./autogen.sh - -LIBS="-lm" -export LIBS -# to link X11 libs on SLE < 11: -LIBS="$LIBS -L/usr/X11R6/%{_lib}" - -LDFLAGS="-lm" \ -%configure \ - --enable-xft \ - --enable-own-window \ - --enable-double-buffer \ - --enable-x11 \ - --enable-xdamage \ - --enable-portmon \ - --enable-ibm \ - --enable-weather-metar \ - --enable-weather-xoap \ - --enable-rss \ - --enable-eve \ - --%{?with_imlib2:enable}%{!?with_imlib2:disable}-imlib2 \ -%if 0%{?with_lua} - --enable-lua \ -%if %with_lua_extra - --enable-lua-imlib2 \ - --enable-lua-cairo \ -%endif #with_lua_extra -%else - --disable-lua \ - --disable-lua-imlib2 \ - --disable-lua-cairo \ -%endif #with_lua - --enable-alsa \ - --enable-wlan \ +mkdir build && cd build +cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ + -DLIB_INSTALL_DIR=%{_libdir} \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DBUILD_APCUPSD=ON \ + -DBUILD_ARGB=ON \ + -DBUILD_BMPX=OFF \ + -DBUILD_CURL=ON \ + -DBUILD_EVE=ON \ + -DBUILD_HDDTEMP=ON \ + -DBUILD_HTTP=ON \ + -DBUILD_I18N=ON \ + -DBUILD_IBM=ON \ + -DBUILD_ICAL=ON \ + -DBUILD_ICONV=ON \ + -DBUILD_IMLIB2=ON \ + -DBUILD_IOSTATS=ON \ + -DBUILD_IPV6=ON \ +%if 0%{?suse_version} > 1320 + -DBUILD_IRC=ON \ +%else + -DBUILD_IRC=OFF \ +%endif + -DBUILD_MATH=ON \ + -DBUILD_MOC=ON \ + -DBUILD_MPD=ON \ + -DBUILD_MYSQL=ON \ + -DBUILD_NCURSES=ON \ + -DBUILD_PORT_MONITORS=ON \ + -DBUILD_RSS=ON \ + -DBUILD_OLD_CONFIG=ON \ + -DBUILD_WEATHER_METAR=ON \ + -DBUILD_WEATHER_XOAP=ON \ + -DBUILD_WLAN=ON \ + -DBUILD_X11=ON \ + -DBUILD_XDAMAGE=ON \ + -DBUILD_XDBE=ON \ + -DBUILD_XFT=ON \ + -DBUILD_XSHAPE=ON \ + -DOWN_WINDOW=ON \ + -DBUILD_LUA_CAIRO=ON \ + -DBUILD_LUA_IMLIB2=ON \ + -DBUILD_LUA_RSVG=ON \ %if 0%{?packman_bs} - --enable-audacious=yes \ - --enable-nvidia=yes \ - --enable-xmms2=yes -%else - --enable-audacious=no \ - --enable-nvidia=no + -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 + .. -# inotify on SLE < 11 is too old -%if 0%{?sles_version} > 0 && 0%{?sles_version} < 11 -sed -i '/^#define HAVE_SYS_INOTIFY_H/d' src/config.h -echo '#undef HAVE_SYS_INOTIFY_H' >> src/config.h -%endif +make %{?_smp_mflags} -make %{?_smp_flags} - -%install -make DESTDIR=%{buildroot} install - -install -D -m 0644 "%{SOURCE1}" "%{buildroot}%{_datadir}/applications/%{name}.desktop" -%suse_update_desktop_file -r "%{name}" System Monitor - -for feature in audacious nvidia; do -cat<<EOF >README.feature-"$feature" -This package acts as a placeholder for %{name} with -support for ${feature}, to avoid accidential removal -of that functionality through upgrading to a package -from a different repository. -EOF +# build doc +cd ../doc +# html +for i in *.xsl ; do + FIL=`echo $i | sed "s/\.xsl//"` + xsltproc $i ${FIL}.xml > ${FIL}.html done +xsltproc %{_datadir}/xml/docbook/stylesheet/nwalsh/current/html/docbook.xsl docs.xml > docs.html + +# manpage +db2x_xsltproc -s man docs.xml -o docs.mxml +db2x_manxml --encoding=UTF-8 docs.mxml +{ echo ".TH CONKY 1 \"August 2005\" \"conky compiled August 2005\" \"User Commands\""; sed 1d < conky.1; } > conky.2 +mv conky.2 conky.1 +gzip conky.1 +%install +cd build +make DESTDIR=%{buildroot} install %{?_smp_mflags} +cd .. + +# not doc +rm -rf %{buildroot}%{_datadir}/doc/%{name}-%{version} +# man +mkdir -p %{buildroot}%{_mandir}/man1 +install -m 0644 doc/conky.1.gz %{buildroot}%{_mandir}/man1 +# config +mkdir -p %{buildroot}%{_sysconfdir}/conky +sed -i "1d" extras/convert.lua +%if 0%{?suse_version} > 1320 +sed -i "1s/^/#!\/usr\/bin\/lua5.1\\n/" extras/convert.lua +%else +sed -i "1s/^/#!\/usr\/bin\/lua51\\n/" extras/convert.lua +%endif +install -m 0755 extras/convert.lua %{buildroot}%{_sysconfdir}/conky/ +install -m 0644 data/conky_no_x11.conf data/conky.conf %{buildroot}%{_sysconfdir}/conky/ +# vim install -D -m0644 extras/vim/ftdetect/conkyrc.vim "%{buildroot}%{_datadir}/vim/site/ftdetect/conkyrc.vim" install -D -m0644 extras/vim/syntax/conkyrc.vim "%{buildroot}%{_datadir}/vim/site/syntax/conkyrc.vim" - +# nano install -D -m0644 extras/nano/conky.nanorc "%{buildroot}%{_datadir}/nano/conky.nanorc" +# clean +rm -rf %{buildroot}%{_libdir}/conky/*.{a,la} -install -d "%{buildroot}%{_docdir}/%{name}" -MAINDOCFILES="$PWD/doc.main.lst" -echo -n >"$MAINDOCFILES" -for f in AUTHORS ChangeLog COPYING NEWS README TODO data/conky.conf; do - ff=$(basename "$f") - install -D -m0644 "$f" "%{buildroot}%{_docdir}/%{name}/$ff" - echo "%doc %{_docdir}/%{name}/$ff" >>"$MAINDOCFILES" -done -DOCDOCFILES="$PWD/doc.doc.lst" -echo -n >"$DOCDOCFILES" -for f in doc/*.html; do - ff=$(basename "$f") - install -D -m0644 "$f" "%{buildroot}%{_docdir}/%{name}/$ff" - echo "%doc %{_docdir}/%{name}/$ff" >>"$DOCDOCFILES" -done - -%if %with_lua_extra -rm -rf "%{buildroot}%{_libdir}/conky"/*.{a,la} -%else -install -d "%{buildroot}%{_libdir}/conky" -%endif - -%clean -%{?buildroot:rm -rf %{buildroot}} - -%files -f doc.main.lst +%files %defattr(-,root,root) -%doc %dir %{_docdir}/%{name} +%doc AUTHORS ChangeLog COPYING NEWS README.md TODO %dir %{_sysconfdir}/conky +%{_sysconfdir}/conky/convert.lua %config(noreplace) %{_sysconfdir}/conky/conky.conf %config(noreplace) %{_sysconfdir}/conky/conky_no_x11.conf %{_bindir}/conky %doc %{_mandir}/man1/conky.1%{ext_man} -%{_datadir}/applications/%{name}.desktop %dir %{_libdir}/conky - -%if %with_lua_extra -%files cairo -%defattr(-,root,root) %{_libdir}/conky/libcairo.so -%{_libdir}/conky/libcairo.so.* - -%files imlib2 -%defattr(-,root,root) +%{_libdir}/conky/libcairo_imlib2_helper.so %{_libdir}/conky/libimlib2.so -%{_libdir}/conky/libimlib2.so.* -%endif #with_lua_extra +%{_libdir}/conky/librsvg.so -%files doc -f doc.doc.lst +%files doc %defattr(-,root,root) -%doc %dir %{_docdir}/%{name} +%doc doc/*.html -%files vim +%files -n vim-plugin-conky %defattr(-,root,root) -%dir %{_datadir}/vim/site -%dir %{_datadir}/vim/site/ftdetect %{_datadir}/vim/site/ftdetect/conkyrc.vim -%dir %{_datadir}/vim/site/syntax %{_datadir}/vim/site/syntax/conkyrc.vim -%files nano +%files -n nano-plugin-conky %defattr(-,root,root) %dir %{_datadir}/nano %{_datadir}/nano/conky.nanorc -%if 0%{?packman_bs} -%files feature-audacious -%defattr(-,root,root) -%doc README.feature-audacious - -%files feature-nvidia -%defattr(-,root,root) -%doc README.feature-nvidia -%endif - %changelog ++++++ conky-1.10.0-libdir.patch ++++++ Index: conky-1.10.0/cmake/ConkyBuildOptions.cmake =================================================================== --- conky-1.10.0.orig/cmake/ConkyBuildOptions.cmake +++ conky-1.10.0/cmake/ConkyBuildOptions.cmake @@ -56,7 +56,10 @@ endif(BUILD_I18N) # Some standard options set(SYSTEM_CONFIG_FILE "/etc/conky/conky.conf" CACHE STRING "Default system-wide Conky configuration file") # use FORCE below to make sure this changes when CMAKE_INSTALL_PREFIX is modified -set(PACKAGE_LIBRARY_DIR "${CMAKE_INSTALL_PREFIX}/lib/conky" CACHE STRING "Package library path (where Lua bindings are installed" FORCE) +if (NOT LIB_INSTALL_DIR) + set (LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib") +endif (NOT LIB_INSTALL_DIR) +set(PACKAGE_LIBRARY_DIR "${LIB_INSTALL_DIR}/conky" CACHE STRING "Package library path (where Lua bindings are installed" FORCE) set(DEFAULTNETDEV "eth0" CACHE STRING "Default networkdevice") set(XDG_CONFIG_FILE "$HOME/.config/conky/conky.conf" CACHE STRING "Configfile of the user (XDG)") set(CONFIG_FILE "$HOME/.conkyrc" CACHE STRING "Configfile of the user") Index: conky-1.10.0/lua/CMakeLists.txt =================================================================== --- conky-1.10.0.orig/lua/CMakeLists.txt +++ conky-1.10.0/lua/CMakeLists.txt @@ -76,6 +76,6 @@ endif(BUILD_LUA_CAIRO AND BUILD_LUA_IMLI install(TARGETS ${lua_libs} - LIBRARY DESTINATION lib/conky - ARCHIVE DESTINATION lib/conky + LIBRARY DESTINATION ${PACKAGE_LIBRARY_DIR} + ARCHIVE DESTINATION ${PACKAGE_LIBRARY_DIR} ) Index: conky-1.10.0/src/CMakeLists.txt =================================================================== --- conky-1.10.0.orig/src/CMakeLists.txt +++ conky-1.10.0/src/CMakeLists.txt @@ -196,6 +196,6 @@ target_link_libraries(conky ${conky_libs install(TARGETS conky RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib + LIBRARY DESTINATION ${LIB_INSTALL_DIR} + ARCHIVE DESTINATION ${LIB_INSTALL_DIR} ) ++++++ conky-1.10.0-libircclient.patch ++++++ Index: conky-1.10.0/cmake/ConkyPlatformChecks.cmake =================================================================== --- conky-1.10.0.orig/cmake/ConkyPlatformChecks.cmake +++ conky-1.10.0/cmake/ConkyPlatformChecks.cmake @@ -95,7 +95,7 @@ if(BUILD_ICAL) endif(BUILD_ICAL) if(BUILD_IRC) - check_include_files(libircclient/libircclient.h IRC_H_) + check_include_files(libircclient.h IRC_H_) if(NOT IRC_H_) message(FATAL_ERROR "Unable to find libircclient") endif(NOT IRC_H_) Index: conky-1.10.0/src/irc.cc =================================================================== --- conky-1.10.0.orig/src/irc.cc +++ conky-1.10.0/src/irc.cc @@ -29,7 +29,7 @@ #include <stdlib.h> #include <string.h> #include "text_object.h" -#include <libircclient/libircclient.h> +#include <libircclient.h> struct ll_text { char *text;
