1.19.0-1

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -1 +1,13 @@
-/conky-1.9.0-20141003git30d09e.tar.xz
+/conky-1.10.8.tar.gz
+/conky-1.11.3.tar.gz
+/conky-1.11.4.tar.gz
+/conky-1.11.5.tar.gz
+/conky-1.11.6.tar.gz
+/conky-1.12.1.tar.gz
+/conky-1.12.2.tar.gz
+/conky-1.13.1.tar.gz
+/conky-1.15.0.tar.gz
+/conky-1.18.0.tar.gz
+/conky-1.18.1.tar.gz
+/conky-1.18.2.tar.gz
+/conky-1.19.0.tar.gz

conky.spec

@@ -1,118 +1,252 @@
-%global gitdate 20141003
-%global gitrev 30d09e
-
-%bcond_without alsa
 %bcond_with audacious
 %bcond_without curl
 %bcond_without ibm
 %bcond_without imlib
-%bcond_without lua
 %bcond_without lua_cairo
 %bcond_without lua_imlib
 %bcond_with moc
 %bcond_without mpd
-%bcond_with ncurses
+%bcond_without ncurses
 %bcond_with nvidia
+%bcond_without portmon
 %bcond_without rss
 %bcond_without weather
 %bcond_without weather_xoap
+%if 0%{?fedora} >= 36 || 0%{?rhel} >= 8
+%bcond_with wlan
+%else
 %bcond_without wlan
+%endif
+%bcond_without xdbe
+%bcond_without xinerama
 
-Name:           conky 
-Version:        1.9.0
-Release:        14.%{gitdate}git%{gitrev}%{?dist}
-Summary:        A system monitor for X 
+Name:           conky
+Version:        1.19.0
+Release:        1%{?dist}
+Summary:        A system monitor for X
 
-Group:          User Interface/X
 License:        GPLv3+
-URL:            http://conky.sf.net/
-# git clone git://github.com/brndnmtthws/conky.git; cd conky
-# git archive --prefix=conky/ %{gitrev} | xz > %{name}-%{version}-%{gitdate}git%{gitrev}.tar.xz
-Source0:        %{name}-%{version}-%{gitdate}git%{gitrev}.tar.xz
-#Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+URL:            https://github.com/brndnmtthws/conky
+Source0:        https://github.com/brndnmtthws/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
 
+BuildRequires:  gcc
+BuildRequires:  gcc-c++
 BuildRequires:  libXft-devel
 BuildRequires:  libXt-devel
 BuildRequires:  libXdamage-devel
 BuildRequires:  libXext-devel
-%{?with_alsa:BuildRequires: alsa-lib-devel}
+BuildRequires:  lua-devel
 %{?with_audacious:BuildRequires: audacious-devel < 3.5 dbus-glib-devel}
 %{?with_curl:BuildRequires: curl-devel}
 %{?with_imlib:BuildRequires: imlib2-devel}
-%{?with_lua:BuildRequires: lua-devel}
-# tolua++ switched to lua-5.2 in 1.0.93-14
-%{?with_lua_cairo:BuildRequires: cairo-devel tolua++-devel > 1.0.93-14}
-%{?with_lua_imlib:BuildRequires: imlib2-devel tolua++-devel > 1.0.93-14}
+%{?with_lua_cairo:BuildRequires: cairo-devel tolua++-devel}
+%{?with_lua_imlib:BuildRequires: imlib2-devel tolua++-devel}
 %{?with_ncurses:BuildRequires: ncurses-devel}
 %{?with_nvidia:BuildRequires: libXNVCtrl-devel}
 %{?with_rss:BuildRequires: curl-devel libxml2-devel}
 %{?with_weather:BuildRequires: curl-devel}
 %{?with_weather_xoap:BuildRequires: libxml2-devel}
 %{?with_wlan:BuildRequires: wireless-tools-devel}
-# needed to generate documentation in the git snapshot
-BuildRequires:  libtool docbook2X docbook-style-xsl man
+%{?with_xinerama:BuildRequires: libXinerama-devel}
+BuildRequires:  pandoc
+BuildRequires:  python3-pyyaml python3-jinja2
+BuildRequires:  cmake git
+BuildRequires:  desktop-file-utils
 
 %description
-A system monitor for X originally based on the torsmo code. but more kickass. 
+A system monitor for X originally based on the torsmo code. but more kickass.
 It just keeps on given'er. Yeah.
 
 %prep
