Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package conky for openSUSE:Factory checked in at 2024-11-20 16:59:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/conky (Old) and /work/SRC/openSUSE:Factory/.conky.new.28523 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "conky" Wed Nov 20 16:59:37 2024 rev:38 rq:1224993 version:1.21.7 Changes: -------- --- /work/SRC/openSUSE:Factory/conky/conky.changes 2023-10-13 23:16:09.354246640 +0200 +++ /work/SRC/openSUSE:Factory/.conky.new.28523/conky.changes 2024-11-20 17:00:10.365308575 +0100 @@ -1,0 +2,15 @@ +Thu Oct 17 01:27:40 UTC 2024 - Simon Lees <[email protected]> +- Update to 1.21.7 + * Too many changes in the 8 version bumps to list here +- Drop + * conky.timestamp.patch - included upstream + * reproducible.patch - included upstream + * html docs + +------------------------------------------------------------------- +Thu Sep 26 12:07:51 UTC 2024 - Dominique Leuenberger <[email protected]> + +- Enable libXNVCtrl only on ix86, x86_64 and aarch64: these are the + only architectures where NVidia drivers exist. + +------------------------------------------------------------------- Old: ---- conky-1.13.1.tar.gz conky.timestamp.patch reproducible.patch New: ---- conky-1.21.7.tar.gz BETA DEBUG BEGIN: Old:- Drop * conky.timestamp.patch - included upstream * reproducible.patch - included upstream Old: * conky.timestamp.patch - included upstream * reproducible.patch - included upstream * html docs BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ conky.spec ++++++ --- /var/tmp/diff_new_pack.05iOKp/_old 2024-11-20 17:00:10.993334763 +0100 +++ /var/tmp/diff_new_pack.05iOKp/_new 2024-11-20 17:00:10.993334763 +0100 @@ -1,7 +1,7 @@ # # spec file for package conky # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,27 +18,28 @@ %bcond_with audacious %bcond_without cmus +%ifarch %ix86 x86_64 aarch64 %bcond_without libXNVCtrl +%else +%bcond_with libXNVCtrl +%endif Name: conky -Version: 1.13.1 +Version: 1.21.7 Release: 0 Summary: A System Monitor License: GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT -Group: System/Monitoring URL: https://github.com/brndnmtthws/conky Source: https://github.com/brndnmtthws/conky/archive/v%{version}.tar.gz#/conky-%{version}.tar.gz Source1: conkyconf.SUSE Source2: conky.conf.SUSE Source3: README.SUSE Patch1: conky-1.10.1-avoid-git.patch -Patch2: conky.timestamp.patch -# PATCH-FIX-UPSTREAM bmwiedemann https://github.com/brndnmtthws/conky/pull/1619 -Patch3: reproducible.patch BuildRequires: cmake BuildRequires: docbook-xsl-stylesheets BuildRequires: docbook2x BuildRequires: freetype2-devel BuildRequires: gcc-c++ +BuildRequires: gperf BuildRequires: hicolor-icon-theme BuildRequires: libiw-devel BuildRequires: libmicrohttpd-devel @@ -48,7 +49,10 @@ BuildRequires: lua53-devel BuildRequires: ncurses-devel BuildRequires: ninja +BuildRequires: pandoc BuildRequires: pkgconfig +BuildRequires: python3-Jinja2 +BuildRequires: python3-PyYAML BuildRequires: update-desktop-files BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(cairo-xlib) @@ -95,7 +99,7 @@ %package doc Summary: Documentation for conky -Group: Documentation/HTML +BuildArch: noarch %description doc Conky is an configurable system monitor for X. @@ -104,7 +108,7 @@ %package -n vim-plugin-conky Summary: Conky Configuration File Support for Vim -Group: Productivity/Text/Editors +BuildArch: noarch Requires: vim-base Provides: conky-vim = %{version} Obsoletes: conky-vim < %{version} @@ -117,7 +121,7 @@ %package -n nano-plugin-conky Summary: Conky Configuration File Support for nano -Group: Productivity/Text/Editors +BuildArch: noarch Provides: conky-nano = %{version} Obsoletes: conky-nano < %{version} @@ -147,6 +151,7 @@ -DBUILD_CMUS=OFF \ %endif -DBUILD_CURL=ON \ + -DBUILD_DOCS=ON \ -DBUILD_EVE=ON \ -DBUILD_HDDTEMP=ON \ -DBUILD_HTTP=ON \ @@ -192,30 +197,14 @@ %ninja_build -# 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 %ninja_install -C build -# 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 +mkdir -p %{buildroot}%{_datadir}/vim/site/ftdetect/conkyrc.vim +install -m 644 extras/vim/ftdetect/conkyrc.vim %{buildroot}%{_datadir}/vim/site/ftdetect/conkyrc.vim +mkdir -p %dir %{buildroot}%{_datadir}/nano +install -m 644 extras/nano/conky.nanorc.j2 %{buildroot}%{_datadir}/nano/conky.nanorc.j2 + # config mkdir -p %{buildroot}%{_sysconfdir}/conky install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/conky/conky.conf @@ -225,11 +214,6 @@ sed -i "1s/^/#!\/usr\/bin\/lua5.1\\n/" extras/convert.lua 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} @@ -242,28 +226,27 @@ %config(noreplace) %{_sysconfdir}/conky/conky_no_x11.conf %{_bindir}/conky %{_bindir}/conkyconf -%{_mandir}/man1/conky.1%{?ext_man} %dir %{_libdir}/conky %{_libdir}/conky/libcairo.so %{_libdir}/conky/libcairo_imlib2_helper.so +%{_libdir}/conky/libcairo_xlib.so %{_libdir}/conky/libimlib2.so %{_libdir}/conky/librsvg.so %{_datadir}/applications/conky.desktop %{_datadir}/icons/hicolor/scalable/apps/conky-logomark-violet.svg +%{_datadir}/doc/conky-%{version}/ %{_libdir}/libtcp-portmon.so %files doc -%doc doc/*.html +%doc %{_mandir}/man1/conky.1%{?ext_man} %files -n vim-plugin-conky %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 %files -n nano-plugin-conky %dir %{_datadir}/nano -%{_datadir}/nano/conky.nanorc +%{_datadir}/nano/conky.nanorc.j2 ++++++ conky-1.13.1.tar.gz -> conky-1.21.7.tar.gz ++++++ ++++ 278511 lines of diff (skipped)
