[packages/conky] Up to 1.22.2

arekm arekm at pld-linux.org
Mon Aug 11 20:57:35 CEST 2025


commit 936d35ab303a480a98f30636d4ab41f824544213
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Mon Aug 11 20:57:29 2025 +0200

    Up to 1.22.2

 conky.spec | 55 +++++++++++++++++++++++++++++--------------------------
 1 file changed, 29 insertions(+), 26 deletions(-)
---
diff --git a/conky.spec b/conky.spec
index 828389d..9a85082 100644
--- a/conky.spec
+++ b/conky.spec
@@ -8,17 +8,18 @@
 Summary:	A light-weight system monitor
 Summary(pl.UTF-8):	Monitor systemu dla środowiska graficznego
 Name:		conky
-Version:	1.8.1
-Release:	7
+Version:	1.22.2
+Release:	1
 License:	Distributable (see COPYING doc)
 Group:		X11/Applications
-Source0:	http://downloads.sourceforge.net/conky/%{name}-%{version}.tar.bz2
-# Source0-md5:	366dc6a5c2ebebfbe6f53da25061b5d6
-URL:		http://conky.sourceforge.net/
+Source0:	https://github.com/brndnmtthws/conky/archive/refs/tags/v%{version}.tar.gz
+# Source0-md5:	4dc1856729caf13812423882a5b6b2f2
+Source1:	https://github.com/brndnmtthws/conky/releases/download/v%{version}/%{name}.1.gz
+# Source1-md5:	032d5220afc460796c8d9611e709f0a2
+URL:		https://github.com/brndnmtthws/conky/
 BuildRequires:	alsa-lib-devel
-BuildRequires:	autoconf
-BuildRequires:	automake
 %{?with_lua_cairo:BuildRequires:	cairo-devel}
+BuildRequires:	cmake
 BuildRequires:	curl-devel
 BuildRequires:	expat-devel
 BuildRequires:	freetype-devel
@@ -79,46 +80,48 @@ Dowiązania Lua Imlib2 dla Conky.
 
 %prep
 %setup -q
-%{__sed} -i 's,lua5.1,lua51,' configure.ac
 
 %build
-%{__libtoolize}
-%{__aclocal} -I m4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
-	CFLAGS="%{rpmcflags} `pkg-config ncurses --cflags`" \
-	--enable-curl \
-	--enable-imlib2 \
-	--enable-weather-xoap \
-	--enable-wlan \
-	--enable-rss \
-	%{?with_lua_cairo:--enable-lua-cairo} \
-	%{?with_lua_imlib2:--enable-lua-imlib2}
+install -d build
+cd build
+%cmake .. \
+	-DBUILD_CURL=ON \
+	-DBUILD_IMLIB2=ON \
+	-DBUILD_WLAN=ON \
+	-DBUILD_RSS=ON \
+	%{cmake_on_off lua_cairo BUILD_LUA_CAIRO} \
+	%{cmake_on_off lua_imlib2 BUILD_LUA_IMLIB2} \
+	-DDOC_PATH=%{_sysconfdir}/%{name} \
+	-DLIB_INSTALL_DIR=%{_libdir}/%{name}
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
+%{__make} -C build install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+install -d $RPM_BUILD_ROOT%{_mandir}/man1/
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1/
+
+rm $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/convert.lua
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
 # COPYING must be added (see COPYING file)
-%doc AUTHORS ChangeLog COPYING README TODO
+%doc AUTHORS COPYING README.md
 %attr(755,root,root) %{_bindir}/%{name}
 %dir %{_sysconfdir}/conky
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conky/%{name}.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conky/%{name}_no_x11.conf
-%if %{with lua_cairo} || %{with lua_imlib2}
 %dir %{_libdir}/conky
-%endif
+%attr(755,root,root) %{_libdir}/%{name}/libtcp-portmon.so
+%{_desktopdir}/conky.desktop
+%{_iconsdir}/hicolor/scalable/apps/conky-logomark-violet.svg
 %{_mandir}/man1/%{name}.1*
 
 %if %{with lua_cairo}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/conky.git/commitdiff/936d35ab303a480a98f30636d4ab41f824544213



More information about the pld-cvs-commit mailing list