-%setup -q -n %{name}
-# build with lua-5.2
-sed -i 's|lua == 5.1|lua >= 5.2|' configure.ac.in
+%setup -q
+
+# remove executable bits from files included in %{_docdir}
+chmod a-x extras/convert.lua
 
 for i in AUTHORS; do
     iconv -f iso8859-1 -t utf8 -o ${i}{_,} && touch -r ${i}{,_} && mv -f ${i}{_,}
 done
 
 %build
-# needed also to use recent config.guess and config.sub for aarch64
-./autogen.sh
-%configure \
-%{!?with_alsa:     --disable-alsa} \
-%{?with_audacious: --enable-audacious=yes} \
-%{?with_curl:      --enable-curl} \
-%{?with_ibm:       --enable-ibm} \
-%{?with_imlib:     --enable-imlib2} \
-%{!?with_lua:      --disable-lua} \
-%{?with_lua_cairo: --enable-lua-cairo} \
-%{?with_lua_imlib: --enable-lua-imlib2} \
-%{!?with_moc:      --disable-moc} \
-%{!?with_mpd:      --disable-mpd} \
-%{!?with_ncurses:  --disable-ncurses} \
-%{?with_nvidia:    --enable-nvidia} \
-%{?with_rss:       --enable-rss} \
-%{?with_weather:   --enable-weather-metar} \
-%{?with_weather_xoap: --enable-weather-xoap} \
-%{?with_wlan:      --enable-wlan} \
+%cmake \
+                            -DBUILD_DOCS=ON \
+                            -DBUILD_BUILTIN_CONFIG=OFF \
+                            -DBUILD_SHARED_LIBS:BOOL=OFF \
+    %{?with_audacious:      -DBUILD_AUDACIOUS=ON} \
+    %{?with_curl:           -DBUILD_CURL=ON} \
+    %{!?with_ibm:           -DBUILD_IBM=OFF} \
+    %{?with_imlib:          -DBUILD_IMLIB2=ON} \
+    %{?with_lua_cairo:      -DBUILD_LUA_CAIRO=ON} \
+    %{?with_lua_imlib:      -DBUILD_LUA_IMLIB2=ON} \
+    %{!?with_moc:           -DBUILD_MOC=OFF} \
+    %{!?with_mpd:           -DBUILD_MPD=OFF} \
+    %{!?with_ncurses:       -DBUILD_NCURSES=OFF} \
+    %{?with_nvidia:         -DBUILD_NVIDIA=ON} \
+    %{!?with_portmon:       -DBUILD_PORT_MONITORS=OFF} \
+    %{?with_rss:            -DBUILD_RSS=ON} \
+    %{?with_weather:        -DBUILD_WEATHER_METAR=ON} \
+    %{?with_weather_xoap:   -DBUILD_WEATHER_XOAP=ON} \
+    %{?with_wlan:           -DBUILD_WLAN=ON} \
+    %{?with_xdbe:           -DBUILD_XDBE=ON} \
+    %{?!with_xinerama:      -DBUILD_XINERAMA=OFF} \
     ;
 
-# don't use rpath
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-
-make %{?_smp_mflags}
+%cmake_build
 
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
+%cmake_install
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/conky
+install -m644 -p data/conky.conf $RPM_BUILD_ROOT%{_sysconfdir}/conky
+rm -rf $RPM_BUILD_ROOT%{_docdir}/conky-*
+rm -f $RPM_BUILD_ROOT%{_libdir}/libtcp-portmon.a
+rm -f $RPM_BUILD_ROOT/usr/lib/libconky_core.a
 
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/conky/conky_no_x11.conf
-rm -f $RPM_BUILD_ROOT%{_libdir}/conky/*.{la,a}
+
+%check
+desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/conky.desktop
 
 
 %files
-%doc AUTHORS ChangeLog COPYING TODO README NEWS extras/* doc/docs.html
+%doc AUTHORS COPYING README.md extras/*
 %dir %{_sysconfdir}/conky
 %config %{_sysconfdir}/conky/conky.conf
 %{_bindir}/conky
 %if %{with lua_cairo} || %{with lua_imlib}
 %{_libdir}/conky
 %endif
+%{_datadir}/applications/conky.desktop
+%{_datadir}/icons/hicolor/*/apps/conky*
 %{_mandir}/man1/conky.1*
 
 
 %changelog
