diff --git a/.gitignore b/.gitignore index 773ccb9..9920b09 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/conky-1.10.6.tar.gz +/conky-1.10.7.tar.gz diff --git a/conky-gcc7.patch b/conky-gcc7.patch deleted file mode 100644 index 8028af7..0000000 --- a/conky-gcc7.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up conky-1.10.6/src/luamm.hh.gcc7 conky-1.10.6/src/luamm.hh ---- conky-1.10.6/src/luamm.hh.gcc7 2017-02-20 15:31:45.145623438 +0100 -+++ conky-1.10.6/src/luamm.hh 2017-02-20 15:42:02.467168585 +0100 -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - #include - #include - diff --git a/conky.spec b/conky.spec index bc15b67..9ad26b0 100644 --- a/conky.spec +++ b/conky.spec @@ -17,7 +17,7 @@ %bcond_without xinerama Name: conky -Version: 1.10.6 +Version: 1.10.7 Release: 3%{?dist} Summary: A system monitor for X @@ -25,7 +25,6 @@ Group: User Interface/X License: GPLv3+ URL: https://github.com/brndnmtthws/conky Source0: https://github.com/brndnmtthws/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz -Patch1: conky-gcc7.patch BuildRequires: libXft-devel BuildRequires: libXt-devel @@ -54,10 +53,9 @@ It just keeps on given'er. Yeah. %prep %setup -q -%patch1 -p1 -b .gcc7 -# remove -Werror from CFLAGS -sed -i 's|-Werror||' cmake/ConkyBuildOptions.cmake +# remove some options from CFLAGS +sed -i 's/\(-Werror\|-Wno-format\|-pedantic\)//g' cmake/ConkyBuildOptions.cmake # our tolua++ is linked with lua 5.3 sed -i \ diff --git a/sources b/sources index d2e9184..316e4fc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (conky-1.10.6.tar.gz) = ddd0b087e89654f8dace7d9682935a802b3bb22b7e65acd25dcc0f06e90b46bee695502d78b6e40a409f8eaffcd65a78d5f861ee6dbcbff6e48f88c2f20319c9 +SHA512 (conky-1.10.7.tar.gz) = 4da501c7c7613e8b9b26a691a1c0118c05cec818e944d4a30e250ecba26956d6f3103ec5731f082a095173dbfe0713137ded92043cc4c1eb3821c0943f1744f4