update to 1.11.3

This commit is contained in:
Miroslav Lichvar 2019-04-11 12:20:30 +02:00
parent 6eeaa1fd8a
commit 23df203976
3 changed files with 14 additions and 2 deletions

1
.gitignore vendored
View File

@ -1 +1,2 @@
/conky-1.10.8.tar.gz
/conky-1.11.3.tar.gz

View File

@ -17,7 +17,7 @@
%bcond_without xinerama
Name: conky
Version: 1.10.8
Version: 1.11.3
Release: 3%{?dist}
Summary: A system monitor for X
@ -47,6 +47,7 @@ BuildRequires: lua-devel
# needed to generate documentation in the git snapshot
BuildRequires: docbook2X docbook-style-xsl man
BuildRequires: cmake git
BuildRequires: desktop-file-utils
%description
A system monitor for X originally based on the torsmo code. but more kickass.
@ -58,6 +59,9 @@ It just keeps on given'er. Yeah.
# remove some options from CFLAGS
sed -i 's/\(-Werror\|-Wno-format\|-pedantic\)//g' cmake/ConkyBuildOptions.cmake
# and use our CFLAGS
sed -i '/set(CMAKE_C_FLAGS/,+5d' cmake/ConkyBuildOptions.cmake
# our tolua++ is linked with lua 5.3
sed -i \
-e 's|\(LUA REQUIRED\) lua5.1 lua-5.1 lua51 lua|\1 lua>=5.3|' \
@ -103,6 +107,11 @@ make install DESTDIR=$RPM_BUILD_ROOT
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/usr/lib/libconky_core.a
%check
desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/conky.desktop
%files
@ -113,6 +122,8 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/conky-*
%if %{with lua_cairo} || %{with lua_imlib}
%{_libdir}/conky
%endif
%{_datadir}/applications/conky.desktop
%{_datadir}/icons/hicolor/*/apps/conky*
%{_mandir}/man1/conky.1*

View File

@ -1 +1 @@
SHA512 (conky-1.10.8.tar.gz) = 743b1d17db4ae654c7a319fe9157e9ebc5eb4ae0462a1f7269332d379e8bdd1dbfecc3ab6f46c8b5176b7e40918301649ac3ee883a84dc4fc8d766abbac6585a
SHA512 (conky-1.11.3.tar.gz) = 1552af85cee607064cb05b8033dd519163f8de0bd60b459a419a18b9b62b38d7364a7df5f33579c98ee20cb7ae8638a03a468f7839100dac6a8ec9119754b9ca