+* Mon Apr 03 2023 Miroslav Lichvar <mlichvar@redhat.com> - 1.19.0-1
+- update to 1.19.0
+
+* Mon Mar 06 2023 Miroslav Lichvar <mlichvar@redhat.com> - 1.18.2-1
+- update to 1.18.2
+
+* Mon Feb 27 2023 Miroslav Lichvar <mlichvar@redhat.com> - 1.18.1-1
+- update to 1.18.1
+
+* Mon Feb 20 2023 Miroslav Lichvar <mlichvar@redhat.com> - 1.18.0-1
+- update to 1.18.0
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.15.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Tue Oct 25 2022 Miroslav Lichvar <mlichvar@redhat.com> - 1.15.0-1
+- update to 1.15.0
+
+* Tue Sep 20 2022 Miroslav Lichvar <mlichvar@redhat.com> - 1.13.1-1
+- update to 1.13.1
+- enable ncurses support
+
+* Thu Jul 28 2022 Jonathan Wright <jonathan@almalinux.org> - 1.12.2-5
+- Initial build for EPEL8 and EPEL9
+- Fixes rhbz#1765376
+
+* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Dec 02 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 1.12.2-2
+- Disable Wireless Extensions support (Fedora 36+)
+  https://fedoraproject.org/wiki/Changes/RemoveWirelessExtensions
+
+* Tue Sep 21 2021 Miroslav Lichvar <mlichvar@redhat.com> - 1.12.2-1
+- update to 1.12.2
+
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Mon Mar 08 2021 Miroslav Lichvar <mlichvar@redhat.com> - 1.12.1-1
+- update to 1.12.1
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.11.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Jul 28 2020 Miroslav Lichvar <mlichvar@redhat.com> - 1.11.6-1
+- update to 1.11.6
+- convert to new cmake rpm macros
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.11.5-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Feb 03 2020 Miroslav Lichvar <mlichvar@redhat.com> - 1.11.5-3
+- enable cairo and imlib modules again (#1768166)
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.11.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Aug 22 2019 Miroslav Lichvar <mlichvar@redhat.com> - 1.11.5-1
+- update to 1.11.5
+- disable cairo and imlib modules to build without tolua++
+
+* Tue Jul 30 2019 Miroslav Lichvar <mlichvar@redhat.com> - 1.11.4-1
+- update to 1.11.4
+
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.11.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Thu Apr 11 2019 Miroslav Lichvar <mlichvar@redhat.com> - 1.11.3-1
+- update to 1.11.3
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.8-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Wed May 09 2018 Miroslav Lichvar <mlichvar@redhat.com> - 1.10.8-1
+- update to 1.10.8
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Mon Jan 22 2018 Miroslav Lichvar <mlichvar@redhat.com> - 1.10.7-1
+- update to 1.10.7
+
+* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Mon Feb 20 2017 Miroslav Lichvar <mlichvar@redhat.com> - 1.10.6-1
+- update to 1.10.6
+- fix building with new gcc (#1423306)
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Thu Aug 18 2016 Miroslav Lichvar <mlichvar@redhat.com> - 1.10.4-1
+- update to 1.10.4
+
+* Tue May 03 2016 Miroslav Lichvar <mlichvar@redhat.com> - 1.10.1-5.20160413git06f87b
+- update to 1.10.1-20160413git06f87b
+- enable port monitor (#1320739)
+
+* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.1-4.20160110gitb38ab1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Mon Feb 01 2016 Tim Niemueller <tim@niemueller.de> - 1.10.1-3.20160110gitb38ab1-3
+- rebuild for updated tolua++
+
+* Mon Jan 11 2016 Miroslav Lichvar <mlichvar@redhat.com> - 1.10.1-2.20160110gitb38ab1
+- update to 1.10.1-20160110gitb38ab1
+
+* Fri Dec 04 2015 Miroslav Lichvar <mlichvar@redhat.com> - 1.10.1-1.20151201git1abd25
+- update to 1.10.1-20151201git1abd25
+- enable double-buffering support (#1284232)
+
+* Tue Nov 03 2015 Miroslav Lichvar <mlichvar@redhat.com> - 1.10.0-1.20150824git341495
+- update to 1.10.0-20150824git341495
+- don't package manual in html
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.9.0-14.20141003git30d09e
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 

sources

@@ -1 +1 @@
-79a6caba1759b55289a0f4fcd87dc5c6  conky-1.9.0-20141003git30d09e.tar.xz
+SHA512 (conky-1.19.0.tar.gz) = 6be9ce459cba3f35e6c6ad537afa9fffd9af926d4e190629bcdef1931622aad2220fa75c0ee8640066a101dae492a676e59bac85f21ab587349a6231ebe7e5ac