1.9.0-8.20140617gitab826d.fc20

.gitignore

@@ -1 +1 @@
-/conky-1.9.0-20131027git11a13d.tar.xz
+/conky-1.9.0-20140617gitab826d.tar.xz

conky.spec

@@ -1,5 +1,5 @@
-%global gitdate 20131027
-%global gitrev 11a13d
+%global gitdate 20140617
+%global gitrev ab826d
 
 %bcond_without alsa
 %bcond_without audacious
@@ -20,7 +20,7 @@
 
 Name:           conky 
 Version:        1.9.0
-Release:        6.%{gitdate}git%{gitrev}%{?dist}
+Release:        8.%{gitdate}git%{gitrev}%{?dist}
 Summary:        A system monitor for X 
 
 Group:          User Interface/X
@@ -39,7 +39,7 @@ BuildRequires:  libXext-devel
 %{?with_audacious:BuildRequires: audacious-devel dbus-glib-devel}
 %{?with_curl:BuildRequires: curl-devel}
 %{?with_imlib:BuildRequires: imlib2-devel}
-%{?with_lua:BuildRequires: lua-devel}
+%{?with_lua:BuildRequires: compat-lua-devel}
 %{?with_lua_cairo:BuildRequires: cairo-devel tolua++-devel}
 %{?with_lua_imlib:BuildRequires: imlib2-devel tolua++-devel}
 %{?with_ncurses:BuildRequires: ncurses-devel}
@@ -57,8 +57,6 @@ It just keeps on given'er. Yeah.
 
 %prep
 %setup -q -n %{name}
-# fix detection of lua
-sed -i 's|lua == 5.1|lua >= 5.1|' configure.ac.in
 
 for i in AUTHORS; do
     iconv -f iso8859-1 -t utf8 -o ${i}{_,} && touch -r ${i}{,_} && mv -f ${i}{_,}
@@ -112,6 +110,13 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/conky/*.{la,a}
 
 
 %changelog
+* Wed Jul 09 2014 Miroslav Lichvar <mlichvar@redhat.com> - 1.9.0-8.20140617gitab826d.fc20
+- build with lua-5.1 (#1117120)
+
+* Mon Jun 23 2014 Miroslav Lichvar <mlichvar@redhat.com> - 1.9.0-7.20140617gitab826d.fc20
+- update to 20140617gitab826d
+- enable weather support (#1024089)
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.9.0-6.20121101gitbfaa84
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 

sources

@@ -1 +1 @@
-4e7e5bb0da1e761db794ca6fde2a1a34  conky-1.9.0-20131027git11a13d.tar.xz
+65e324491fb73e71667815097cc20af3  conky-1.9.0-20140617gitab826d.tar.xz